From ae92d98b9375e1d753bd9ab495ed5c7dcd3f1af5 Mon Sep 17 00:00:00 2001
From: Tobias Kortkamp <tobias.kortkamp@gmail.com>
Date: Sat, 17 Jun 2023 15:31:56 +0200
Subject: gnu: clang-runtime-15: Fix address sanitizer support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

$ guix shell clang-toolchain@15 -- clang -o test -fsanitize=address test.c
ld: cannot find /gnu/store/i429h17s15g48ir9vl1bzp3cv39l5pib-clang-runtime-15.0.7/lib/linux/libclang_rt.asan_static-x86_64.a: No such file or directory
ld: cannot find /gnu/store/i429h17s15g48ir9vl1bzp3cv39l5pib-clang-runtime-15.0.7/lib/linux/libclang_rt.asan-x86_64.a: No such file or directory
clang-15: error: linker command failed with exit code 1 (use -v to see invocation)

* gnu/packages/llvm.scm (clang-runtime-15): Fix address sanitizer
support by bringing back the static libraries.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/llvm.scm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index de5ad3718b..daff67f7f2 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -699,12 +699,7 @@ of programming tools as well as libraries with equivalent functionality.")
           #~(modify-phases #$phases
               (add-after 'unpack 'change-directory
                 (lambda _
-                  (chdir "compiler-rt")))
-              (add-after 'install 'delete-static-libraries
-                ;; Reduce size from 33 MiB to 7.4 MiB.
-                (lambda _
-                  (for-each delete-file
-                            (find-files #$output "\\.a(\\.syms)?$"))))))))
+                  (chdir "compiler-rt")))))))
       (native-inputs
        (modify-inputs (package-native-inputs template)
          (prepend gcc-12)))             ;libfuzzer fails to build with GCC 11
-- 
cgit 1.4.1


From 9c513303156b418567b9d2cde9f8df66190051ac Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 13 Jul 2023 16:50:27 +0200
Subject: shell: Really take system into account in the cache key.

Fixes <https://issues.guix.gnu.org/63230>.

Previously, when running "guix shell -s X ...", OPTS would contain
something like '((system . "X") ... (system . "DEFAULT")).  Thus, since
'profile-cached-gc-root' would iterate over it in this order, "DEFAULT"
would be passed to 'profile-file-cache-key' and 'profile-spec-cache-key'
instead of "X".

* guix/scripts/shell.scm (profile-cached-gc-root): Reverse OPTS before
entering 'loop'.
---
 guix/scripts/shell.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/shell.scm b/guix/scripts/shell.scm
index 1b42cc2af0..d67152cef7 100644
--- a/guix/scripts/shell.scm
+++ b/guix/scripts/shell.scm
@@ -374,7 +374,9 @@ return #f and #f."
   (define (key->file key)
     (string-append (%profile-cache-directory) "/" key))
 
-  (let loop ((opts opts)
+  ;; A given key such as 'system might appear more than once in OPTS, so
+  ;; process it backwards so the last occurrence "wins".
+  (let loop ((opts (reverse opts))
              (system (%current-system))
              (file #f)
              (specs '()))
-- 
cgit 1.4.1


From 5594f4c999a71427d7aad9898d7e614b8dbd6b3a Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@araneo.si>
Date: Sat, 1 Jul 2023 19:41:21 +0200
Subject: gnu: sssd: Update to 2.9.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/sssd.scm (sssd): Update to 2.9.1.
[native-inputs]: Add bc.
* gnu/packages/patches/sssd-system-directories.patch: Adjust for new version.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/patches/sssd-system-directories.patch | 19 +++++--------------
 gnu/packages/sssd.scm                              |  6 ++++--
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/patches/sssd-system-directories.patch b/gnu/packages/patches/sssd-system-directories.patch
index ce0dcf5d4d..cc37ac6024 100644
--- a/gnu/packages/patches/sssd-system-directories.patch
+++ b/gnu/packages/patches/sssd-system-directories.patch
@@ -2,19 +2,10 @@ Do not attempt to create $localstatedir and $sysconfdir (i.e., /var and /etc)
 upon "make install".
 
 diff --git a/Makefile.am b/Makefile.am
-index 0de53a2c8..51ad57bf1 100644
+index e780e8a14..afd2b0a49 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -58,7 +58,7 @@ sssddatadir = $(datadir)/sssd
- sssdapiplugindir = $(sssddatadir)/sssd.api.d
- sssdtapscriptdir = $(sssddatadir)/systemtap
- krb5snippetsdir = $(sssddatadir)/krb5-snippets
--dbuspolicydir = $(sysconfdir)/dbus-1/system.d
-+dbuspolicydir = $(prefix)/etc/dbus-1/system.d
- dbusservicedir = $(datadir)/dbus-1/system-services
- sss_statedir = $(localstatedir)/lib/sss
- runstatedir = @runstatedir@
-@@ -85,7 +85,7 @@ pkgconfigdir = $(libdir)/pkgconfig
+@@ -84,7 +84,7 @@ pkgconfigdir = $(libdir)/pkgconfig
  krb5rcachedir = @krb5rcachedir@
  sudolibdir = @sudolibpath@
  polkitdir = @polkitdir@
@@ -23,7 +14,7 @@ index 0de53a2c8..51ad57bf1 100644
  systemtap_tapdir = @tapset_dir@
  sssdkcmdatadir = $(datadir)/sssd-kcm
  deskprofilepath = $(sss_statedir)/deskprofile
-@@ -5195,7 +5195,6 @@ installsssddirs::
+@@ -5378,7 +5378,6 @@ installsssddirs::
      $(DESTDIR)$(bindir) \
      $(DESTDIR)$(sbindir) \
      $(DESTDIR)$(mandir) \
@@ -31,7 +22,7 @@ index 0de53a2c8..51ad57bf1 100644
      $(DESTDIR)$(pluginpath) \
      $(DESTDIR)$(libdir)/ldb \
      $(DESTDIR)$(dbuspolicydir) \
-@@ -5205,24 +5204,12 @@ installsssddirs::
+@@ -5388,24 +5387,12 @@ installsssddirs::
      $(DESTDIR)$(sssddatadir) \
      $(DESTDIR)$(sudolibdir) \
      $(DESTDIR)$(autofslibdir) \
@@ -56,7 +47,7 @@ index 0de53a2c8..51ad57bf1 100644
  
  if HAVE_DOXYGEN
  docs:
-@@ -5338,7 +5325,6 @@ if BUILD_SAMBA
+@@ -5523,7 +5510,6 @@ if BUILD_SAMBA
  endif
  if BUILD_KCM
  	$(MKDIR_P) $(DESTDIR)/$(sssdkcmdatadir)
diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm
index 25ff300aa9..251275312f 100644
--- a/gnu/packages/sssd.scm
+++ b/gnu/packages/sssd.scm
@@ -34,6 +34,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages)
   #:use-module (gnu packages adns)
+  #:use-module (gnu packages algebra)
   #:use-module (gnu packages augeas)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages bash)
@@ -138,7 +139,7 @@ fundamental object types for C.")
 (define-public sssd
   (package
     (name "sssd")
-    (version "2.8.1")
+    (version "2.9.1")
     (source
      (origin
        (method git-fetch)
@@ -147,7 +148,7 @@ fundamental object types for C.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "19vn2a1r33q6fnw7jmfv3s4kirnviz0rgq0w6wzx6h008iysidsd"))
+        (base32 "159hpd49nq3256j46lanbycx8hrj517s1pvxrflxsdqcdyix59rr"))
        (patches (search-patches "sssd-system-directories.patch"))))
     (build-system gnu-build-system)
     (arguments
@@ -279,6 +280,7 @@ fundamental object types for C.")
     (native-inputs
      (list autoconf
            automake
+           bc ; for tests
            check ; for tests
            cmocka ; for tests
            docbook-xml
-- 
cgit 1.4.1


From ff208b4b629a15ce0b72555db1cda9fcb7eec1c9 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Fri, 16 Jun 2023 15:26:04 +0200
Subject: gnu: arpack-ng: Update to 3.9.0.

* gnu/packages/maths.scm (arpack-ng): Update to 3.9.0.
[source]: Add 'patches'.
[build-system]: Switch to CMAKE-BUILD-SYSTEM.
[native-inputs]: Remove AUTOCONF, AUTOMAKE, and LIBTOOL.
(arpack-ng-openmpi)[inputs]: Use 'modify-inputs'.
[arguments]: Use gexps.
* gnu/packages/patches/arpack-ng-propagate-rng-state.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                       |   1 +
 gnu/packages/maths.scm                             |  25 +-
 .../patches/arpack-ng-propagate-rng-state.patch    | 523 +++++++++++++++++++++
 3 files changed, 537 insertions(+), 12 deletions(-)
 create mode 100644 gnu/packages/patches/arpack-ng-propagate-rng-state.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index c817c9c926..e9ce4ada54 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -905,6 +905,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/aoflagger-use-system-provided-pybind11.patch \
   %D%/packages/patches/apr-skip-getservbyname-test.patch	\
   %D%/packages/patches/ark-skip-xar-test.patch			\
+  %D%/packages/patches/arpack-ng-propagate-rng-state.patch	\
   %D%/packages/patches/aspell-CVE-2019-25051.patch		\
   %D%/packages/patches/aspell-default-dict-dir.patch		\
   %D%/packages/patches/ath9k-htc-firmware-binutils.patch	\
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 0d59ff30f7..b0b3e382ae 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -973,7 +973,7 @@ halfspaces) or by their double description with both representations.")
 (define-public arpack-ng
   (package
     (name "arpack-ng")
-    (version "3.8.0")
+    (version "3.9.0")
     (home-page "https://github.com/opencollab/arpack-ng")
     (source (origin
               (method git-fetch)
@@ -981,10 +981,11 @@ halfspaces) or by their double description with both representations.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0l7as5z6xvbxly8alam9s4kws70952qq35a6vkljzayi4b9gbklx"))))
-    (build-system gnu-build-system)
+                "09smxilyn8v9xs3kpx3nlj2s7ql3v8z40mpc09kccbb6smyd35iv"))
+              (patches (search-patches "arpack-ng-propagate-rng-state.patch"))))
+    (build-system cmake-build-system)
     (native-inputs
-     (list autoconf automake libtool pkg-config))
+     (list pkg-config))
     (inputs
      (list eigen lapack gfortran))
     (synopsis "Fortran subroutines for solving eigenvalue problems")
@@ -998,16 +999,16 @@ large scale eigenvalue problems.")
   (package (inherit arpack-ng)
     (name "arpack-ng-openmpi")
     (inputs
-     `(("mpi" ,openmpi)
-       ,@(package-inputs arpack-ng)))
+     (modify-inputs (package-inputs arpack-ng)
+       (prepend openmpi)))
     (arguments
      (substitute-keyword-arguments (package-arguments arpack-ng)
-       ((#:configure-flags _ '())
-        ''("--enable-mpi"))
-       ((#:phases phases '%standard-phases)
-        `(modify-phases ,phases
-           (add-before 'check 'mpi-setup
-             ,%openmpi-setup)))))
+       ((#:configure-flags _ #~())
+        #~'("-DMPI=ON"))
+       ((#:phases phases #~%standard-phases)
+        #~(modify-phases #$phases
+            (add-before 'check 'mpi-setup
+              #$%openmpi-setup)))))
     (synopsis "Fortran subroutines for solving eigenvalue problems with MPI")))
 
 (define-public lapack
diff --git a/gnu/packages/patches/arpack-ng-propagate-rng-state.patch b/gnu/packages/patches/arpack-ng-propagate-rng-state.patch
new file mode 100644
index 0000000000..4466bb8e50
--- /dev/null
+++ b/gnu/packages/patches/arpack-ng-propagate-rng-state.patch
@@ -0,0 +1,523 @@
+Fix a bug that manifests while running the test suite of 'python-igraph':
+
+  https://github.com/opencollab/arpack-ng/issues/401
+  https://github.com/opencollab/arpack-ng/pull/414
+
+From d885b7be4ecdc9c1496f2d6f256f6c0d34962459 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Szabolcs=20Horva=CC=81t?= <szhorvat@gmail.com>
+Date: Sun, 9 Apr 2023 16:36:35 +0200
+Subject: [PATCH] fix: ensure that LAPACK RNG state is propagated
+
+ - fixes #401, #410, #411
+ - restores 'inits' variable removed in ce2e69a849da1d10dad5d6d3ec4db6120b3ecf50, ensuring that the RNG state is propagated
+ - reverts e0d67054f573da351f12a226f7c7cc65a690ef3d to ensure that seed is different on each parallel thread
+ - updates seed initialization of parallel pdgetv0/psgetv0 so that they match that of pzgetv0/pcgetv0
+---
+ PARPACK/SRC/MPI/pcgetv0.f | 48 +++++++++++++++++++++++----------------
+ PARPACK/SRC/MPI/pdgetv0.f | 40 ++++++++++++++++++++++++++------
+ PARPACK/SRC/MPI/psgetv0.f | 43 ++++++++++++++++++++++++++---------
+ PARPACK/SRC/MPI/pzgetv0.f | 48 +++++++++++++++++++++++----------------
+ SRC/cgetv0.f              | 21 ++++++++++++-----
+ SRC/dgetv0.f              | 21 ++++++++++++-----
+ SRC/sgetv0.f              | 21 ++++++++++++-----
+ SRC/zgetv0.f              | 21 ++++++++++++-----
+ 8 files changed, 183 insertions(+), 80 deletions(-)
+
+diff --git a/PARPACK/SRC/MPI/pcgetv0.f b/PARPACK/SRC/MPI/pcgetv0.f
+index 59e3d1658..24fe8a0f1 100644
+--- a/PARPACK/SRC/MPI/pcgetv0.f
++++ b/PARPACK/SRC/MPI/pcgetv0.f
+@@ -176,13 +176,13 @@ subroutine pcgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj, myid, igen
+       Real
+      &           rnorm0
+       Complex
+      &           cnorm, cnorm2
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+       Complex
+      &           cnorm_buf, buf2(1)
+@@ -203,6 +203,12 @@ subroutine pcgetv0
+      &           ccdotc
+       external   ccdotc, pscnorm2, slapy2
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -213,26 +219,30 @@ subroutine pcgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
++      if (inits) then
+ c
+-c     %-----------------------------------%
+-c     | Generate a seed on each processor |
+-c     | using process id (myid).          |
+-c     | Note: the seed must be between 1  |
+-c     | and 4095.  iseed(4) must be odd.  |
+-c     %-----------------------------------%
++c        %-----------------------------------%
++c        | Generate a seed on each processor |
++c        | using process id (myid).          |
++c        | Note: the seed must be between 1  |
++c        | and 4095.  iseed(4) must be odd.  |
++c        %-----------------------------------%
+ c
+-      call MPI_COMM_RANK(comm, myid, ierr)
+-      igen = 1000 + 2*myid + 1
+-      if (igen .gt. 4095) then
+-         write(0,*) 'Error in p_getv0: seed exceeds 4095!'
+-      end if
++         call MPI_COMM_RANK(comm, myid, ierr)
++         igen = 1000 + 2*myid + 1
++         if (igen .gt. 4095) then
++            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
++         end if
++c
++         iseed(1) = igen/1000
++         igen     = mod(igen,1000)
++         iseed(2) = igen/100
++         igen     = mod(igen,100)
++         iseed(3) = igen/10
++         iseed(4) = mod(igen,10)
+ c
+-      iseed(1) = igen/1000
+-      igen     = mod(igen,1000)
+-      iseed(2) = igen/100
+-      igen     = mod(igen,100)
+-      iseed(3) = igen/10
+-      iseed(4) = 7
++         inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/PARPACK/SRC/MPI/pdgetv0.f b/PARPACK/SRC/MPI/pdgetv0.f
+index 0f348b820..5a1956997 100644
+--- a/PARPACK/SRC/MPI/pdgetv0.f
++++ b/PARPACK/SRC/MPI/pdgetv0.f
+@@ -177,11 +177,11 @@ subroutine pdgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
+-      integer    idist, iseed(4), iter, msglvl, jj
++      logical    first, inits, orth
++      integer    idist, iseed(4), iter, msglvl, jj, myid, igen
+       Double precision
+      &           rnorm0, buf2(1)
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+       Double precision
+      &           rnorm_buf
+@@ -206,6 +206,12 @@ subroutine pdgetv0
+ c
+       intrinsic    abs, sqrt
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -216,10 +222,30 @@ subroutine pdgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++c
++c        %-----------------------------------%
++c        | Generate a seed on each processor |
++c        | using process id (myid).          |
++c        | Note: the seed must be between 1  |
++c        | and 4095.  iseed(4) must be odd.  |
++c        %-----------------------------------%
++c
++         call MPI_COMM_RANK(comm, myid, ierr)
++         igen = 1000 + 2*myid + 1
++         if (igen .gt. 4095) then
++            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
++         end if
++c
++         iseed(1) = igen/1000
++         igen     = mod(igen,1000)
++         iseed(2) = igen/100
++         igen     = mod(igen,100)
++         iseed(3) = igen/10
++         iseed(4) = mod(igen,10)
++c
++         inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/PARPACK/SRC/MPI/psgetv0.f b/PARPACK/SRC/MPI/psgetv0.f
+index d79a513b2..078e4fa8c 100644
+--- a/PARPACK/SRC/MPI/psgetv0.f
++++ b/PARPACK/SRC/MPI/psgetv0.f
+@@ -177,11 +177,11 @@ subroutine psgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
+-      integer    idist, iseed(4), iter, msglvl, jj
++      logical    first, inits, orth
++      integer    idist, iseed(4), iter, msglvl, jj, myid, igen
+       Real
+      &           rnorm0
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+       Real
+      &           rnorm_buf
+@@ -206,20 +206,41 @@ subroutine psgetv0
+ c
+       intrinsic    abs, sqrt
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+ c
+ c
+-c     %-----------------------------------%
+-c     | Initialize the seed of the LAPACK |
+-c     | random number generator           |
+-c     %-----------------------------------%
++      if (inits) then
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++c        %-----------------------------------%
++c        | Generate a seed on each processor |
++c        | using process id (myid).          |
++c        | Note: the seed must be between 1  |
++c        | and 4095.  iseed(4) must be odd.  |
++c        %-----------------------------------%
++c
++         call MPI_COMM_RANK(comm, myid, ierr)
++         igen = 1000 + 2*myid + 1
++         if (igen .gt. 4095) then
++            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
++         end if
++c
++         iseed(1) = igen/1000
++         igen     = mod(igen,1000)
++         iseed(2) = igen/100
++         igen     = mod(igen,100)
++         iseed(3) = igen/10
++         iseed(4) = mod(igen,10)
++c
++         inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/PARPACK/SRC/MPI/pzgetv0.f b/PARPACK/SRC/MPI/pzgetv0.f
+index 731fb319f..94fb705f3 100644
+--- a/PARPACK/SRC/MPI/pzgetv0.f
++++ b/PARPACK/SRC/MPI/pzgetv0.f
+@@ -176,13 +176,13 @@ subroutine pzgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj, myid, igen
+       Double precision
+      &           rnorm0
+       Complex*16
+      &           cnorm, cnorm2
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+       Complex*16
+      &           cnorm_buf, buf2(1)
+@@ -203,6 +203,12 @@ subroutine pzgetv0
+      &           zzdotc
+       external   zzdotc , pdznorm2 , dlapy2
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -213,26 +219,30 @@ subroutine pzgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
++      if (inits) then
+ c
+-c     %-----------------------------------%
+-c     | Generate a seed on each processor |
+-c     | using process id (myid).          |
+-c     | Note: the seed must be between 1  |
+-c     | and 4095.  iseed(4) must be odd.  |
+-c     %-----------------------------------%
++c        %-----------------------------------%
++c        | Generate a seed on each processor |
++c        | using process id (myid).          |
++c        | Note: the seed must be between 1  |
++c        | and 4095.  iseed(4) must be odd.  |
++c        %-----------------------------------%
+ c
+-      call MPI_COMM_RANK(comm, myid, ierr)
+-      igen = 1000 + 2*myid + 1
+-      if (igen .gt. 4095) then
+-         write(0,*) 'Error in p_getv0: seed exceeds 4095!'
+-      end if
++         call MPI_COMM_RANK(comm, myid, ierr)
++         igen = 1000 + 2*myid + 1
++         if (igen .gt. 4095) then
++            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
++         end if
++c
++         iseed(1) = igen/1000
++         igen     = mod(igen,1000)
++         iseed(2) = igen/100
++         igen     = mod(igen,100)
++         iseed(3) = igen/10
++         iseed(4) = mod(igen,10)
+ c
+-      iseed(1) = igen/1000
+-      igen     = mod(igen,1000)
+-      iseed(2) = igen/100
+-      igen     = mod(igen,100)
+-      iseed(3) = igen/10
+-      iseed(4) = 7
++         inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/SRC/cgetv0.f b/SRC/cgetv0.f
+index b49e66708..c231eadcb 100644
+--- a/SRC/cgetv0.f
++++ b/SRC/cgetv0.f
+@@ -156,13 +156,13 @@ subroutine cgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj
+       Real
+      &           rnorm0
+       Complex
+      &           cnorm
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+ c     %----------------------%
+ c     | External Subroutines |
+@@ -180,6 +180,12 @@ subroutine cgetv0
+      &           ccdotc
+       external   ccdotc, scnrm2, slapy2
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -190,10 +196,13 @@ subroutine cgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++          iseed(1) = 1
++          iseed(2) = 3
++          iseed(3) = 5
++          iseed(4) = 7
++          inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/SRC/dgetv0.f b/SRC/dgetv0.f
+index 8be4fa26d..1d6dc01bd 100644
+--- a/SRC/dgetv0.f
++++ b/SRC/dgetv0.f
+@@ -157,11 +157,11 @@ subroutine dgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj
+       Double precision
+      &           rnorm0
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+ c     %----------------------%
+ c     | External Subroutines |
+@@ -183,6 +183,12 @@ subroutine dgetv0
+ c
+       intrinsic    abs, sqrt
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -193,10 +199,13 @@ subroutine dgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++          iseed(1) = 1
++          iseed(2) = 3
++          iseed(3) = 5
++          iseed(4) = 7
++          inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/SRC/sgetv0.f b/SRC/sgetv0.f
+index 26130a014..d861b2d6d 100644
+--- a/SRC/sgetv0.f
++++ b/SRC/sgetv0.f
+@@ -157,11 +157,11 @@ subroutine sgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj
+       Real
+      &           rnorm0
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+ c     %----------------------%
+ c     | External Subroutines |
+@@ -183,6 +183,12 @@ subroutine sgetv0
+ c
+       intrinsic    abs, sqrt
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -193,10 +199,13 @@ subroutine sgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++          iseed(1) = 1
++          iseed(2) = 3
++          iseed(3) = 5
++          iseed(4) = 7
++          inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/SRC/zgetv0.f b/SRC/zgetv0.f
+index cc13c3cfb..1fbd50851 100644
+--- a/SRC/zgetv0.f
++++ b/SRC/zgetv0.f
+@@ -156,13 +156,13 @@ subroutine zgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj
+       Double precision
+      &           rnorm0
+       Complex*16
+      &           cnorm
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+ c     %----------------------%
+ c     | External Subroutines |
+@@ -180,6 +180,12 @@ subroutine zgetv0
+      &           zzdotc
+       external   zzdotc, dznrm2, dlapy2
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -190,10 +196,13 @@ subroutine zgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++          iseed(1) = 1
++          iseed(2) = 3
++          iseed(3) = 5
++          iseed(4) = 7
++          inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
-- 
cgit 1.4.1


From 85ebfcf4ffe5dda6f1eceb00b6afdac3239c0a31 Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Mon, 22 May 2023 11:04:12 +0200
Subject: gnu: glibc/hurd-headers: Properly cross-build.

* gnu/packages/base.scm (glibc/hurd-headers): Rely on cross-mig, and remove
hardcoded configure flag `--host=i586-pc-gnu`.
* gnu/packages/cross-base.scm (cross-kernel-headers*): Add `--host` and
`--build` configure flags.
---
 gnu/packages/base.scm       | 12 ++++++------
 gnu/packages/cross-base.scm |  7 ++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index ada9edf0e6..38593e4ada 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe>
 ;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1427,17 +1428,15 @@ command.")
     (native-inputs
      (modify-inputs (package-native-inputs glibc)
        (prepend (if (%current-target-system)
-                    ;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG,
-                    ;; hence this hack.
-                    (package (inherit mig)
-                             (arguments `(#:system "i686-linux")))
+                    (let* ((cross-base (resolve-interface '(gnu packages cross-base)))
+                           (cross-mig (module-ref cross-base 'cross-mig)))
+                      (cross-mig (%current-target-system)))
                     mig))))
     (arguments
      (substitute-keyword-arguments (package-arguments glibc)
        ;; We just pass the flags really needed to build the headers.
        ((#:configure-flags flags)
         `(list "--enable-add-ons"
-               "--host=i586-pc-gnu"
                ,@%glibc/hurd-configure-flags))
        ((#:phases _)
         '(modify-phases %standard-phases
@@ -1452,7 +1451,8 @@ command.")
                  (close-port
                   (open-output-file
                    (string-append out "/include/gnu/stubs.h"))))))
-           (delete 'build)))))))                  ; nothing to build
+           (delete 'build)))))                  ; nothing to build
+    (supported-systems %hurd-systems)))
 
 (define-public tzdata
   (package
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 8d0b41180b..e5fc4ba8b5 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2019 Carl Dong <contact@carldong.me>
 ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -492,7 +493,11 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
                                               hurd "/include")))
                    (for-each (cut setenv <> cpath)
                              ',%gcc-cross-include-paths)
-                   #t)))))))
+                   #t)))))
+         ((#:configure-flags flags)
+          `(cons* ,(string-append "--build=" (%current-system))
+                  ,(string-append "--host=" target)
+                  ,flags))))
 
       (propagated-inputs `(("gnumach-headers" ,xgnumach-headers)
                            ("hurd-headers" ,xhurd-headers)))
-- 
cgit 1.4.1


From c2bb342b5ff0ac15d6dc37a9ba8daeb8956237e1 Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Mon, 22 May 2023 11:04:13 +0200
Subject: gnu: gnumach-headers: Cross-build without relying on x86.

* gnu/packages/hurd.scm (gnumach-headers): Remove configure flags where we
say the builder is running x86.
* gnu/packages/cross-base.scm (cross-gnumach-headers): Work around limitation
of build system, by manually changing the target host_cpu without relying on
--host, because we don't have a working cross-compiler yet.
---
 gnu/packages/cross-base.scm | 18 ++++++++++++++++++
 gnu/packages/hurd.scm       | 11 +----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index e5fc4ba8b5..cdf642358d 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -375,6 +375,24 @@ target that libc."
     (inherit gnumach-headers)
     (name (string-append (package-name gnumach-headers)
                          "-cross-" target))
+    (arguments
+     (substitute-keyword-arguments (package-arguments gnumach-headers)
+       ((#:phases phases #~%standard-phases)
+        #~(modify-phases #$phases
+            ;; Cheat by setting the host_cpu variable manually, since using
+            ;; --host= would require a working cross-compiler, which we don't
+            ;; have yet.
+            (add-after 'unpack 'substitute-host-cpu
+              (lambda _
+                (substitute* "configure.ac"
+                  (("AC_CANONICAL_HOST")
+                   #$(string-append
+                      "host_cpu="
+                      (match target
+                        ((? target-x86-32?)
+                         "i386")
+                        ((? target-x86-64?)
+                         "x86_64")))))))))))
     (native-inputs
      (modify-inputs (package-native-inputs gnumach-headers)
        (prepend xgcc xbinutils)))))
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index c9f77d799a..438f07c20c 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2020, 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Rene Saavedra <pacoon@protonmail.com>
+;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -75,16 +76,6 @@
            (lambda _
              (invoke "make" "install-data")))
          (delete 'build))
-
-       ;; GNU Mach supports only IA32 currently, so cheat so that we can at
-       ;; least install its headers.
-       ,@(if (%current-target-system)
-             '()
-             ;; See <http://lists.gnu.org/archive/html/bug-hurd/2015-06/msg00042.html>
-             ;; <http://lists.gnu.org/archive/html/guix-devel/2015-06/msg00716.html>
-             '(#:configure-flags '("--build=i586-pc-gnu"
-                                   "--host=i686-linux-gnu")))
-
        #:tests? #f))
     (native-inputs
      (list autoconf automake texinfo-4))
-- 
cgit 1.4.1


From 0613df90ddadce62b2c6e22048b216602bd9a230 Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Mon, 22 May 2023 11:04:14 +0200
Subject: gnu: hurd: Update supported systems.

* gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal,
hurd-core-headers, gnumach): Update supported systems to %hurd-systems.
---
 gnu/packages/hurd.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 438f07c20c..8ca8415436 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -79,6 +79,7 @@
        #:tests? #f))
     (native-inputs
      (list autoconf automake texinfo-4))
+    (supported-systems %hurd-systems)
     (home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html")
     (synopsis "GNU Mach kernel headers")
     (description
@@ -189,6 +190,7 @@ communication.")
                              "ac_cv_func_file_futimens=no")
 
          #:tests? #f))
+      (supported-systems %hurd-systems)
       (home-page "https://www.gnu.org/software/hurd/hurd.html")
       (synopsis "GNU Hurd headers")
       (description
@@ -224,6 +226,7 @@ Library and other user programs.")
 
                ;; Build libihash.
                (invoke "make" "-Clibihash" "libihash.a")))))))
+    (supported-systems %hurd-systems)
     (home-page "https://www.gnu.org/software/hurd/hurd.html")
     (synopsis "GNU Hurd libraries")
     (description
@@ -256,6 +259,7 @@ Library for GNU/Hurd.")
                                      directories)
                         #t))))))
     (inputs (list gnumach-headers hurd-headers hurd-minimal))
+    (supported-systems %hurd-systems)
     (synopsis "Union of the Hurd headers and libraries")
     (description
      "This package contains the union of the Mach and Hurd headers and the
@@ -291,7 +295,7 @@ Hurd-minimal package which are needed for both glibc and GCC.")
                    mig)
            perl
            texinfo-4))
-    (supported-systems (cons "i686-linux" %hurd-systems))
+    (supported-systems %hurd-systems)
     (synopsis "Microkernel of the GNU system")
     (description
      "GNU Mach is the microkernel upon which a GNU Hurd system is based.")))
-- 
cgit 1.4.1


From 0dd293b4d9095137c9952e16ca951f887b7e7018 Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Mon, 22 May 2023 11:42:26 +0200
Subject: gnu: Add libc-for-target and glibc/hurd.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch
* gnu/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch
* gnu/packages/patches/glibc-2.37-versioned-locpath.patch: New patches.
* gnu/local.mk (dist_patch_DATA): Register them.

* gnu/packages/base.scm (glibc/hurd, libc-for-target): New variables.
(glibc/hurd-headers): Use glibc/hurd.
* gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)[outputs,
source, arguments]
(glibc-final)[source]: Use libc-for-target instead of glibc.
* gnu/packages/cross-base.scm (cross-libc/deprecated, cross-libc*): Use
libc-for-target.

This part fixes

    https://issues.guix.gnu.org/63641#25

* gnu/packages/commencement.scm (%final-inputs): Change to memoized lambda
taking "system".
* gnu/packages/commencement.scm (canonical-package): Likewise, and update
user, passing (%current-system).
(make-gcc-toolchain): Update user, passing (%current-system).
* gnu/packages/base.scm (%final-inputs): Likewise.
* guix/scripts/refresh.scm (options->update-specs): Likewise.
* guix/build-system/gnu.scm (standard-packages): Add optional "system"
parameter.
(lower): Update caller.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Co-authored-by: Janneke Nieuwenhuizen <janneke@gnu.org>
---
 gnu/local.mk                                       |   3 +
 gnu/packages/base.scm                              |  39 ++-
 gnu/packages/commencement.scm                      | 251 ++++++++++----------
 gnu/packages/cross-base.scm                        |   4 +-
 .../glibc-2.37-hurd-clock_t_centiseconds.patch     |  61 +++++
 ...c-2.37-hurd-local-clock_gettime_MONOTONIC.patch | 135 +++++++++++
 .../patches/glibc-2.37-versioned-locpath.patch     | 264 +++++++++++++++++++++
 guix/build-system/gnu.scm                          |   6 +-
 guix/scripts/refresh.scm                           |   3 +-
 9 files changed, 634 insertions(+), 132 deletions(-)
 create mode 100644 gnu/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch
 create mode 100644 gnu/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch
 create mode 100644 gnu/packages/patches/glibc-2.37-versioned-locpath.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index e9ce4ada54..3481659faa 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1260,6 +1260,9 @@ dist_patch_DATA =						\
   %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch	\
   %D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch	\
   %D%/packages/patches/glibc-2.31-hurd-clock_gettime_monotonic.patch	\
+  %D%/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch	\
+  %D%/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch	\
+  %D%/packages/patches/glibc-2.37-versioned-locpath.patch	\
   %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch	\
   %D%/packages/patches/glibc-hurd-gettyent.patch		\
   %D%/packages/patches/glibc-hurd-mach-print.patch		\
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 38593e4ada..55fe70309c 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -76,6 +76,7 @@
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:export (glibc
+            libc-for-target
             make-ld-wrapper
             libiconv-if-needed))
 
@@ -1420,20 +1421,41 @@ variety of options.  It is an alternative to the shell \"type\" built-in
 command.")
     (license gpl3+))) ; some files are under GPLv2+
 
+(define-public glibc/hurd
+  (package/inherit glibc
+    (name "glibc-hurd")
+    (version "2.37")
+    (source (origin
+            (method url-fetch)
+            (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz"))
+            (sha256
+             (base32
+              "0hqsp4dzrjx0iga6jv0magjw26dh82pxlmk8yis5v0d127qyymr2"))
+            (patches (search-patches "glibc-ldd-powerpc.patch"
+                                     "glibc-dl-cache.patch"
+                                     "glibc-2.37-versioned-locpath.patch"
+                                     "glibc-reinstate-prlimit64-fallback.patch"
+                                     "glibc-supported-locales.patch"
+                                     "glibc-2.37-hurd-clock_t_centiseconds.patch"
+                                     "glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch"
+                                     "glibc-hurd-mach-print.patch"
+                                     "glibc-hurd-gettyent.patch"))))
+    (supported-systems %hurd-systems)))
+
 (define-public glibc/hurd-headers
-  (package (inherit glibc)
+  (package/inherit glibc/hurd
     (name "glibc-hurd-headers")
     (outputs '("out"))
     (propagated-inputs (list gnumach-headers hurd-headers))
     (native-inputs
-     (modify-inputs (package-native-inputs glibc)
+     (modify-inputs (package-native-inputs glibc/hurd)
        (prepend (if (%current-target-system)
                     (let* ((cross-base (resolve-interface '(gnu packages cross-base)))
                            (cross-mig (module-ref cross-base 'cross-mig)))
                       (cross-mig (%current-target-system)))
                     mig))))
     (arguments
-     (substitute-keyword-arguments (package-arguments glibc)
+     (substitute-keyword-arguments (package-arguments glibc/hurd)
        ;; We just pass the flags really needed to build the headers.
        ((#:configure-flags flags)
         `(list "--enable-add-ons"
@@ -1454,6 +1476,15 @@ command.")
            (delete 'build)))))                  ; nothing to build
     (supported-systems %hurd-systems)))
 
+(define* (libc-for-target #:optional
+                          (target (or (%current-target-system)
+                                      (%current-system))))
+  (match target
+    ((? target-hurd?)
+     glibc/hurd)
+    (_
+     glibc)))
+
 (define-public tzdata
   (package
     (name "tzdata")
@@ -1602,6 +1633,6 @@ package needs iconv ,@(libiconv-if-needed) should be added."
   "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)))
+    ((module-ref iface '%final-inputs) (%current-system))))
 
 ;;; base.scm ends here
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 669d54099d..9bd0c113c2 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2822,64 +2822,65 @@ memoized as a function of '%current-system'."
     ("binutils-cross" ,binutils-boot0)
     ,@(alist-delete "binutils" (%boot0-inputs))))
 
-(define glibc-final-with-bootstrap-bash
+(define/system-dependent glibc-final-with-bootstrap-bash
   ;; The final libc, "cross-built".  If everything went well, the resulting
   ;; store path has no dependencies.  Actually, the really-final libc is
   ;; built just below; the only difference is that this one uses the
   ;; bootstrap Bash.
-  (package
-    (inherit glibc)
-    (name "glibc-intermediate")
-    (outputs (delete "debug" (package-outputs glibc)))
-    (source (bootstrap-origin (package-source glibc)))
-    (arguments
-     `(#:guile ,%bootstrap-guile
-       #:implicit-inputs? #f
-
-       ,@(substitute-keyword-arguments (package-arguments glibc)
-           ((#:configure-flags flags)
-            `(append (list ,(string-append "--host=" (boot-triplet))
-                           ,(string-append "--build="
-                                           (nix-system->gnu-triplet))
-                           ,(if (system-hurd?) "--disable-werror"
-                                ""))
-                     ,flags))
-           ((#:phases phases)
-            `(modify-phases ,phases
-               (add-before 'configure 'pre-configure
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   ;; Don't clobber include paths with the bootstrap libc.
-                   (unsetenv "C_INCLUDE_PATH")
-                   (unsetenv "CPLUS_INCLUDE_PATH")
-
-                   ;; Tell 'libpthread' where to find 'libihash' on Hurd systems.
-                   ,@(if (system-hurd?)
-                       '((substitute* '("sysdeps/mach/Makefile"
-                                        "sysdeps/mach/hurd/Makefile")
-                           (("LDLIBS-pthread.so =.*")
-                            (string-append "LDLIBS-pthread.so = "
-                                           (assoc-ref %build-inputs "kernel-headers")
-                                           "/lib/libihash.a\n"))))
-                       '()))))))))
-    (propagated-inputs `(("kernel-headers" ,(kernel-headers-boot0))))
-    (native-inputs
-     `(("bison" ,bison-boot0)
-       ("texinfo" ,texinfo-boot0)
-       ("perl" ,perl-boot0)
-       ("python" ,python-boot0)))
-    (inputs
-     `( ;; The boot inputs.  That includes the bootstrap libc.  We don't want
-       ;; it in $CPATH, hence the 'pre-configure' phase above.
-       ,@(%boot1-inputs)
+  (let ((libc (libc-for-target)))
+    (package
+      (inherit libc)
+      (name "glibc-intermediate")
+      (outputs (delete "debug" (package-outputs libc)))
+      (source (bootstrap-origin (package-source libc)))
+      (arguments
+       `(#:guile ,%bootstrap-guile
+         #:implicit-inputs? #f
 
-       ;; A native MiG is needed to build Glibc on Hurd.
-       ,@(if (system-hurd?)
-             `(("mig" ,mig-boot0))
-             '())
+         ,@(substitute-keyword-arguments (package-arguments libc)
+             ((#:configure-flags flags)
+              `(append (list ,(string-append "--host=" (boot-triplet))
+                             ,(string-append "--build="
+                                             (nix-system->gnu-triplet))
+                             ,(if (system-hurd?) "--disable-werror"
+                                  ""))
+                       ,flags))
+             ((#:phases phases)
+              `(modify-phases ,phases
+                 (add-before 'configure 'pre-configure
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     ;; Don't clobber include paths with the bootstrap libc.
+                     (unsetenv "C_INCLUDE_PATH")
+                     (unsetenv "CPLUS_INCLUDE_PATH")
+
+                     ;; Tell 'libpthread' where to find 'libihash' on Hurd systems.
+                     ,@(if (system-hurd?)
+                           '((substitute* '("sysdeps/mach/Makefile"
+                                            "sysdeps/mach/hurd/Makefile")
+                               (("LDLIBS-pthread.so =.*")
+                                (string-append "LDLIBS-pthread.so = "
+                                               (assoc-ref %build-inputs "kernel-headers")
+                                               "/lib/libihash.a\n"))))
+                           '()))))))))
+      (propagated-inputs `(("kernel-headers" ,(kernel-headers-boot0))))
+      (native-inputs
+       `(("bison" ,bison-boot0)
+         ("texinfo" ,texinfo-boot0)
+         ("perl" ,perl-boot0)
+         ("python" ,python-boot0)))
+      (inputs
+       `( ;; The boot inputs.  That includes the bootstrap libc.  We don't want
+         ;; it in $CPATH, hence the 'pre-configure' phase above.
+         ,@(%boot1-inputs)
+
+         ;; A native MiG is needed to build Glibc on Hurd.
+         ,@(if (system-hurd?)
+               `(("mig" ,mig-boot0))
+               '())
 
-       ;; Here, we use the bootstrap Bash, which is not satisfactory
-       ;; because we don't want to depend on bootstrap tools.
-       ("static-bash" ,@(assoc-ref (%boot0-inputs) "bash"))))))
+         ;; Here, we use the bootstrap Bash, which is not satisfactory
+         ;; because we don't want to depend on bootstrap tools.
+         ("static-bash" ,@(assoc-ref (%boot0-inputs) "bash")))))))
 
 (define (cross-gcc-wrapper gcc binutils glibc bash)
   "Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC
@@ -2997,39 +2998,39 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
                         (("^PROGRAMS =.*$")
                          "PROGRAMS =\n")))))))))
 
-(define glibc-final
+(define/system-dependent glibc-final
   ;; The final glibc, which embeds the statically-linked Bash built above.
   ;; Use 'package/inherit' so we get the 'replacement' of 'glibc', if any.
-  (package/inherit
-   glibc
-   (name "glibc")
-   (source (bootstrap-origin (package-source glibc)))
-   (inputs `(("static-bash" ,static-bash-for-glibc)
-             ,@(alist-delete
-                "static-bash"
-                (package-inputs glibc-final-with-bootstrap-bash))))
-
-   ;; This time we need 'msgfmt' to install all the libc.mo files.
-   (native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash)
-                    ("gettext" ,gettext-boot0)))
-
-   (propagated-inputs
-    (package-propagated-inputs glibc-final-with-bootstrap-bash))
-
-   ;; The final libc only refers to itself, but the 'debug' output contains
-   ;; references to GCC-BOOT0 and to the Linux headers.  XXX: Would be great
-   ;; if 'allowed-references' were per-output.
-   (arguments
-    `(#:allowed-references
-      (,(gexp-input gcc-boot0 "lib")
-       ,(kernel-headers-boot0)
-       ,static-bash-for-glibc
-       ,@(if (system-hurd?)
-             `(,gnumach-headers-boot0
-               ,hurd-headers-boot0)
-             '())
-       ,@(package-outputs glibc-final-with-bootstrap-bash))
-      ,@(package-arguments glibc-final-with-bootstrap-bash)))))
+  (let ((libc (libc-for-target)))
+    (package/inherit libc
+      (name "glibc")
+      (source (bootstrap-origin (package-source libc)))
+      (inputs `(("static-bash" ,static-bash-for-glibc)
+                ,@(alist-delete
+                   "static-bash"
+                   (package-inputs glibc-final-with-bootstrap-bash))))
+
+      ;; This time we need 'msgfmt' to install all the libc.mo files.
+      (native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash)
+                       ("gettext" ,gettext-boot0)))
+
+      (propagated-inputs
+       (package-propagated-inputs glibc-final-with-bootstrap-bash))
+
+      ;; The final libc only refers to itself, but the 'debug' output contains
+      ;; references to GCC-BOOT0 and to the Linux headers.  XXX: Would be great
+      ;; if 'allowed-references' were per-output.
+      (arguments
+       `(#:allowed-references
+         (,(gexp-input gcc-boot0 "lib")
+          ,(kernel-headers-boot0)
+          ,static-bash-for-glibc
+          ,@(if (system-hurd?)
+                `(,gnumach-headers-boot0
+                  ,hurd-headers-boot0)
+                '())
+          ,@(package-outputs glibc-final-with-bootstrap-bash))
+         ,@(package-arguments glibc-final-with-bootstrap-bash))))))
 
 (define/system-dependent gcc-boot0-wrapped
   ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the
@@ -3356,45 +3357,49 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
     (package/inherit sed (native-inputs `(("perl" ,perl-boot0))))))
 
 (define-public %final-inputs
-  ;; Final derivations used as implicit inputs by 'gnu-build-system'.  We
-  ;; 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))))
+  ;; The 'glibc-final' package is not the same depending on what system is
+  ;; targeted, so this whole list must be parameterized.
+  (mlambda (system)
+    ;; Final derivations used as implicit inputs by 'gnu-build-system'.  We
+    ;; 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)))))
 
 (define-public canonical-package
-  (let ((name->package (fold (lambda (input result)
-                               (match input
-                                 ((_ package . outputs)
-                                  (vhash-cons (package-full-name package)
-                                              package result))))
-                             vlist-null
-                             `(("guile" ,guile-final)
-                               ,@%final-inputs))))
+  (let ((name->package (mlambda (system)
+                         (fold (lambda (input result)
+                                 (match input
+                                   ((_ package . outputs)
+                                    (vhash-cons (package-full-name package)
+                                                package result))))
+                               vlist-null
+                               `(("guile" ,guile-final)
+                                 ,@(%final-inputs system))))))
     (lambda (package)
       "Return the 'canonical' variant of PACKAGE---i.e., if PACKAGE is one of
 the implicit inputs of 'gnu-build-system', return that one, otherwise return
@@ -3404,7 +3409,8 @@ The goal is to avoid duplication in cases like GUILE-FINAL vs. GUILE-2.2,
 COREUTILS-FINAL vs. COREUTILS, etc."
       ;; XXX: This doesn't handle dependencies of the final inputs, such as
       ;; libunistring, GMP, etc.
-      (match (vhash-assoc (package-full-name package) name->package)
+      (match (vhash-assoc (package-full-name package)
+                          (name->package (%current-system)))
         ((_ . canon)
          ;; In general we want CANON, except if we're cross-compiling: CANON
          ;; uses explicit inputs, so it is "anchored" in the bootstrapped
@@ -3486,7 +3492,8 @@ is the GNU Compiler Collection.")
       ;; install everything that we need, and (2) to make sure ld-wrapper comes
       ;; before Binutils' ld in the user's profile.
       (inputs `(("gcc" ,gcc)
-                ("ld-wrapper" ,(car (assoc-ref %final-inputs "ld-wrapper")))
+                ("ld-wrapper" ,(car (assoc-ref (%final-inputs (%current-system))
+                                               "ld-wrapper")))
                 ("binutils" ,binutils-final)
                 ("libc" ,libc)
                 ("libc-debug" ,libc "debug")
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index cdf642358d..21d7277e22 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -578,7 +578,7 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
 
 (define* (cross-libc/deprecated target
                                 #:optional
-                                (libc glibc)
+                                (libc (libc-for-target target))
                                 (xgcc (cross-gcc target))
                                 (xbinutils (cross-binutils target))
                                 (xheaders (cross-kernel-headers target)))
@@ -591,7 +591,7 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
 
 (define* (cross-libc* target
                       #:key
-                      (libc glibc)
+                      (libc (libc-for-target target))
                       (xgcc (cross-gcc target))
                       (xbinutils (cross-binutils target))
                       (xheaders (cross-kernel-headers target)))
diff --git a/gnu/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch b/gnu/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch
new file mode 100644
index 0000000000..944b2fe8df
--- /dev/null
+++ b/gnu/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch
@@ -0,0 +1,61 @@
+Taken from: https://salsa.debian.org/glibc-team/glibc/-/blob/9ce19663f00176f30d6eab29fd14db3e7cd53dcf/debian/patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff
+
+Some applications assume centisecond precision, or at most millisecond precision
+(e.g. guile).  This is a work-around for them.
+
+---
+ getclktck.c |    5 ++---
+ setitimer.c |    2 +-
+ times.c     |    2 +-
+ 4 files changed, 8 insertions(+), 9 deletions(-)
+commit d57f2f9b4bd007846af2fb4217486ea572579010
+Author: Richard Braun <rbraun@sceen.net>
+Date:   Tue Aug 27 11:35:31 2013 +0200
+
+    Express CPU time (clock_t of times(2)) in centiseconds
+
+diff --git a/sysdeps/mach/hurd/getclktck.c b/sysdeps/mach/hurd/getclktck.c
+index 69be2cc..5f7d946 100644
+--- a/sysdeps/mach/hurd/getclktck.c
++++ b/sysdeps/mach/hurd/getclktck.c
+@@ -18,12 +18,11 @@
+ 
+ #include <time.h>
+ 
+-/* Return frequency of `times'.
+-   Since Mach reports CPU times in microseconds, we always use 1 million.  */
++/* Return frequency of `times'.  */
+ int
+ __getclktck (void)
+ {
+-  return 1000000;
++  return 100;
+ }
+ 
+ /* Before glibc 2.2, the Hurd actually did this differently, so we
+diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c
+index 39b6b16..4992c89 100644
+--- a/sysdeps/mach/hurd/setitimer.c
++++ b/sysdeps/mach/hurd/setitimer.c
+@@ -42,7 +42,7 @@ quantize_timeval (struct timeval *tv)
+   static time_t quantum = -1;
+ 
+   if (quantum == -1)
+-    quantum = 1000000 / __getclktck ();
++    quantum = 100 / __getclktck ();
+ 
+   tv->tv_usec = ((tv->tv_usec + (quantum - 1)) / quantum) * quantum;
+   if (tv->tv_usec >= 1000000)
+diff --git a/sysdeps/mach/hurd/times.c b/sysdeps/mach/hurd/times.c
+index 9e13a75..593c33a 100644
+--- a/sysdeps/mach/hurd/times.c
++++ b/sysdeps/mach/hurd/times.c
+@@ -29,7 +29,7 @@
+ static inline clock_t
+ clock_from_time_value (const time_value_t *t)
+ {
+-  return t->seconds * 1000000 + t->microseconds;
++  return t->seconds * 100 + t->microseconds / 10000;
+ }
+ 
+ /* Store the CPU time used by this process and all its
diff --git a/gnu/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch b/gnu/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch
new file mode 100644
index 0000000000..63e06b8519
--- /dev/null
+++ b/gnu/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch
@@ -0,0 +1,135 @@
+Taken from: https://salsa.debian.org/glibc-team/glibc/-/blob/9ce19663f00176f30d6eab29fd14db3e7cd53dcf/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
+
+Use the realtime clock for the monotonic clock. This is of course not a proper
+implementation (which is being done in Mach), but will permit to fix at least
+the iceweasel stack.
+
+vlc however doesn't build when _POSIX_CLOCK_SELECTION is enabled but
+_POSIX_TIMERS is not, and they refuse to fix that (see #765578), so disable the
+former.
+
+---
+ sysdeps/mach/hurd/bits/posix_opt.h |    2 +-
+ sysdeps/unix/clock_gettime.c       |    1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+Index: glibc-2.27/sysdeps/mach/clock_gettime.c
+===================================================================
+--- glibc-2.27.orig/sysdeps/mach/clock_gettime.c
++++ glibc-2.27/sysdeps/mach/clock_gettime.c
+@@ -31,6 +31,10 @@ __clock_gettime (clockid_t clock_id, str
+   switch (clock_id) {
+ 
+     case CLOCK_REALTIME:
++    case CLOCK_MONOTONIC:
++    case CLOCK_MONOTONIC_RAW:
++    case CLOCK_REALTIME_COARSE:
++    case CLOCK_MONOTONIC_COARSE:
+       {
+ 	/* __host_get_time can only fail if passed an invalid host_t.
+ 	   __mach_host_self could theoretically fail (producing an
+Index: glibc-2.27/rt/timer_create.c
+===================================================================
+--- glibc-2.27.orig/rt/timer_create.c
++++ glibc-2.27/rt/timer_create.c
+@@ -48,7 +48,7 @@ timer_create (clockid_t clock_id, struct
+       return -1;
+     }
+ 
+-  if (clock_id != CLOCK_REALTIME)
++  if (clock_id != CLOCK_REALTIME && clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_MONOTONIC_RAW && clock_id != CLOCK_REALTIME_COARSE && clock_id != CLOCK_MONOTONIC_COARSE)
+     {
+       __set_errno (EINVAL);
+       return -1;
+Index: glibc-2.27/sysdeps/mach/hurd/bits/posix_opt.h
+===================================================================
+--- glibc-2.27.orig/sysdeps/mach/hurd/bits/posix_opt.h
++++ glibc-2.27/sysdeps/mach/hurd/bits/posix_opt.h
+@@ -163,10 +163,10 @@
+ #define _POSIX_THREAD_PROCESS_SHARED	-1
+ 
+ /* The monotonic clock might be available.  */
+-#define _POSIX_MONOTONIC_CLOCK	0
++#define _POSIX_MONOTONIC_CLOCK	200809L
+ 
+-/* The clock selection interfaces are available.  */
+-#define _POSIX_CLOCK_SELECTION	200809L
++/* The clock selection interfaces are not really available yet.  */
++#define _POSIX_CLOCK_SELECTION	-1
+ 
+ /* Advisory information interfaces could be available in future.  */
+ #define _POSIX_ADVISORY_INFO	0
+Index: glibc-upstream/sysdeps/posix/clock_getres.c
+===================================================================
+--- glibc-upstream.orig/sysdeps/posix/clock_getres.c
++++ glibc-upstream/sysdeps/posix/clock_getres.c
+@@ -52,6 +52,10 @@ __clock_getres (clockid_t clock_id, stru
+   switch (clock_id)
+     {
+     case CLOCK_REALTIME:
++    case CLOCK_MONOTONIC:
++    case CLOCK_MONOTONIC_RAW:
++    case CLOCK_REALTIME_COARSE:
++    case CLOCK_MONOTONIC_COARSE:
+       retval = realtime_getres (res);
+       break;
+ 
+--- ./sysdeps/mach/clock_nanosleep.c.original	2020-07-21 00:31:35.226113142 +0200
++++ ./sysdeps/mach/clock_nanosleep.c	2020-07-21 00:31:49.026185761 +0200
+@@ -62,7 +62,7 @@
+ __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
+ 		   struct timespec *rem)
+ {
+-  if (clock_id != CLOCK_REALTIME
++  if ((clock_id != CLOCK_REALTIME && clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_MONOTONIC_RAW && clock_id != CLOCK_REALTIME_COARSE && clock_id != CLOCK_MONOTONIC_COARSE)
+       || !valid_nanoseconds (req->tv_nsec)
+       || (flags != 0 && flags != TIMER_ABSTIME))
+     return EINVAL;
+Index: glibc-2.32/hurd/hurdlock.c
+===================================================================
+--- glibc-2.32.orig/hurd/hurdlock.c
++++ glibc-2.32/hurd/hurdlock.c
+@@ -47,7 +47,7 @@ int
+ __lll_abstimed_wait (void *ptr, int val,
+   const struct timespec *tsp, int flags, int clk)
+ {
+-  if (clk != CLOCK_REALTIME)
++  if (clk != CLOCK_REALTIME && clk != CLOCK_MONOTONIC)
+     return EINVAL;
+ 
+   int mlsec = compute_reltime (tsp, clk);
+@@ -59,7 +59,7 @@ int
+ __lll_abstimed_wait_intr (void *ptr, int val,
+   const struct timespec *tsp, int flags, int clk)
+ {
+-  if (clk != CLOCK_REALTIME)
++  if (clk != CLOCK_REALTIME && clk != CLOCK_MONOTONIC)
+     return EINVAL;
+ 
+   int mlsec = compute_reltime (tsp, clk);
+@@ -79,7 +79,7 @@ int
+ __lll_abstimed_xwait (void *ptr, int lo, int hi,
+   const struct timespec *tsp, int flags, int clk)
+ {
+-  if (clk != CLOCK_REALTIME)
++  if (clk != CLOCK_REALTIME && clk != CLOCK_MONOTONIC)
+     return EINVAL;
+ 
+   int mlsec = compute_reltime (tsp, clk);
+@@ -91,7 +91,7 @@ int
+ __lll_abstimed_lock (void *ptr,
+   const struct timespec *tsp, int flags, int clk)
+ {
+-  if (clk != CLOCK_REALTIME)
++  if (clk != CLOCK_REALTIME && clk != CLOCK_MONOTONIC)
+     return EINVAL;
+ 
+   if (__lll_trylock (ptr) == 0)
+@@ -177,7 +177,7 @@ __lll_robust_abstimed_lock (void *ptr,
+   int wait_time = 25;
+   unsigned int val;
+ 
+-  if (clk != CLOCK_REALTIME)
++  if (clk != CLOCK_REALTIME && clk != CLOCK_MONOTONIC)
+     return EINVAL;
+ 
+   while (1)
diff --git a/gnu/packages/patches/glibc-2.37-versioned-locpath.patch b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch
new file mode 100644
index 0000000000..0acaeb1e46
--- /dev/null
+++ b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch
@@ -0,0 +1,264 @@
+From d73ba2caa10b8e9f51ff4239cc32eeb4e0de4279 Mon Sep 17 00:00:00 2001
+Message-Id: <d73ba2caa10b8e9f51ff4239cc32eeb4e0de4279.1683980025.git.dev@jpoiret.xyz>
+From: Josselin Poiret <dev@jpoiret.xyz>
+Date: Sat, 13 May 2023 14:10:43 +0200
+Subject: [PATCH] Add versioned locpath
+
+From: Josselin Poiret <dev@jpoiret.xyz>
+
+The format of locale data can be incompatible between libc versions, and
+loading incompatible data can lead to 'setlocale' returning EINVAL at best
+or triggering an assertion failure at worst.  See
+https://lists.gnu.org/archive/html/guix-devel/2015-09/msg00717.html
+for background information.
+
+To address that, this patch changes libc to honor a new 'GUIX_LOCPATH'
+variable, and to look for locale data in version-specific sub-directories of
+that variable.  So, if GUIX_LOCPATH=/foo:/bar, locale data is searched for in
+/foo/X.Y and /bar/X.Y, where X.Y is the libc version number.
+
+That way, a single 'GUIX_LOCPATH' setting can work even if different libc
+versions coexist on the system.
+
+
+This patch is adapted from the 2.35 patch.
+
+---
+ locale/newlocale.c   | 15 ++--------
+ locale/setlocale.c   | 68 +++++++++++++++++++++++++++++++++++++-------
+ string/Makefile      |  1 +
+ string/argz-suffix.c | 56 ++++++++++++++++++++++++++++++++++++
+ string/argz.h        | 10 +++++++
+ 5 files changed, 127 insertions(+), 23 deletions(-)
+ create mode 100644 string/argz-suffix.c
+
+diff --git a/locale/newlocale.c b/locale/newlocale.c
+index 108d2428bf..6218e0fa77 100644
+--- a/locale/newlocale.c
++++ b/locale/newlocale.c
+@@ -29,6 +29,7 @@
+ /* Lock for protecting global data.  */
+ __libc_rwlock_define (extern , __libc_setlocale_lock attribute_hidden)
+ 
++extern error_t compute_locale_search_path (char **, size_t *);
+ 
+ /* Use this when we come along an error.  */
+ #define ERROR_RETURN							      \
+@@ -47,7 +48,6 @@ __newlocale (int category_mask, const char *locale, locale_t base)
+   locale_t result_ptr;
+   char *locale_path;
+   size_t locale_path_len;
+-  const char *locpath_var;
+   int cnt;
+   size_t names_len;
+ 
+@@ -101,17 +101,8 @@ __newlocale (int category_mask, const char *locale, locale_t base)
+   locale_path = NULL;
+   locale_path_len = 0;
+ 
+-  locpath_var = getenv ("LOCPATH");
+-  if (locpath_var != NULL && locpath_var[0] != '\0')
+-    {
+-      if (__argz_create_sep (locpath_var, ':',
+-			     &locale_path, &locale_path_len) != 0)
+-	return NULL;
+-
+-      if (__argz_add_sep (&locale_path, &locale_path_len,
+-			  _nl_default_locale_path, ':') != 0)
+-	return NULL;
+-    }
++  if (compute_locale_search_path (&locale_path, &locale_path_len) != 0)
++    return NULL;
+ 
+   /* Get the names for the locales we are interested in.  We either
+      allow a composite name or a single name.  */
+diff --git a/locale/setlocale.c b/locale/setlocale.c
+index dd73fa4248..d8eb799384 100644
+--- a/locale/setlocale.c
++++ b/locale/setlocale.c
+@@ -213,12 +213,65 @@ setdata (int category, struct __locale_data *data)
+     }
+ }
+ 
++/* Return in *LOCALE_PATH and *LOCALE_PATH_LEN the locale data search path as
++   a colon-separated list.  Return ENOMEN on error, zero otherwise.  */
++error_t
++compute_locale_search_path (char **locale_path, size_t *locale_path_len)
++{
++  char* guix_locpath_var = getenv ("GUIX_LOCPATH");
++  char *locpath_var = getenv ("LOCPATH");
++
++  if (guix_locpath_var != NULL && guix_locpath_var[0] != '\0')
++    {
++      /* Entries in 'GUIX_LOCPATH' take precedence over 'LOCPATH'.  These
++	 entries are systematically prefixed with "/X.Y" where "X.Y" is the
++	 libc version.  */
++      if (__argz_create_sep (guix_locpath_var, ':',
++			     locale_path, locale_path_len) != 0
++	  || __argz_suffix_entries (locale_path, locale_path_len,
++				    "/" VERSION) != 0)
++	goto bail_out;
++    }
++
++  if (locpath_var != NULL && locpath_var[0] != '\0')
++    {
++      char *reg_locale_path = NULL;
++      size_t reg_locale_path_len = 0;
++
++      if (__argz_create_sep (locpath_var, ':',
++			     &reg_locale_path, &reg_locale_path_len) != 0)
++	goto bail_out;
++
++      if (__argz_append (locale_path, locale_path_len,
++			 reg_locale_path, reg_locale_path_len) != 0)
++	goto bail_out;
++
++      free (reg_locale_path);
++    }
++
++  if (*locale_path != NULL)
++    {
++      /* Append the system default locale directory.  */
++      if (__argz_add_sep (locale_path, locale_path_len,
++			  _nl_default_locale_path, ':') != 0)
++	goto bail_out;
++    }
++
++  return 0;
++
++ bail_out:
++  free (*locale_path);
++  *locale_path = NULL;
++  *locale_path_len = 0;
++
++  return ENOMEM;
++}
++
+ char *
+ setlocale (int category, const char *locale)
+ {
+   char *locale_path;
+   size_t locale_path_len;
+-  const char *locpath_var;
+   char *composite;
+ 
+   /* Sanity check for CATEGORY argument.  */
+@@ -249,17 +302,10 @@ setlocale (int category, const char *locale)
+   locale_path = NULL;
+   locale_path_len = 0;
+ 
+-  locpath_var = getenv ("LOCPATH");
+-  if (locpath_var != NULL && locpath_var[0] != '\0')
++  if (compute_locale_search_path (&locale_path, &locale_path_len) != 0)
+     {
+-      if (__argz_create_sep (locpath_var, ':',
+-			     &locale_path, &locale_path_len) != 0
+-	  || __argz_add_sep (&locale_path, &locale_path_len,
+-			     _nl_default_locale_path, ':') != 0)
+-	{
+-	  __libc_rwlock_unlock (__libc_setlocale_lock);
+-	  return NULL;
+-	}
++      __libc_rwlock_unlock (__libc_setlocale_lock);
++      return NULL;
+     }
+ 
+   if (category == LC_ALL)
+diff --git a/string/Makefile b/string/Makefile
+index 3eced0d027..a7e68729ad 100644
+--- a/string/Makefile
++++ b/string/Makefile
+@@ -51,6 +51,7 @@ routines := \
+   argz-next \
+   argz-replace \
+   argz-stringify \
++  argz-suffix \
+   basename \
+   bcopy \
+   bzero \
+diff --git a/string/argz-suffix.c b/string/argz-suffix.c
+new file mode 100644
+index 0000000000..505b0f248c
+--- /dev/null
++++ b/string/argz-suffix.c
+@@ -0,0 +1,56 @@
++/* Copyright (C) 2015 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++   Contributed by Ludovic Courtès <ludo@gnu.org>.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library 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
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <argz.h>
++#include <errno.h>
++#include <stdlib.h>
++#include <string.h>
++
++
++error_t
++__argz_suffix_entries (char **argz, size_t *argz_len, const char *suffix)
++
++{
++  size_t suffix_len = strlen (suffix);
++  size_t count = __argz_count (*argz, *argz_len);
++  size_t new_argz_len = *argz_len + count * suffix_len;
++  char *new_argz = malloc (new_argz_len);
++
++  if (new_argz)
++    {
++      char *p = new_argz, *entry;
++
++      for (entry = *argz;
++	   entry != NULL;
++	   entry = argz_next (*argz, *argz_len, entry))
++	{
++	  p = stpcpy (p, entry);
++	  p = stpcpy (p, suffix);
++	  p++;
++	}
++
++      free (*argz);
++      *argz = new_argz;
++      *argz_len = new_argz_len;
++
++      return 0;
++    }
++  else
++    return ENOMEM;
++}
++weak_alias (__argz_suffix_entries, argz_suffix_entries)
+diff --git a/string/argz.h b/string/argz.h
+index cbc588a8e6..bc6e484c9d 100644
+--- a/string/argz.h
++++ b/string/argz.h
+@@ -108,6 +108,16 @@ extern error_t argz_replace (char **__restrict __argz,
+ 			     const char *__restrict __str,
+ 			     const char *__restrict __with,
+ 			     unsigned int *__restrict __replace_count);
++
++/* Suffix each entry of ARGZ & ARGZ_LEN with SUFFIX.  Return 0 on success,
++   and ENOMEN if memory cannot be allocated.  */
++extern error_t __argz_suffix_entries (char **__restrict __argz,
++				      size_t *__restrict __argz_len,
++				      const char *__restrict __suffix);
++extern error_t argz_suffix_entries (char **__restrict __argz,
++				    size_t *__restrict __argz_len,
++				    const char *__restrict __suffix);
++
+ 
+ /* Returns the next entry in ARGZ & ARGZ_LEN after ENTRY, or NULL if there
+    are no more.  If entry is NULL, then the first entry is returned.  This
+-- 
+2.40.1
+
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 3308302472..c1aa187c42 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -266,13 +266,13 @@ listed in REFS."
       p))
 
 
-(define (standard-packages)
+(define* (standard-packages #:optional (system (%current-system)))
   "Return the list of (NAME PACKAGE OUTPUT) or (NAME PACKAGE) tuples of
 standard packages used as implicit inputs of the GNU build system."
 
   ;; Resolve (gnu packages commencement) lazily to hide circular dependency.
   (let ((distro (resolve-module '(gnu packages commencement))))
-    (module-ref distro '%final-inputs)))
+    ((module-ref distro '%final-inputs) system)))
 
 (define* (lower name
                 #:key source inputs native-inputs outputs target
@@ -303,7 +303,7 @@ standard packages used as implicit inputs of the GNU build system."
                           (standard-cross-packages target 'host)
                           '())
                     ,@(if implicit-inputs?
-                          (standard-packages)
+                          (standard-packages system)
                           '())))
     (host-inputs (if target inputs '()))
 
diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index f5cb18af22..719883d4a9 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -228,7 +228,8 @@ options like '--recursive'."
     (let* ((input->package (match-lambda
                              ((name (? package? package) _ ...) package)
                              (_ #f)))
-           (final-inputs   (map input->package %final-inputs))
+           (final-inputs   (map input->package
+                                (%final-inputs (%current-system))))
            (core           (append final-inputs
                                    (append-map (compose (cut filter-map input->package <>)
                                                         package-transitive-inputs)
-- 
cgit 1.4.1


From 2edd67d34b85715e97b222f4a46da7b156973616 Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Mon, 22 May 2023 11:04:16 +0200
Subject: gnu: gnumach: Update to 1.8+git20221224.

* gnu/packages/hurd.scm (gnumach-headers): Update to 1.8+git20221224.
---
 gnu/packages/hurd.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 8ca8415436..6dc14f25a0 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -56,7 +56,7 @@
 (define-public gnumach-headers
   (package
     (name "gnumach-headers")
-    (version "1.8+git20220827") ;; This is an upstream tag
+    (version "1.8+git20221224") ;; This is an upstream tag
     (source
      (origin
        (method git-fetch)
@@ -66,8 +66,7 @@
        (file-name (git-file-name "gnumach" version))
        (sha256
         (base32
-         "07qlaf8vw029y7xdnhjyiiyn788zjzwmyzj79inz7idpswqsnyhf"))
-       (patches (search-patches "gnumach-add-missing-const_mach_port_name_array_t-type.patch"))))
+         "0f49zqxf64ds75rmskizpybl2mw7sxs05k59gjp3pgspvr87w7gs"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-- 
cgit 1.4.1


From 999a6ac0cfd9339e138007ed9e4e544a55e92e3e Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Mon, 22 May 2023 11:04:17 +0200
Subject: gnu: mig: Update to 1.8+git20230520.

* gnu/packages/hurd.scm (mig)[source]: Update to 1.8+git20230520.
* gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch:
Drop patch.
* gnu/local.mk (dist_patch_DATA): Unregister it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/hurd.scm                              | 20 ++++++--------
 ...missing-const_mach_port_name_array_t-type.patch | 32 ----------------------
 3 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 3481659faa..1ff2b13c5d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1287,7 +1287,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/gnome-settings-daemon-gc.patch		\
   %D%/packages/patches/gnome-session-support-elogind.patch	\
   %D%/packages/patches/gnome-tweaks-search-paths.patch		\
-  %D%/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch \
   %D%/packages/patches/gnupg-default-pinentry.patch		\
   %D%/packages/patches/gnupg-1-build-with-gcc10.patch		\
   %D%/packages/patches/gnutls-skip-trust-store-test.patch	\
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 6dc14f25a0..9895955ea2 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -88,24 +88,20 @@
 (define-public mig
   (package
     (name "mig")
-    (version "1.8+git20220827")
+    (version "1.8+git20230520")
     (source (origin
-              (method url-fetch)
-              ;; XXX: Version 2.35 of glibc can only be built with an
-              ;; unreleased version of MiG:
-              ;; <https://lists.gnu.org/archive/html/bug-hurd/2023-03/msg00025.html>.
-              ;; It cannot be fetched from Git though, as the extra dependency
-              ;; on Autoconf/Automake would complicate bootstrapping.
-              (uri (string-append "mirror://gnu/guix/mirror/mig-"
-                                  version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.savannah.gnu.org/git/hurd/mig.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "163d37s9lscd6zxyfng421m9nl857464mgjj90xsrcl5ykbng5p2"))
-              (patches (search-patches "mig-cpu.h-generation.patch"))))
+                "10r0fdjqjzqsy6ajb21rifvhw0wpjvrw6a1zdyliqlzqny5k0qlz"))))
     (build-system gnu-build-system)
     ;; Flex is needed both at build and run time.
     (inputs (list gnumach-headers flex))
-    (native-inputs (list flex bison))
+    (native-inputs (list autoconf automake flex bison))
     (arguments
      (list #:tests? #f
            #:phases
diff --git a/gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch b/gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch
deleted file mode 100644
index 73c99ade23..0000000000
--- a/gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 17335d49a3c9e866a81abc051420d73a59d669bf Mon Sep 17 00:00:00 2001
-Message-Id: <17335d49a3c9e866a81abc051420d73a59d669bf.1678745341.git.dev@jpoiret.xyz>
-From: Josselin Poiret <dev@jpoiret.xyz>
-Date: Sun, 28 Aug 2022 01:17:34 +0200
-Subject: [PATCH] Add missing const_mach_port_name_array_t type
-
-From: Samuel Thibault <samuel.thibault@ens-lyon.org>
-
----
- include/mach/port.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/mach/port.h b/include/mach/port.h
-index 3c226f6c..d25eb0b4 100644
---- a/include/mach/port.h
-+++ b/include/mach/port.h
-@@ -43,6 +43,7 @@
-  */
- typedef unsigned int mach_port_name_t;
- typedef mach_port_name_t *mach_port_name_array_t;
-+typedef const mach_port_name_t *const_mach_port_name_array_t;
- 
- /*
-  * A port is represented
-
-base-commit: 3e1702a65fb3caf50c8d09a1b383b0056a5efc82
-prerequisite-patch-id: 4688654277aef235ccd1797a72dce27d52b04616
-prerequisite-patch-id: 8f1e7dd6429c15cc8ed1d411dba0a75b6e745236
-prerequisite-patch-id: 605553ee086473ad9bc24e59c91d49a12dbf8631
--- 
-2.39.1
-
-- 
cgit 1.4.1


From 1f19387ca7500ecef114e4c41802633658358313 Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Mon, 22 May 2023 11:04:18 +0200
Subject: gnu: hurd: Update to v0.9.git20230216.

* gnu/packages/hurd.scm (hurd-headers): Update to v0.9.git20230216.
---
 gnu/packages/hurd.scm | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 9895955ea2..c6fad1ed11 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -130,10 +130,10 @@ communication.")
   ;; This commit is now slightly behind 0.9.git20220818 as this one needs a
   ;; newer glibc
   (let ((revision "2")
-        (commit "3ff70531ee672f431dbb0c11f286bfe85dce98fc"))
+        (commit "v0.9.git20230216"))
     (package
       (name "hurd-headers")
-      (version (git-version "0.9" revision commit))
+      (version commit)
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -141,11 +141,8 @@ communication.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "1jb9f2h2v4lf6acsji1c12aqg3pixkvjdyb4q6axkd8jp22fdgc0"))
-                (file-name (git-file-name name version))
-                (patches (search-patches "hurd-add-without-rump-configure-option.patch"
-                                         "hurd-fix-types-of-read-write-and-readables-methods.patch"
-                                         "hurd-fix-types-of-read-write-and-readables-methods-2.patch"))))
+                  "0jm1dnqkx4kdwmby0z5w0yqp9m5qp4hbxd4jxlyhiqm8nkw9mkvv"))
+                (file-name (git-file-name name version))))
       (build-system gnu-build-system)
       (native-inputs
        (list autoconf
@@ -182,7 +179,8 @@ communication.")
                              "ac_cv_func_exec_exec_paths=no"
                              "ac_cv_func__hurd_exec_paths=no"
                              "ac_cv_func__hurd_libc_proc_init=no"
-                             "ac_cv_func_file_futimens=no")
+                             "ac_cv_func_file_futimens=no"
+                             "ac_cv_lib_acpica_acpi_init=no")
 
          #:tests? #f))
       (supported-systems %hurd-systems)
-- 
cgit 1.4.1


From 5ffdcb3aa147cd49d8d8f380903886c70365d46e Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 17 May 2023 13:29:50 +0200
Subject: gnu: Add libpciaccess-0.17.

* gnu/packages/xorg.scm (libpciaccess-0.17): New variable.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/packages/xorg.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 96440a6d0a..eaf90a79df 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -35,6 +35,7 @@
 ;;; Copyright © 2021 qblade <qblade@protonmail.com>
 ;;; Copyright © 2021 Lu Hui <luhux76@gmail.com>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1162,6 +1163,22 @@ themselves.")
     (description "Xorg Generic PCI access library.")
     (license license:x11)))
 
+(define-public libpciaccess-0.17
+  (package
+    (inherit libpciaccess)
+    (name "libpciaccess")
+    (version "0.17")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://xorg/individual/lib/libpciaccess-"
+             version
+             ".tar.xz"))
+       (sha256
+        (base32
+         "0wsvv5d05maqbidvnavka7n0fnql55m4jix5wwlk14blr6ikna3l"))))))
+
 (define-public libpthread-stubs
   (package
     (name "libpthread-stubs")
-- 
cgit 1.4.1


From 18757f1a25707685372e681897bf46aec55d6934 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 17 May 2023 13:41:26 +0200
Subject: gnu: hurd: Update libpciaccess to 0.17.

As suggested by youpi on IRC

    https://logs.guix.gnu.org/hurd/2023-05-17.log#132259

libpciaccess-0.16 is too old for the Hurd and would need Hurd-specific patches
while libpciaccess-0.17 works out of the box.

* gnu/packages/hurd.scm (hurd)[inputs]: Use libpciaccess-0.17.
(netdde)[inputs]: Likewise.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/packages/hurd.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index c6fad1ed11..51848faacd 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2018, 2020-2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2020, 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2022, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Rene Saavedra <pacoon@protonmail.com>
 ;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
@@ -46,7 +46,7 @@
   #:use-module (gnu packages bash)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages onc-rpc)
-  #:use-module (gnu packages xorg) ; libpciaccess
+  #:use-module (gnu packages xorg) ;libpciaccess-0.17
   #:use-module (guix git-download))
 
 (define (hurd-source-url version)
@@ -522,7 +522,7 @@ exec ${system}/rc \"$@\"
      `(("libgcrypt" ,libgcrypt)                  ;for /hurd/random
        ("libdaemon" ,libdaemon)                  ;for /bin/console --daemonize
        ("unifont" ,unifont)
-       ("libpciaccess" ,libpciaccess)
+       ("libpciaccess" ,libpciaccess-0.17)       ;need libpciaccess > 0.16
 
        ;; For NFS support
        ("libtirpc" ,libtirpc/hurd)
@@ -620,7 +620,7 @@ implementing them.")
                                             "/bin"))
                #t)))))
       (inputs
-       (list hurd libpciaccess zlib))
+       (list hurd libpciaccess-0.17 zlib))
       (native-inputs
        `(("coreutils" ,coreutils)
          ("gawk" ,gawk)
-- 
cgit 1.4.1


From f86de02dde89aff2f0ddddeec3a398a649764dff Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 14 May 2023 20:30:52 +0200
Subject: gnu: Add rumpkernel.

This uses the Debian Salsa rumpkernel package git as upstream as that is where
delopment happens.  Once things have stabalized upstream may change to the
NetBSD git from where Debian takes their snapshots.

* gnu/packages/hurd.scm (rumpkernel): New variable.
(hurd-headers)[native-inputs]: Use cross-mig directly.
(gnumach)[native-inputs]: Likewise.
(hurd)[native-inputs]: Likewise.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/packages/hurd.scm | 248 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 235 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 51848faacd..e6935dea9b 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -34,6 +34,7 @@
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages cross-base)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gnupg)
@@ -47,7 +48,8 @@
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages xorg) ;libpciaccess-0.17
-  #:use-module (guix git-download))
+  #:use-module (guix git-download)
+  #:use-module (ice-9 match))
 
 (define (hurd-source-url version)
   (string-append "mirror://gnu/hurd/hurd-"
@@ -148,9 +150,7 @@ communication.")
        (list autoconf
              automake
              (if (%current-target-system)
-                 (let* ((cross-base (resolve-interface '(gnu packages cross-base)))
-                        (cross-mig (module-ref cross-base 'cross-mig)))
-                   (cross-mig (%current-target-system)))
+                 (cross-mig (%current-target-system))
                  mig)))
       (arguments
        `(#:phases
@@ -282,10 +282,8 @@ Hurd-minimal package which are needed for both glibc and GCC.")
      (list autoconf
            automake
            (if (%current-target-system)
-                   (let* ((cross-base (resolve-interface '(gnu packages cross-base)))
-                          (cross-mig (module-ref cross-base 'cross-mig)))
-                     (cross-mig (%current-target-system)))
-                   mig)
+               (cross-mig (%current-target-system))
+               mig)
            perl
            texinfo-4))
     (supported-systems %hurd-systems)
@@ -537,11 +535,9 @@ exec ${system}/rc \"$@\"
      `(("autoconf" ,autoconf)
        ("automake" ,automake)
        ("libgcrypt" ,libgcrypt)                   ;for 'libgcrypt-config'
-       ("mig" ,(if (%current-target-system)
-                   (let* ((cross-base (resolve-interface '(gnu packages cross-base)))
-                          (cross-mig (module-ref cross-base 'cross-mig)))
-                     (cross-mig (%current-target-system)))
-                   mig))
+       ("mig" , (if (%current-target-system)
+                    (cross-mig (%current-target-system))
+                    mig))
        ("pkg-config" ,pkg-config)
        ("perl" ,perl)
        ("texinfo" ,texinfo-4)
@@ -637,3 +633,229 @@ in userland processes thanks to the DDE layer.")
       ;; Some drivers are dually licensed with the options being GPLv2 or one
       ;; of MPL/Expat/BSD-3 (dependent on the driver).
       (license gpl2))))
+
+(define-public rumpkernel
+  (let ((commit "81043d42fabda9baed7ac9ca36e3f3f5ed11ba81")
+        (revision "3"))
+    (package
+      (name "rumpkernel")
+      (version (git-version "0-20211031" revision commit))
+      ;; This uses the Debian Salsa rumpkernel package git as upstream as that
+      ;; is where development happens.  Once things have stabilized, upstream
+      ;; may change to the NetBSD git from where Debian takes their snapshots.
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://salsa.debian.org/hurd-team/rumpkernel.git")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "0fv0k52qqcg3nq9012hibgsamvsd7mnvn2ikdasmzjhsp8qh5q3r"))
+                (file-name (git-file-name name commit))))
+      (build-system gnu-build-system)
+      (arguments
+       (list
+        #:tests? #f
+        #:modules '((srfi srfi-26)
+                    (ice-9 rdelim)
+                    (guix build utils)
+                    (guix build gnu-build-system))
+        ;; As we are using the Debian package as upstream, we follow their
+        ;; build:
+        ;;   * apply patches in debian/patches taken from the
+        ;;     debian/patches/series file
+        ;;   * for the configure, make, and install stages, follow
+        ;;     the code in debian/rules
+        ;; The Debian patchset includes a cross build feature that we
+        ;; use with two differences
+        ;;   * Debian uses a multiarch toolchain
+        ;;   * we use cross-mig
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'apply-patches
+              (lambda* (#:key target #:allow-other-keys)
+                (let* ((patch-directory "debian/patches/")
+                       (series (string-append patch-directory "series"))
+                       (text (with-input-from-file series read-string))
+                       (lines (string-split (string-trim-right text) #\newline))
+                       (patches (filter (negate (cute string-prefix? "#" <>))
+                                        lines))
+                       (patch-files (map
+                                     (cute string-append patch-directory <>)
+                                     patches)))
+                  (for-each
+                   (cute invoke "patch" "--force" "-p1" "-i" <>)
+                   patch-files)
+                  ;; Somewhere in the build.sh/make process MIG is not being
+                  ;; exported, apparently.
+                  (let* ((prefix (if (not target) "" (string-append target "-")))
+                         (mig (string-append prefix "mig")))
+                    (substitute* "pci-userspace/src-gnu/Makefile.inc"
+                      (("MIG=mig")
+                       (string-append "MIG=" mig)))))))
+            (add-before 'configure 'setenv
+              (lambda* (#:key build target #:allow-other-keys)
+                (define (noisy-setenv name value)
+                  (setenv name value)
+                  (format (current-error-port) "set ~a=~s\n" name value))
+                (noisy-setenv "HOST_CC" "gcc")
+                (let* ((prefix (if (not target) "" (string-append target "-"))))
+                  (noisy-setenv "TARGET_AR" (string-append prefix "ar"))
+                  (noisy-setenv "TARGET_CC" (string-append prefix "gcc"))
+                  (noisy-setenv "TARGET_CXX" (string-append prefix "g++"))
+                  (noisy-setenv "TARGET_LD" (string-append prefix "ld"))
+                  (noisy-setenv "TARGET_MIG" (string-append prefix "mig"))
+                  (noisy-setenv "TARGET_NM" (string-append prefix "nm"))
+                  (noisy-setenv "MIG" (string-append prefix "mig")))
+                (setenv "PAWD" "pwd")
+                (for-each
+                 (cute noisy-setenv <> "")
+                 '("_GCC_CRTENDS"
+                   "_GCC_CRTEND"
+                   "_GCC_CRTBEGINS"
+                   "_GCC_CRTBEGIN"
+                   "_GCC_CRTI"
+                   "_GCC_CRTN"))))
+            (replace 'configure
+              (lambda args
+                (let ((configure (assoc-ref %standard-phases 'configure)))
+                  (with-directory-excursion "buildrump.sh/src/lib/librumpuser"
+                    (apply configure args)))))
+            ;; The build has three toplevel entry points
+            ;;   * buildrump.sh/src/build.sh: create a NetBSD-compatible
+            ;;     toolchain and supports cross-compiling
+            ;;   * buildrump.sh/src/lib/librumpuser: the librump* libraries
+            ;;   * pci-userspace/src-gnu: the librumpdev_pci* libraries
+            (replace 'build
+              (lambda* (#:key parallel-build? #:allow-other-keys)
+                (let* ((jobs (if parallel-build? (parallel-job-count) 1))
+                       (host-cpu #$(match (or (%current-target-system)
+                                              (%current-system))
+                                     ((? target-x86-32?)
+                                      "i386")
+                                     ((? target-x86-64?)
+                                      "amd64")))
+                       (toprump (string-append
+                                 (getcwd)
+                                 "/buildrump.sh/src/sys/rump"))
+                       (rump-make (string-append
+                                   (getcwd)
+                                   "/buildrump.sh/src/obj/tooldir/bin/nbmake-"
+                                   host-cpu)))
+                  (mkdir "obj")
+                  (with-directory-excursion "buildrump.sh/src"
+                    (invoke
+                     "sh" "build.sh"
+                     "-V" "TOOLS_BUILDRUMP=yes"
+                     "-V" "MKBINUTILS=no"
+                     "-V" "MKGDB=no"
+                     "-V" "MKGROFF=no"
+                     "-V" (string-append "TOPRUMP=" toprump)
+                     "-V" "BUILDRUMP_CPPFLAGS=-Wno-error=stringop-overread"
+                     "-V" "RUMPUSER_EXTERNAL_DPLIBS=pthread"
+		     "-V" (string-append
+                           "CPPFLAGS="
+                           " -I../../obj/destdir." host-cpu "/usr/include"
+                           " -D_FILE_OFFSET_BITS=64"
+                           " -DRUMP_REGISTER_T=int"
+                           " -DRUMPUSER_CONFIG=yes"
+                           " -DNO_PCI_MSI_MSIX=yes"
+                           " -DNUSB_DMA=1")
+                     "-V" (string-append
+                           "CWARNFLAGS="
+                           " -Wno-error=maybe-uninitialized"
+                           " -Wno-error=address-of-packed-member"
+                           " -Wno-error=unused-variable"
+                           " -Wno-error=stack-protector"
+                           " -Wno-error=array-parameter"
+                           " -Wno-error=array-bounds"
+                           " -Wno-error=stringop-overflow")
+                     "-V" "LIBCRTBEGIN="
+                     "-V" "LIBCRTEND="
+                     "-V" "LIBCRT0="
+                     "-V" "LIBCRTI="
+                     "-V" "_GCC_CRTENDS="
+                     "-V" "_GCC_CRTEND="
+                     "-V" "_GCC_CRTBEGINS="
+                     "-V" "_GCC_CRTBEGIN="
+                     "-V" "_GCC_CRTI="
+                     "-V" "_GCC_CRTN="
+                     "-U"
+                     "-u"
+                     "-T" "./obj/tooldir"
+                     "-m" host-cpu
+                     "-j" (number->string jobs)
+                     "tools"
+                     "rump"))
+                  (with-directory-excursion "buildrump.sh/src/lib/librumpuser"
+                    (setenv "RUMPRUN" "true")
+                    (invoke rump-make "dependall"))
+                  (with-directory-excursion "pci-userspace/src-gnu"
+                    (invoke rump-make "dependall")))))
+            (replace 'install
+              (lambda _
+                (define (install-file file target)
+                  (let ((dest (string-append target (basename file))))
+                    (format (current-output-port) "`~a' -> `~a'~%" file dest)
+                    (mkdir-p (dirname dest))
+                    ;; Some libraries are duplicated/copied around in the
+                    ;; build system, do not fail trying to install one
+                    ;; a second time.
+                    (if (file-exists? dest)
+                        (format (current-error-port)
+                                "warning: skipping: ~a\n" file)
+                        (let ((stat (lstat file)))
+                          (case (stat:type stat)
+                            ((symlink)
+                             (let ((target (readlink file)))
+                               (symlink target dest)))
+                            (else
+                             (copy-file file dest)))))))
+                (let ((header (string-append #$output "/include/rump"))
+                      (lib (string-append #$output "/lib/")))
+                  (mkdir-p header)
+                  (copy-recursively "buildrump.sh/src/sys/rump/include/rump"
+                                    header)
+                  (mkdir-p lib)
+                  (for-each
+                   (cute install-file <> lib)
+                   (append (find-files "buildrump.sh/src" "librump.*[.](a|so.*)")
+                           (find-files "obj" "librump.*[.](a|so.*)")))))))))
+      (inputs
+       (list gnumach-headers libpciaccess-0.17))
+      (native-inputs
+       (list autoconf
+             automake
+             libgcrypt
+             (if (%current-target-system)
+                 (cross-mig (%current-target-system))
+                 mig)
+             zlib))
+      (supported-systems %hurd-systems)
+      (home-page "https://wiki.netbsd.org/rumpkernel")
+      (synopsis "NetBSD as rumpkernel for the GNU/Hurd")
+      (description
+       "This package provides NetBSD as rumpkernel for the GNU/Hurd, so that
+the Hurd may be installed on iron.  Using this rumpkernel package, the hurd
+package's rumpdisk can be built which provides the pci.arbiter and rumpdisk
+servers.")
+      (license
+       ;; The NetBSD rumpkernel code is a big hodgepodge of softwares many of
+       ;; which have their own different licensing terms, see also
+       ;; https://salsa.debian.org/hurd-team/rumpkernel/-/blob/master/debian/copyright
+       (list asl2.0
+             boost1.0
+             bsd-2
+             bsd-3
+             bsd-4
+             cddl1.0
+             expat
+             gpl1
+             gpl2+
+             gpl3+
+             isc
+             lgpl2.0+
+             public-domain
+             (@ (guix licenses) zlib)
+             (non-copyleft "file://src/lib/libc/hash/hashhl.c"
+                           "See debian/copyright in the distribution."))))))
-- 
cgit 1.4.1


From c8799fafa484214f42ff9779a3ed57da7f62481d Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 23 May 2023 15:31:53 +0200
Subject: gnu: hurd-minimal: Include libshouldbeinlibc and libstore.

* gnu/packages/hurd.scm (hurd-minimal)[inputs]: Add gnumach-headers.
[arguments]: Rewrite to include libshouldbeinlibc and libstore.
* gnu/packages/cross-base.scm (cross-kernel-headers*): Update xhurd-minimal
accordingly: Add xgnumach-headers, add them to cpath, use gexps for
modify-phases, add delete-shared-target phase.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/packages/cross-base.scm | 26 ++++++++++++++++++++------
 gnu/packages/hurd.scm       | 36 ++++++++++++------------------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 21d7277e22..14cb365099 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013-2018, 2020, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016, 2019, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
@@ -541,21 +541,35 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
                   ,(string-append "--host=" target)
                   ,flags))
          ((#:phases phases)
-          `(modify-phases ,phases
+          #~(modify-phases #$phases
+              (add-after 'unpack 'delete-shared-target
+                ;; Cannot create shared libraries due to missing crt1.o
+                (lambda _
+                  (substitute* "Makeconf"
+                    (("(targets := \\$\\(libname\\)\\.a) \\$\\(libname\\)\\.so" all static)
+                     static)
+                    (("\\$\\(DESTDIR\\)\\$\\(libdir\\)/\\$\\(libname\\)\\.so\\.\\$\\(hurd-version\\)")
+                     "")
+                    (("^libs: .*\\.so\\..*" all)
+                     (string-append "# " all)))))
              (add-before 'configure 'set-cross-headers-path
                (lambda* (#:key inputs #:allow-other-keys)
                  (let* ((glibc-headers (assoc-ref inputs "cross-glibc-hurd-headers"))
-                        (cpath (string-append glibc-headers "/include")))
+                        (mach-headers (assoc-ref inputs "cross-gnumach-headers"))
+                        (cpath (string-append glibc-headers "/include"
+                                              ":" mach-headers "/include")))
                    (for-each (cut setenv <> cpath)
-                             ',%gcc-cross-include-paths)
+                             '#$%gcc-cross-include-paths)
                    #t)))))))
 
-      (inputs `(("cross-glibc-hurd-headers" ,xglibc/hurd-headers)))
+      (inputs `(("cross-glibc-hurd-headers" ,xglibc/hurd-headers)
+                ("cross-gnumach-headers" ,xgnumach-headers)))
 
       (native-inputs `(("cross-gcc" ,xgcc)
                        ("cross-binutils" ,xbinutils)
                        ("cross-mig" ,xmig)
-                       ,@(alist-delete "mig"(package-native-inputs hurd-minimal))))))
+                       ,@(alist-delete "mig"
+                                       (package-native-inputs hurd-minimal))))))
 
   (define xhurd-core-headers
     (package
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index e6935dea9b..a8f752aa7e 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -194,37 +194,25 @@ Library and other user programs.")
 (define-public hurd-minimal
   (package (inherit hurd-headers)
     (name "hurd-minimal")
-    (inputs (list glibc/hurd-headers))
+    (inputs (list glibc/hurd-headers gnumach-headers))
     (arguments
      (substitute-keyword-arguments (package-arguments hurd-headers)
+       ((#:make-flags flags '())
+        #~'(#$(string-append "lib-subdirs=libshouldbeinlibc libihash libstore")
+            "prog-subdirs="
+            "other-subdirs="
+            #$@flags))
        ((#:phases _)
-        '(modify-phases %standard-phases
-           (replace 'install
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let ((out (assoc-ref outputs "out")))
-                 ;; We need to copy libihash.a to the output directory manually,
-                 ;; since there is no target for that in the makefile.
-                 (mkdir-p (string-append out "/include"))
-                 (copy-file "libihash/ihash.h"
-                            (string-append out "/include/ihash.h"))
-                 (mkdir-p (string-append out "/lib"))
-                 (copy-file "libihash/libihash.a"
-                            (string-append out "/lib/libihash.a"))
-                 #t)))
-           (replace 'build
-             (lambda _
-               ;; Install <assert-backtrace.h> & co.
-               (invoke "make" "-Clibshouldbeinlibc"
-                       "../include/assert-backtrace.h")
-
-               ;; Build libihash.
-               (invoke "make" "-Clibihash" "libihash.a")))))))
+        #~%standard-phases)
+       ((#:validate-runpath? validate-runpath? #f)
+        #f)))
     (supported-systems %hurd-systems)
     (home-page "https://www.gnu.org/software/hurd/hurd.html")
     (synopsis "GNU Hurd libraries")
     (description
-     "This package provides libihash, needed to build the GNU C
-Library for GNU/Hurd.")
+     "This package provides libshouldbeinlibc, libihash, libstore, libports,
+libiohelp, libfshelp, libtrivfs, and libmachdev, needed to build the GNU C
+Library, Parted and netdde for GNU/Hurd.")
     (license gpl2+)))
 
 (define-public hurd-core-headers
-- 
cgit 1.4.1


From 451b2db3dfc312e750e8c6e38cf5e25ac7579f1f Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 23 May 2023 14:29:21 +0200
Subject: gnu: parted: Support building for the Hurd.

* gnu/packages/disk.scm (parted)[inputs]: Remove lvm2, add hurd-minimal
when building for the Hurd.
[arguments]: Add configure-flag '--disable-device-mapper' when building for
the Hurd.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/packages/disk.scm | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 6cdcf7b9d2..6306504503 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016, 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
@@ -69,6 +69,7 @@
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages hurd)
   #:use-module (gnu packages image)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages ncurses)
@@ -254,17 +255,24 @@ tmpfs/ramfs filesystems.")
                 "18h51i3x5cbqhlj5rm23m9sfw63gaaby5czln5w6qpqj3ifdsf29"))))
     (build-system gnu-build-system)
     (arguments
-     (list #:phases
-       #~(modify-phases %standard-phases
-           (add-after 'unpack 'fix-locales-and-python
-             (lambda _
-               (substitute* "tests/t0251-gpt-unicode.sh"
-                 (("C.UTF-8") "en_US.utf8")) ;not in Glibc locales
-               (substitute* "tests/msdos-overlap"
-                 (("/usr/bin/python") (which "python"))))))))
+     (list
+      #:configure-flags (if (target-hurd?)
+                            #~'("--disable-device-mapper")
+                            #~'())
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-locales-and-python
+            (lambda _
+              (substitute* "tests/t0251-gpt-unicode.sh"
+                (("C.UTF-8") "en_US.utf8")) ;not in Glibc locales
+              (substitute* "tests/msdos-overlap"
+                (("/usr/bin/python") (which "python"))))))))
     (inputs
-     (list lvm2 readline
-           `(,util-linux "lib")))
+     `(,@(if (target-hurd?)
+             (list hurd-minimal)
+             (list lvm2))
+       ,readline
+       (,util-linux "lib")))
     (native-inputs
      (list gettext-minimal
 
-- 
cgit 1.4.1


From 5981e99f0a643e30e7af0f0a07f0034d363a843f Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 15 May 2023 11:38:50 +0200
Subject: gnu: hurd: Add rumpkernel.

* gnu/packages/patches/hurd-fix-rumpdisk-build.patch,
gnu/packages/patches/hurd-rumpdisk-no-hd.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/hurd.scm (hurd): Use them.
(hurd)[inputs]: Replace util-linux with util-linux:static, add parted,
rumpkernel.
[arguments]: Rename `prepare-dde' phase to 'prepare-addons'.  Add "rumpdisk"
directory.  Add --enable-static-progs=... option to #:configure-flags, and
remove --without-parted.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/local.mk                                       |  2 ++
 gnu/packages/hurd.scm                              | 16 ++++++---
 gnu/packages/patches/hurd-fix-rumpdisk-build.patch | 41 ++++++++++++++++++++++
 gnu/packages/patches/hurd-rumpdisk-no-hd.patch     | 26 ++++++++++++++
 4 files changed, 80 insertions(+), 5 deletions(-)
 create mode 100644 gnu/packages/patches/hurd-fix-rumpdisk-build.patch
 create mode 100644 gnu/packages/patches/hurd-rumpdisk-no-hd.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 1ff2b13c5d..cf085c9c38 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1366,6 +1366,8 @@ dist_patch_DATA =						\
   %D%/packages/patches/hubbub-maybe-uninitialized.patch         \
   %D%/packages/patches/hueplusplus-mbedtls.patch		\
   %D%/packages/patches/hurd-add-without-rump-configure-option.patch \
+  %D%/packages/patches/hurd-fix-rumpdisk-build.patch		\
+  %D%/packages/patches/hurd-rumpdisk-no-hd.patch		\
   %D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch \
   %D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods.patch \
   %D%/packages/patches/hwloc-1-test-btrfs.patch			\
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index a8f752aa7e..419d12939f 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -35,6 +35,7 @@
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cross-base)
+  #:use-module (gnu packages disk)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gnupg)
@@ -312,12 +313,15 @@ Hurd-minimal package which are needed for both glibc and GCC.")
 (define-public hurd
   (package
     (name "hurd")
-    (source (package-source hurd-headers))
+    (source (origin
+              (inherit (package-source hurd-headers))
+              (patches (search-patches "hurd-fix-rumpdisk-build.patch"
+                                       "hurd-rumpdisk-no-hd.patch"))))
     (version (package-version hurd-headers))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'prepare-dde
+         (add-after 'unpack 'prepare-addons
            (lambda* (#:key native-inputs inputs #:allow-other-keys)
              ;; First we import the things we want from dde.
              (for-each make-file-writable (find-files "."))
@@ -331,7 +335,7 @@ Hurd-minimal package which are needed for both glibc and GCC.")
              ;; Makefile. libdde_linux26 is built later in its own phase.
              (substitute* "Makefile"
                (("libbpf ")
-                "libbpf libmachdevdde libddekit"))))
+                "libbpf libmachdevdde libddekit rumpdisk"))))
          (add-after 'unpack 'find-tirpc
            (lambda* (#:key inputs #:allow-other-keys)
              (for-each (lambda (var)
@@ -494,10 +498,10 @@ exec ${system}/rc \"$@\"
        #:configure-flags
        ,#~(list (string-append "LDFLAGS=-Wl,-rpath="
                                #$output "/lib")
+                "--enable-static-progs=ext2fs,iso9660fs,rumpdisk,pci-arbiter,acpi"
                 "--disable-ncursesw"
                 "--without-libbz2"
                 "--without-libz"
-                "--without-parted"
                 ;; This is needed to pass the configure check for
                 ;; clnt_create
                 "ac_func_search_save_LIBS=-ltirpc"
@@ -518,7 +522,9 @@ exec ${system}/rc \"$@\"
        ("coreutils" ,coreutils)
        ("sed" ,sed)
        ("grep" ,grep)
-       ("util-linux" ,util-linux)))
+       ("util-linux" ,util-linux "static")       ;libuuid.a, for parted
+       ("parted" ,parted)                        ;for rumpdisk
+       ("rumpkernel" ,rumpkernel)))
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)
diff --git a/gnu/packages/patches/hurd-fix-rumpdisk-build.patch b/gnu/packages/patches/hurd-fix-rumpdisk-build.patch
new file mode 100644
index 0000000000..4ecd5ed0ee
--- /dev/null
+++ b/gnu/packages/patches/hurd-fix-rumpdisk-build.patch
@@ -0,0 +1,41 @@
+Upstream status: taken from upstream.
+
+From a2b0f721d077fdc5c9decb21b975b58fb51a3e8f Mon Sep 17 00:00:00 2001
+From: Janneke Nieuwenhuizen <janneke@gnu.org>
+Date: Mon, 22 May 2023 19:21:47 +0200
+Subject: [PATCH] rumpdisk: Do not assume FHS /usr/lib, fixes Guix cross-build.
+
+---
+ rumpdisk/Makefile | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/rumpdisk/Makefile b/rumpdisk/Makefile
+index 60a209b3..b59aaf9a 100644
+--- a/rumpdisk/Makefile
++++ b/rumpdisk/Makefile
+@@ -1,5 +1,5 @@
+ #
+-#   Copyright (C) 2019 Free Software Foundation, Inc.
++#   Copyright (C) 2019, 2023 Free Software Foundation, Inc.
+ #
+ #   This program is free software; you can redistribute it and/or
+ #   modify it under the terms of the GNU General Public License as
+@@ -15,7 +15,6 @@
+ #   along with this program; if not, write to the Free Software
+ #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+-RUMPPATH=/usr/lib
+ RUMPLIBS=rump rumpuser rumpdev rumpdev_disk rumpdev_pci rumpvfs rumpdev_ahcisata rumpdev_piixide rumpdev_ata
+ RUMPEXTRA=rumpdev_scsipi
+ 
+@@ -38,6 +37,6 @@ target = rumpdisk
+ OBJS = $(SRCS:.c=.o)
+ HURDLIBS = machdev ports trivfs shouldbeinlibc iohelp ihash fshelp
+ LDLIBS += -lpthread -lpciaccess -ldl
+-LDLIBS += -Wl,--whole-archive $(RUMPLIBS:%=$(RUMPPATH)/lib%_pic.a) -Wl,--no-whole-archive $(RUMPEXTRA:%=$(RUMPPATH)/lib%_pic.a)
++LDLIBS += -Wl,--whole-archive $(RUMPLIBS:%=-l%_pic) -Wl,--no-whole-archive $(RUMPEXTRA:%=-l%_pic)
+ 
+ include ../Makeconf
+-- 
+2.40.1
+
diff --git a/gnu/packages/patches/hurd-rumpdisk-no-hd.patch b/gnu/packages/patches/hurd-rumpdisk-no-hd.patch
new file mode 100644
index 0000000000..4e5d41917d
--- /dev/null
+++ b/gnu/packages/patches/hurd-rumpdisk-no-hd.patch
@@ -0,0 +1,26 @@
+This avoids rumpdisk crash when booting without "noide".
+
+Upstream status: Taken from Debian Salsa package git
+
+    https://salsa.debian.org/hurd-team/hurd/-/blob/f40ff84260b5a98bea949013415a1c92c127a43e/debian/patches/rumpdisk-no-hd
+
+Index: hurd-debian/rumpdisk/block-rump.c
+===================================================================
+--- hurd-debian.orig/rumpdisk/block-rump.c
++++ hurd-debian/rumpdisk/block-rump.c
+@@ -143,7 +143,6 @@ rumpdisk_device_init (void)
+     {
+       device_t device;
+ 
+-#if 0
+       if (! device_open (device_master, D_READ, "hd0", &device)
+        || ! device_open (device_master, D_READ, "hd1", &device)
+        || ! device_open (device_master, D_READ, "hd3", &device)
+@@ -154,7 +153,6 @@ rumpdisk_device_init (void)
+ 	  disabled = 1;
+ 	  return;
+ 	}
+-#endif
+ 
+       if (! device_open (device_master, D_READ, "sd0", &device)
+        || ! device_open (device_master, D_READ, "sd1", &device)
-- 
cgit 1.4.1


From fe873fb417258e66d74d416745bdc1bfd7f0eba4 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 17 May 2023 07:16:26 +0200
Subject: hurd-boot: Setup pci-arbiter and rumpdisk translators.

* gnu/build/hurd-boot.scm (make-hurd-device-nodes): Create "servers/bus/pci.
(set-hurd-device-translators): Create transators for pci-arbiter, rumpdisk,
and /dev/wd0..3s1..4.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/build/hurd-boot.scm | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm
index 95c15907dd..18b7feabc3 100644
--- a/gnu/build/hurd-boot.scm
+++ b/gnu/build/hurd-boot.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020-2022 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -105,7 +105,7 @@ Return the value associated with OPTION, or #f on failure."
 
   ;; TODO: Set the 'gnu.translator' extended attribute for passive translator
   ;; settings?
-  )
+  (mkdir-p (scope "servers/bus/pci")))
 
 (define (passive-translator-xattr? file-name)
   "Return true if FILE-NAME has an extended @code{gnu.translator} attribute
@@ -183,7 +183,8 @@ set."
        (mkdir-p dir))))
 
   (define servers
-    '(("servers/crash-dump-core" ("/hurd/crash" "--dump-core"))
+    '(("servers/bus/pci"         ("/hurd/pci-arbiter"))
+      ("servers/crash-dump-core" ("/hurd/crash" "--dump-core"))
       ("servers/crash-kill"      ("/hurd/crash" "--kill"))
       ("servers/crash-suspend"   ("/hurd/crash" "--suspend"))
       ("servers/password"        ("/hurd/password"))
@@ -213,6 +214,8 @@ set."
       ;; 'fd_to_filename' in libc expects it.
       ("dev/fd"      ("/hurd/magic"    "--directory" "fd")  #o555)
 
+      ("dev/rumpdisk" ("/hurd/rumpdisk")                    #o660)
+
       ;; Create a number of ttys; syslogd writes to tty12 by default.
       ;; FIXME: Creating /dev/tty12 leads the console client to switch to
       ;; tty12 when syslogd starts, which is confusing for users.  Thus, do
@@ -236,7 +239,22 @@ set."
                            ("/hurd/term" ,(string-append "/dev/ttyp" n)
                             "pty-slave" ,(string-append "/dev/ptyp" n))
                            #o666))))
-                    (iota 10 0))))
+                    (iota 10 0))
+      ,@(append-map (lambda (n)
+                      (let* ((n (number->string n))
+                             (drive (string-append "dev/wd" n))
+                             (disk (string-append "@/dev/disk:wd" n)))
+                        `((,drive ("/hurd/storeio" ,disk) #o600)
+                          ,@(map (lambda (p)
+                                   (let ((p (number->string p)))
+                                     `(,(string-append drive "s" p)
+                                       ("/hurd/storeio"
+                                        "--store-type=typed"
+                                        ,(string-append
+                                          "part:" p ":device:" disk))
+                                       #o660)))
+                                 (iota 4 1)))))
+                    (iota 4 0))))
 
   (for-each scope-set-translator servers)
   (mkdir* "dev/vcs/1")
@@ -249,6 +267,7 @@ set."
   (false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout")))
   (false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr")))
   (false-if-EEXIST (symlink "crash-dump-core" (scope "servers/crash")))
+  (false-if-EEXIST (symlink "/dev/rumpdisk" (scope "dev/disk")))
 
   ;; Make sure /etc/mtab is a symlink to /proc/mounts.
   (false-if-exception (delete-file (scope "etc/mtab")))
-- 
cgit 1.4.1


From 09657f3ee70d232f1c7eb21d0bbef98181138a31 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 18 May 2023 09:30:53 +0200
Subject: services: childhurd: Bump default qemu memory to 2048MB.

When booting with pci-arbiter and rumpdisk and using 1024MB of memory for
qemu, booting hangs, or seems to hang, at the end of the rumpdisk boot
messages.  At least 1200MB is required, currently.

* gnu/services/virtualization.scm (<hurd-vm-configuration>)[memory-size]: Bump
to 2048.
* gnu/system/examples/bare-hurd.tmpl: Suggest using 2048 here too.  Update
example `guix system image' and "qemu" command lines too.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/services/virtualization.scm    | 4 ++--
 gnu/system/examples/bare-hurd.tmpl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
index 506f5a7ab6..eef7ffd1c7 100644
--- a/gnu/services/virtualization.scm
+++ b/gnu/services/virtualization.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Ryan Moe <ryan.moe@gmail.com>
 ;;; Copyright © 2018, 2020-2023 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2021, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2021 Timotej Lazar <timotej.lazar@araneo.si>
 ;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
@@ -1106,7 +1106,7 @@ that will be listening to receive secret keys on port 1004, TCP."
   (disk-size   hurd-vm-configuration-disk-size          ;number or 'guess
                (default 'guess))
   (memory-size hurd-vm-configuration-memory-size        ;number
-               (default 512))
+               (default 2048))
   (options     hurd-vm-configuration-options            ;list of string
                (default `("--snapshot")))
   (id          hurd-vm-configuration-id                 ;#f or integer [1..]
diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl
index f0dd0cf742..463c7ee798 100644
--- a/gnu/system/examples/bare-hurd.tmpl
+++ b/gnu/system/examples/bare-hurd.tmpl
@@ -5,12 +5,12 @@
 
 ;; To build a disk image for a virtual machine, do
 ;;
-;;     ./pre-inst-env guix system image --target=i586-pc-gnu \
+;;     ./pre-inst-env guix system image --image-type=hurd-raw \
 ;;         gnu/system/examples/bare-hurd.tmpl
 ;;
 ;; You may run it like so
 ;;
-;;     guix environment --ad-hoc qemu -- qemu-system-i386 -enable-kvm -m 512M \
+;;     guix shell qemu -- qemu-system-i386 -enable-kvm -m 2048 \
 ;;      -device rtl8139,netdev=net0 -netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \
 ;;      -snapshot -hda <the-image>
 ;;
-- 
cgit 1.4.1


From 7f86dad6115f9cc981a789c2c5ba0015206c5ee3 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 15 May 2023 19:11:35 +0200
Subject: system: hurd: Boot with pci.arbiter and rumpdisk.

* gnu/system.scm (hurd-multiboot-modules): Add commands for pci.arbiter and
rumpdisk.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/system.scm | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 354f58f55b..23addf41e9 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
 ;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <jannek@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <jannek@gnu.org>
 ;;; Copyright © 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com>
@@ -1486,16 +1486,28 @@ a list of <menu-entry>, to populate the \"old entries\" menu."
 
 (define (hurd-multiboot-modules os)
   (let* ((hurd (operating-system-hurd os))
+         (pci-arbiter-command
+          (list (file-append hurd "/hurd/pci-arbiter.static")
+                "pci-arbiter"
+                "--host-priv-port='${host-port}'"
+                "--device-master-port='${device-port}'"
+                "--next-task='${disk-task}'"
+                "'$(pci-task=task-create)'"
+                "'$(task-resume)'"))
+         (rumpdisk-command
+          (list (file-append hurd "/hurd/rumpdisk.static")
+                "rumpdisk"
+                "--next-task='${fs-task}'"
+                "'$(disk-task=task-create)'"))
          (root-file-system-command
           (list (file-append hurd "/hurd/ext2fs.static")
                 "ext2fs"
                 "--multiboot-command-line='${kernel-command-line}'"
-                "--host-priv-port='${host-port}'"
-                "--device-master-port='${device-port}'"
                 "--exec-server-task='${exec-task}'"
                 "--store-type=typed"
                 "--x-xattr-translator-records"
-                "'${root}'" "'$(task-create)'" "'$(task-resume)'"))
+                "'${root}'"
+                "'$(fs-task=task-create)'"))
          (target (%current-target-system))
          (libc (if target
                    (with-parameters ((%current-target-system #f))
@@ -1512,7 +1524,10 @@ a list of <menu-entry>, to populate the \"old entries\" menu."
           ;;       (file-append hurd "/hurd/exec") "'$(exec-task=task-create)'")
           (list (file-append hurd "/hurd/exec.static") "exec"
                 "'$(exec-task=task-create)'")))
-    (list root-file-system-command exec-server-command)))
+    (list pci-arbiter-command
+          rumpdisk-command
+          root-file-system-command
+          exec-server-command)))
 
 (define* (operating-system-boot-parameters os root-device
                                            #:key system-kernel-arguments?)
-- 
cgit 1.4.1


From c22c29b0c4821ebe2c66a6c76562a41d33ff8392 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 23 May 2023 16:03:53 +0200
Subject: bootloader: grub: Use rumpdisk-style root when booting with "noide".

* gnu/bootloader/grub.scm (make-grub-configuration): When "noide" is in
arguments, use device name "wd0" rather than "hd0".

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/bootloader/grub.scm | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index ecd44e7f3c..5f3fcd7074 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2019, 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
 ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2020 Stefan <stefan-guix@vodafonemail.de>
@@ -404,17 +404,23 @@ when booting a root file system on a Btrfs subvolume."
                     #$linux (string-join (list #$@arguments))
                     #$initrd)))
        (multiboot-kernel
-        (let ((kernel (menu-entry-multiboot-kernel entry))
-              (arguments (menu-entry-multiboot-arguments entry))
-              (modules (menu-entry-multiboot-modules entry))
-              (root-index 1))            ; XXX EFI will need root-index 2
+        (let* ((kernel (menu-entry-multiboot-kernel entry))
+               (arguments (menu-entry-multiboot-arguments entry))
+               ;; Choose between device names as understood by Mach's built-in
+               ;; IDE driver ("hdX") and those understood by rumpdisk ("wdX"
+               ;; in the "noide" case).
+               (disk (if (member "noide" arguments) "w" "h"))
+               (modules (menu-entry-multiboot-modules entry))
+               (root-index 1))          ; XXX EFI will need root-index 2
           #~(format port "
 menuentry ~s {
-  multiboot ~a root=device:hd0s~a~a~a
+  multiboot ~a root=part:~a:device:~ad0~a~a
 }~%"
                     #$label
                     #$kernel
-                    #$root-index (string-join (list #$@arguments) " " 'prefix)
+                    #$root-index
+                    #$disk
+                    (string-join (list #$@arguments) " " 'prefix)
                     (string-join (map string-join '#$modules)
                                  "\n  module " 'prefix))))
        (chain-loader
-- 
cgit 1.4.1


From bbfb41ed9dff845e12ebd597026729f637903ac4 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 19 May 2023 14:03:47 +0200
Subject: gnu: gnumach: Support "noide" argument.

* gnu/packages/patches/gnumach-support-noide.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/hurd.scm (gnumach-headers): Use it.
* doc/guix.texi (Bootloader Configuration): Document it.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 doc/guix.texi                                    | 24 ++++++++++++++++++++++-
 gnu/local.mk                                     |  1 +
 gnu/packages/hurd.scm                            |  6 ++++++
 gnu/packages/patches/gnumach-support-noide.patch | 25 ++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/gnumach-support-noide.patch

diff --git a/doc/guix.texi b/doc/guix.texi
index 0cdc528c1c..8e4508b237 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40078,7 +40078,29 @@ For example:
 @item @code{multiboot-arguments} (default: @code{'()})
 The list of extra command-line arguments for the multiboot-kernel.
 
-@item @code{multiboot-modules} (default: @code{'()})
+For example, when running in QEMU it can be useful to use a text-based
+console (use options @option{--nographic} @option{--serial mon:stdio}):
+
+@lisp
+'("console=com0")
+@end lisp
+
+To use the new and still experimental
+@uref{https://darnassus.sceen.net/~hurd-web/rump_kernel/, rumpdisk
+user-level disk driver} instead of GNU@tie{}Mach's in-kernel IDE driver,
+set @code{kernel-arguments} to:
+
+@lisp
+'("noide")
+@end lisp
+
+Of course, these options can be combined:
+
+@lisp
+'("console=com0" "noide")
+@end lisp
+
++@item @code{multiboot-modules} (default: @code{'()})
 The list of commands for loading Multiboot modules.  For example:
 
 @lisp
diff --git a/gnu/local.mk b/gnu/local.mk
index cf085c9c38..30dd32fdce 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1287,6 +1287,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/gnome-settings-daemon-gc.patch		\
   %D%/packages/patches/gnome-session-support-elogind.patch	\
   %D%/packages/patches/gnome-tweaks-search-paths.patch		\
+  %D%/packages/patches/gnumach-support-noide.patch		\
   %D%/packages/patches/gnupg-default-pinentry.patch		\
   %D%/packages/patches/gnupg-1-build-with-gcc10.patch		\
   %D%/packages/patches/gnutls-skip-trust-store-test.patch	\
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 419d12939f..3a9797009b 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -253,6 +253,12 @@ Hurd-minimal package which are needed for both glibc and GCC.")
   (package
     (inherit gnumach-headers)
     (name "gnumach")
+    (source (origin
+              (inherit (package-source gnumach-headers))
+              (patches
+               (append
+                (search-patches "gnumach-support-noide.patch")
+                (origin-patches (package-source gnumach-headers))))))
     (arguments
      (substitute-keyword-arguments (package-arguments gnumach-headers)
        ((#:make-flags flags ''())
diff --git a/gnu/packages/patches/gnumach-support-noide.patch b/gnu/packages/patches/gnumach-support-noide.patch
new file mode 100644
index 0000000000..723d4bcac4
--- /dev/null
+++ b/gnu/packages/patches/gnumach-support-noide.patch
@@ -0,0 +1,25 @@
+Upstream status: Taken from Debian/upsream.
+
+    https://salsa.debian.org/hurd-team/gnumach/-/blob/master/debian/patches/90_noide.patch
+
+This supports using `noide' on the gnumach command line, disabling
+gnumach IDE support and thus forcing use of rumdisk.
+
+---
+ linux/dev/glue/block.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/linux/dev/glue/block.c
++++ b/linux/dev/glue/block.c
+@@ -207,7 +207,10 @@ int
+ blk_dev_init ()
+ {
+ #ifdef CONFIG_BLK_DEV_IDE
+-  ide_init ();
++  extern char *kernel_cmdline;
++  if (strncmp(kernel_cmdline, "noide", 5) &&
++      !strstr(kernel_cmdline, " noide"))
++    ide_init ();
+ #endif
+ #ifdef CONFIG_BLK_DEV_FD
+   floppy_init ();
-- 
cgit 1.4.1


From 37256c02a2b2b54378b19a31765e1e42aa3ff514 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 25 May 2023 07:25:26 +0200
Subject: gnu: netdde: Resurrect and update to 2.6.32.65-2-e67c284ac1.

* gnu/packages/patches/netdde-build-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/hurd.scm (netdde)[source]: Update to
e67c284ac113d939b10b4578334f27dab29d5b08 and use it.
[inputs]: Add zlib:static.
[arguments]: Remove #true from build phases.  In 'build' phase, remove
obsolete CFLAGS, and also build static version.  In 'install' phase,
install them in <out>/hurd.  There is no check target, so set #:tests?
to #false.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/local.mk                                |  1 +
 gnu/packages/hurd.scm                       | 40 ++++++++++++++++-------------
 gnu/packages/patches/netdde-build-fix.patch | 28 ++++++++++++++++++++
 3 files changed, 51 insertions(+), 18 deletions(-)
 create mode 100644 gnu/packages/patches/netdde-build-fix.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 30dd32fdce..53f59a830d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1618,6 +1618,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/ncompress-fix-softlinks.patch		\
   %D%/packages/patches/ncftp-reproducible.patch			\
   %D%/packages/patches/netcdf-date-time.patch			\
+  %D%/packages/patches/netdde-build-fix.patch			\
   %D%/packages/patches/netpbm-CVE-2017-2586.patch		\
   %D%/packages/patches/netpbm-CVE-2017-2587.patch		\
   %D%/packages/patches/netsurf-message-timestamp.patch		\
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 3a9797009b..5072b7de2b 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -553,8 +553,8 @@ implementing them.")
     (license gpl2+)))
 
 (define-public netdde
-  (let ((commit "4a1016f130b6f2065d3f088325e5fb0b2997ae12")
-        (revision "1"))
+  (let ((commit "e67c284ac113d939b10b4578334f27dab29d5b08")
+        (revision "2"))
     (package
       (name "netdde")
       ;; The version prefix corresponds to the version of Linux from which the
@@ -565,20 +565,19 @@ implementing them.")
                 (uri (git-reference
                       (url "https://git.savannah.gnu.org/git/hurd/incubator.git")
                       (commit commit)))
+                (patches (list (search-patch "netdde-build-fix.patch")))
                 (sha256
                  (base32
-                  "1njv9dszq4lj05yq4v9j5v247hfghpzvvz4hzy0khjjr35mw7hr8"))
+                  "0vnkls7sr7srzib5mnw6gybzl5qa8c5a4zf3h08w6gdr7zqbndh0"))
                 (file-name (git-file-name name commit))))
       (build-system gnu-build-system)
       (arguments
-       `(#:make-flags
+       `(#:tests? #f                    ;no "check" target
+         #:make-flags
          (list (string-append "SHELL="
                               (search-input-file %build-inputs "/bin/bash"))
                "PKGDIR=libdde_linux26"
-               ,@(if (%current-target-system)
-                     (list "CC=i586-pc-gnu-gcc"
-                           "LINK_PROGRAM=i586-pc-gnu-gcc")
-                     (list "CC=gcc")))
+               (string-append "CC=" ,(cc-for-target)))
          #:configure-flags
          ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
          #:phases
@@ -594,8 +593,7 @@ implementing them.")
                               (string-append dde "/" dir ) dir))
                            '("libdde_linux26" "libddekit")))
                (substitute* "libdde_linux26/mk/rel2abs.sh"
-                 (("/bin/bash") (which "bash")))
-               #t))
+                 (("/bin/bash") (which "bash")))))
            (add-after 'patch-generated-file-shebangs 'build-libdde-linux26
              (lambda* (#:key make-flags #:allow-other-keys)
                (with-directory-excursion "libdde_linux26"
@@ -606,17 +604,23 @@ implementing them.")
                (apply invoke "make" "convert" make-flags)))
            (replace 'build
              (lambda* (#:key make-flags #:allow-other-keys)
-               ;; no-common can be dropped with GCC 10+ where this is the
-               ;; default.
-               (apply invoke "make" "CFLAGS=-fno-common" make-flags)))
+               (apply invoke "make"
+                      ,(string-append "LINK_PROGRAM=" (cc-for-target))
+                      make-flags)
+               ;; This hack to build netdde.static was found in
+               ;; https://salsa.debian.org/hurd-team/netdde/-/blob/b539b2ad7a171371f140c3da58cce33f1a91ac12/debian/rules
+               (delete-file "Makefile.inc")
+               (apply invoke "make"
+                      ,(string-append "LINK_PROGRAM=" (cc-for-target) " -static")
+                      "TARGET=netdde.static"
+                      make-flags)))
            (replace 'install
              (lambda* (#:key outputs #:allow-other-keys)
-               (install-file "netdde"
-                             (string-append (assoc-ref outputs "out")
-                                            "/bin"))
-               #t)))))
+               (let ((hurd (string-append (assoc-ref outputs "out") "/hurd")))
+                 (install-file "netdde" hurd)
+                 (install-file "netdde.static" hurd)))))))
       (inputs
-       (list hurd libpciaccess-0.17 zlib))
+       (list hurd libpciaccess-0.17 zlib `(,zlib "static")))
       (native-inputs
        `(("coreutils" ,coreutils)
          ("gawk" ,gawk)
diff --git a/gnu/packages/patches/netdde-build-fix.patch b/gnu/packages/patches/netdde-build-fix.patch
new file mode 100644
index 0000000000..f7f0fc35a9
--- /dev/null
+++ b/gnu/packages/patches/netdde-build-fix.patch
@@ -0,0 +1,28 @@
+Upstream status: Presented upstream.
+
+    https://lists.gnu.org/archive/html/bug-hurd/2023-05//msg00449.html
+
+From b0a7e4f2706bea8d1c80d5af7a095941f9635033 Mon Sep 17 00:00:00 2001
+From: Janneke Nieuwenhuizen <janneke@gnu.org>
+Date: Fri, 26 May 2023 17:39:17 +0200
+Subject: [PATCH] Update for .../rumpdisk: Fix race condition in bootstrap
+
+---
+ machdev.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/machdev.c b/machdev.c
+index dda5eb8ba..1a6811072 100644
+--- a/machdev.c
++++ b/machdev.c
+@@ -18,5 +18,6 @@ void machdev_run1 (void *arg)
+ 
+ void machdev_run2(void)
+ {
+-	machdev_trivfs_server(bootstrap);
++	machdev_trivfs_server_startup(bootstrap);
++	machdev_trivfs_server_loop(NULL);
+ }
+-- 
+2.40.1
+
-- 
cgit 1.4.1


From 030b15d466a2a1611e0d4b52971c4b1752b86ccc Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 24 May 2023 23:23:30 +0200
Subject: hurd-boot: Cater for netdde.

* gnu/build/hurd-boot.scm (set-hurd-device-translators): Setup translators for
netdde, eth{0,1}.  Create /servers/socket/{inet,inet6} symlinks.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/build/hurd-boot.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm
index 18b7feabc3..19bdbdf6ae 100644
--- a/gnu/build/hurd-boot.scm
+++ b/gnu/build/hurd-boot.scm
@@ -215,6 +215,13 @@ set."
       ("dev/fd"      ("/hurd/magic"    "--directory" "fd")  #o555)
 
       ("dev/rumpdisk" ("/hurd/rumpdisk")                    #o660)
+      ("dev/netdde"  ("/hurd/netdde")                       #o660)
+      ("dev/eth0"    ("/hurd/devnode" "--master-device=/dev/net"
+                      "eth0")
+                                                            #o660)
+      ("dev/eth1"    ("/hurd/devnode" "--master-device=/dev/net"
+                      "eth1")
+                                                            #o660)
 
       ;; Create a number of ttys; syslogd writes to tty12 by default.
       ;; FIXME: Creating /dev/tty12 leads the console client to switch to
@@ -268,6 +275,9 @@ set."
   (false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr")))
   (false-if-EEXIST (symlink "crash-dump-core" (scope "servers/crash")))
   (false-if-EEXIST (symlink "/dev/rumpdisk" (scope "dev/disk")))
+  (false-if-EEXIST (symlink "/dev/netdde" (scope "dev/net")))
+  (false-if-EEXIST (symlink "/servers/socket/2" (scope "servers/socket/inet")))
+  (false-if-EEXIST (symlink "/servers/socket/26" (scope "servers/socket/inet6")))
 
   ;; Make sure /etc/mtab is a symlink to /proc/mounts.
   (false-if-exception (delete-file (scope "etc/mtab")))
-- 
cgit 1.4.1


From cefcf0fb04c475c2c016e856f2b60a7c2ecdfcf5 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 24 May 2023 23:27:25 +0200
Subject: system: hurd: Add netdde to %base-packages/hurd.

* gnu/system/hurd.scm (%base-packages/hurd): Add netdde.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/system/hurd.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 387605ec4f..22dafae622 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020-2022 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -68,7 +68,7 @@
   ;; Note: the Shepherd comes before the Hurd, not just because its duty is to
   ;; shepherd the herd, but also because we want its 'halt' and 'reboot'
   ;; commands to take precedence.
-  (list shepherd-0.8 hurd bash coreutils file findutils grep sed
+  (list shepherd-0.8 hurd netdde bash coreutils file findutils grep sed
         diffutils patch gawk tar gzip bzip2 xz lzip
         guile-3.0-latest guile-colorized guile-readline
         net-base inetutils less shadow sudo which
-- 
cgit 1.4.1


From 9c1957921a1f53973c9b4b895f6d6d5fa63fe2dd Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 26 May 2023 12:03:10 +0200
Subject: services: static-networking: Support netdde for the Hurd.

As suggested by Sergey Bugaev on bug-hurd

    https://lists.gnu.org/archive/html/bug-hurd/2023-05//msg00455.html

* gnu/services/base.scm (static-networking->hurd-pfinet-options): Use
/DEV/ethX.  Use long options for settrans.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/services/base.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 636d827ff9..492cf8a693 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
-;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2019, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
 ;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2021 qblade <qblade@protonmail.com>
@@ -2726,7 +2726,7 @@ to CONFIG."
   (match (static-networking-addresses config)
     ((and addresses (first _ ...))
      `("--ipv6" "/servers/socket/26"
-       "--interface" ,(network-address-device first)
+       "--interface" ,(string-append "/dev/" (network-address-device first))
        ,@(append-map (lambda (address)
                        `(,(if (network-address-ipv6? address)
                               "--address6"
@@ -2769,7 +2769,10 @@ to CONFIG."
                            (format #t "starting '~a~{ ~s~}'~%"
                                    #$(file-append hurd "/hurd/pfinet")
                                    options)
-                           (apply invoke #$(file-append hurd "/bin/settrans") "-fac"
+                           (apply invoke #$(file-append hurd "/bin/settrans")
+                                  "--active"
+                                  "--create"
+                                  "--keep-active"
                                   "/servers/socket/2"
                                   #$(file-append hurd "/hurd/pfinet")
                                   options)))))))
-- 
cgit 1.4.1


From b4fe82bd8af735000d0f2165a23cfb695c181f6f Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 25 May 2023 16:15:50 +0200
Subject: gnu: gnumach: Disable builtin networking.

See also

    https://logs.guix.gnu.org/hurd/2023-05-25.log#163610

* gnu/packages/hurd.scm (gnumach)[arguments]: Add --disable-net-group,
--disable-pcmcia-group, and --disable-wireless-group.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
 gnu/packages/hurd.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 5072b7de2b..7e788d398d 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -264,7 +264,11 @@ Hurd-minimal package which are needed for both glibc and GCC.")
        ((#:make-flags flags ''())
         `(cons "CFLAGS=-fcommon" ,flags))
        ((#:configure-flags flags ''())
-        `(cons "--enable-kdb" ,flags))            ;enable kernel debugger
+        `(cons* "--enable-kdb" ;enable kernel debugger
+                "--disable-net-group"
+                "--disable-pcmcia-group"
+                "--disable-wireless-group"
+               ,flags))
        ((#:phases phases '%standard-phases)
         `(modify-phases %standard-phases
            (add-after 'install 'produce-image
-- 
cgit 1.4.1


From d17879cd0dec60ea7490632910257890f207d6cb Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Mon, 10 Jul 2023 11:09:32 +0200
Subject: guix: platform: Use srfi-34's raise instead of raise-exception.

* guix/platform.scm (lookup-platform-by-system)
(lookup-platform-by-target)
(lookup-platform-by-target-or-system): Use srfi-34's raise instead of
raise-exception.
---
 guix/platform.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/guix/platform.scm b/guix/platform.scm
index a2d95ab507..55917ca308 100644
--- a/guix/platform.scm
+++ b/guix/platform.scm
@@ -120,8 +120,8 @@ exception."
               (let ((s (platform-system platform)))
                 (and (string? s) (string=? s system))))
             (platforms))
-      (raise-exception (condition (&platform-not-found-error
-                                   (target-or-system system))))))
+      (raise (condition (&platform-not-found-error
+                         (target-or-system system))))))
 
 (define (lookup-platform-by-target target)
   "Return the platform corresponding to the given TARGET.  Raise
@@ -130,16 +130,16 @@ exception."
               (let ((t (platform-target platform)))
                 (and (string? t) (string=? t target))))
             (platforms))
-      (raise-exception (condition (&platform-not-found-error
-                                   (target-or-system target))))))
+      (raise (condition (&platform-not-found-error
+                         (target-or-system target))))))
 
 (define (lookup-platform-by-target-or-system target-or-system)
   "Return the platform corresponding to the given TARGET or SYSTEM.  Raise
 &PLATFORM-NOT-FOUND-ERROR when no platform could be found."
   (or (false-if-platform-not-found (lookup-platform-by-target target-or-system))
       (false-if-platform-not-found (lookup-platform-by-system target-or-system))
-      (raise-exception (condition (&platform-not-found-error
-                                   (target-or-system target-or-system))))))
+      (raise (condition (&platform-not-found-error
+                         (target-or-system target-or-system))))))
 
 (define (platform-system->target system)
   "Return the target matching the given SYSTEM if it exists or false
-- 
cgit 1.4.1


From f7c6d31e33167a64351c805c857e5727c7c3db4b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Thu, 13 Jul 2023 22:27:58 +0200
Subject: gnu: python-mizani: Fix embedded version string.

* gnu/packages/python-xyz.scm (python-mizani)[native-inputs]: Add
python-setuptools-scm to correct embedded version form 0.0.0 to 0.9.2.
---
 gnu/packages/python-xyz.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6d460e286e..069d60fdda 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4273,7 +4273,8 @@ processing tasks.")
     (propagated-inputs
      (list python-matplotlib python-numpy python-pandas python-scipy))
     (native-inputs
-     (list python-setuptools python-pytest python-pytest-cov tzdata))
+     (list python-setuptools python-setuptools-scm
+           python-pytest python-pytest-cov tzdata))
     (home-page "https://github.com/has2k1/mizani")
     (synopsis "Create data visualizations in Python")
     (description
-- 
cgit 1.4.1


From ea81a0417a9a5e6ebf3bfd363b5b5fe3f8a0a773 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Thu, 13 Jul 2023 22:29:06 +0200
Subject: gnu: Add python-plotnine.

* gnu/packages/python-science.scm (python-plotnine): New variable.
---
 gnu/packages/python-science.scm | 98 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 938deaec6a..00d6ad7305 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -50,6 +50,7 @@
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages gcc)
+  #:use-module (gnu packages geo)
   #:use-module (gnu packages image)
   #:use-module (gnu packages image-processing)
   #:use-module (gnu packages machine-learning)
@@ -1470,6 +1471,103 @@ pandas code.")
 aggregated sum and more.")
     (license license:bsd-3)))
 
+(define-public python-plotnine
+  (package
+    (name "python-plotnine")
+    ;; XXX Version 0.12.x exists, but we can't build it because we're still at
+    ;; matplotlib 3.5.  We'd need at least 3.6.
+    (version "0.10.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/has2k1/plotnine")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0lg53wcm00lj8zbb4q9yj4a0n0fqaqq7c7vj18bda0k56gg0fpwl"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      ;; These all fail because the images are considered to be too different,
+      ;; though they really do look fine.
+      '(list "-k" (string-append
+                   "not TestThemes"
+                   (string-join
+                    (list
+                     ;; Image tests
+                     "test_adjust_text"
+                     "test_annotation_logticks_coord_flip_discrete"
+                     "test_annotation_logticks_faceting"
+                     "test_arrow"
+                     "test_aslabeller_dict_0tag"
+                     "test_caption_simple"
+                     "test_continuous_x"
+                     "test_continuous_x_fullrange"
+                     "test_coord_trans_backtransforms"
+                     "test_coord_trans_se_false"
+                     "test_datetime_scale_limits"
+                     "test_dir_v_ncol"
+                     "test_discrete_x"
+                     "test_discrete_x_fullrange"
+                     "test_facet_grid_drop_false"
+                     "test_facet_grid_expression"
+                     "test_facet_grid_space_ratios"
+                     "test_facet_wrap"
+                     "test_facet_wrap_expression"
+                     "test_facet_wrap_label_both"
+                     "test_label_context_wrap2vars"
+                     "test_labeller_cols_both_grid"
+                     "test_labeller_cols_both_wrap"
+                     "test_labeller_towords"
+                     "test_missing_data_discrete_scale"
+                     "test_ribbon_facetting"
+                     "test_stack_non_linear_scale"
+                     "test_uneven_num_of_lines"
+
+                     ;; Missing optional modules
+                     "test_non_linear_smooth"
+                     "test_non_linear_smooth_no_ci")
+                    " and not " 'prefix)))
+      #:phases
+      '(modify-phases %standard-phases
+         (add-before 'check 'pre-check
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; The data files are referenced by the tests but they are not
+             ;; installed.
+             (copy-recursively "plotnine/data"
+                               (string-append (site-packages inputs outputs)
+                                              "/plotnine/data"))
+             ;; Matplotlib needs to be able to write its configuration file
+             ;; somewhere.
+             (setenv "MPLCONFIGDIR" "/tmp")
+             (setenv "TZ" "UTC")
+             (setenv "TZDIR"
+                     (search-input-directory inputs "share/zoneinfo")))))))
+    (propagated-inputs
+     (list python-adjusttext
+           python-matplotlib
+           python-mizani
+           python-numpy
+           python-patsy
+           python-scipy
+           python-statsmodels))
+    (native-inputs
+     (list python-geopandas
+           python-mock
+           python-pandas
+           python-pytest python-pytest-cov
+           tzdata-for-tests))
+    (home-page "https://github.com/has2k1/plotnine")
+    (synopsis "Grammar of Graphics for Python")
+    (description
+     "Plotnine is a Python implementation of the Grammar of Graphics.
+It is a powerful graphics concept for creating plots and visualizations in a
+structured and declarative manner.  It is inspired by the R package ggplot2
+and aims to provide a similar API and functionality in Python.")
+    (license license:expat)))
+
 (define-public python-pyvista
   (package
     (name "python-pyvista")
-- 
cgit 1.4.1


From 92d18dc568ee27137240e6e7b973edde34a085a8 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Wed, 12 Jul 2023 00:23:36 -0400
Subject: gnu: linux-libre: Update to 6.3.13.

* gnu/packages/linux.scm (linux-libre-6.3-version): Update to 6.3.13.
(linux-libre-6.3-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8277780181..7214dcae2f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -486,7 +486,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.3-version "6.3.12")
+(define-public linux-libre-6.3-version "6.3.13")
 (define-public linux-libre-6.3-gnu-revision "gnu")
 (define deblob-scripts-6.3
   (linux-libre-deblob-scripts
@@ -496,7 +496,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "1i6vyakvqgmr3lcmr0aj8n7lbcksrp4d0rm1sz7cz64hwbsr67pq")))
 (define-public linux-libre-6.3-pristine-source
   (let ((version linux-libre-6.3-version)
-        (hash (base32 "1mvcirkhqnf03cci3jiq077fs9b42a3xdk3zjkpyim3x43ydwzyb")))
+        (hash (base32 "1ywijjhf19bciip75ppzjjh7bkadd449jr64yg2j5049w9h0aipa")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.3)))
-- 
cgit 1.4.1


From ddbfef2e956effdb640712a1829206f2b496f6c2 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 13 Jul 2023 20:49:33 +0300
Subject: gnu: zig-0.9: Fix building on riscv64-linux.

* gnu/packages/zig.scm (zig-0.9)[source]: Add patch.
[arguments]: Skip tests when building for riscv64-linux. When building
for riscv64-linux add a phase to adjust the tests.
* gnu/packages/patches/zig-0.9-riscv-support.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk                                     |  1 +
 gnu/packages/patches/zig-0.9-riscv-support.patch | 47 ++++++++++++++++++++++++
 gnu/packages/zig.scm                             | 22 ++++++++++-
 3 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/zig-0.9-riscv-support.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 53f59a830d..71a13462ab 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2109,6 +2109,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/xygrib-fix-finding-data.patch		\
   %D%/packages/patches/xygrib-newer-proj.patch			\
   %D%/packages/patches/yggdrasil-extra-config.patch	\
+  %D%/packages/patches/zig-0.9-riscv-support.patch		\
   %D%/packages/patches/zig-do-not-link-against-librt.patch	\
   %D%/packages/patches/zig-use-system-paths.patch		\
   %D%/packages/patches/zsh-egrep-failing-test.patch
diff --git a/gnu/packages/patches/zig-0.9-riscv-support.patch b/gnu/packages/patches/zig-0.9-riscv-support.patch
new file mode 100644
index 0000000000..372a68ea02
--- /dev/null
+++ b/gnu/packages/patches/zig-0.9-riscv-support.patch
@@ -0,0 +1,47 @@
+https://github.com/ziglang/zig/commit/ca3c4ff2d0afcdc8fe86e7e7b41a967c88779729
+From: Shupei Fan <dymarkfan@outlook.com>
+zig0: properly set llvm_cpu_names and llvm_cpu_features for riscv
+
+Bug: https://bugs.gentoo.org/851732
+
+--- a/src/stage1/zig0.cpp
++++ b/src/stage1/zig0.cpp
+@@ -160,6 +160,17 @@ static void get_native_target(ZigTarget *target) {
+     }
+ }
+ 
++static const char* get_baseline_llvm_cpu_name(ZigLLVM_ArchType arch) {
++    return "";
++}
++
++static const char* get_baseline_llvm_cpu_features(ZigLLVM_ArchType arch) {
++    switch (arch) {
++        case ZigLLVM_riscv64: return "+a,+c,+d,+m";
++        default: return "";
++    }
++}
++
+ static Error target_parse_triple(struct ZigTarget *target, const char *zig_triple, const char *mcpu,
+         const char *dynamic_linker)
+ {
+@@ -178,8 +189,8 @@ static Error target_parse_triple(struct ZigTarget *target, const char *zig_tripl
+         } else if (strcmp(mcpu, "baseline") == 0) {
+             target->is_native_os = false;
+             target->is_native_cpu = false;
+-            target->llvm_cpu_name = "";
+-            target->llvm_cpu_features = "";
++            target->llvm_cpu_name = get_baseline_llvm_cpu_name(target->arch);
++            target->llvm_cpu_features = get_baseline_llvm_cpu_features(target->arch);
+         } else {
+             const char *msg = "stage0 can't handle CPU/features in the target";
+             stage2_panic(msg, strlen(msg));
+@@ -220,6 +231,9 @@ static Error target_parse_triple(struct ZigTarget *target, const char *zig_tripl
+             const char *msg = "stage0 can't handle CPU/features in the target";
+             stage2_panic(msg, strlen(msg));
+         }
++
++        target->llvm_cpu_name = get_baseline_llvm_cpu_name(target->arch);
++        target->llvm_cpu_features = get_baseline_llvm_cpu_features(target->arch);
+     }
+ 
+     return ErrorNone;
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index c2f92e04e7..dcca9a1121 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -136,7 +136,8 @@ toolchain.  Among other features it provides
        (file-name (git-file-name name version))
        (sha256
         (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7"))
-       (patches (search-patches "zig-use-system-paths.patch"
+       (patches (search-patches "zig-0.9-riscv-support.patch"
+                                "zig-use-system-paths.patch"
                                 "zig-do-not-link-against-librt.patch"))))
     (inputs
      (list clang-13 ; Clang propagates llvm.
@@ -151,6 +152,9 @@ toolchain.  Among other features it provides
                                   (%current-target-system))
                    '()))
        #:out-of-source? #f ; for tests
+       ;; There are too many unclear test failures.
+       #:tests? ,(not (or (target-riscv64?)
+                          (%current-target-system)))
        #:phases
        (modify-phases %standard-phases
          (add-after 'configure 'set-cache-dir
@@ -158,6 +162,22 @@ toolchain.  Among other features it provides
              ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'.
              (setenv "ZIG_GLOBAL_CACHE_DIR"
                      (string-append (getcwd) "/zig-cache"))))
+         ,@(if (target-riscv64?)
+             ;; It is unclear why all these tests fail to build.
+             `((add-after 'unpack 'adjust-tests
+                 (lambda _
+                   (substitute* "build.zig"
+                     ((".*addRuntimeSafetyTests.*") "")
+                     ((".*addRunTranslatedCTests.*") ""))
+                   (substitute* "test/standalone.zig"
+                     ;; These tests fail to build on riscv64-linux.
+                     ;; They both contain 'exe.linkSystemLibrary("c");'
+                     ((".*shared_library.*") "")
+                     ((".*mix_o_files.*") "")
+                     ;; ld.lld: error: undefined symbol: __tls_get_addr
+                     ;; Is this symbol x86 only in glibc?
+                     ((".*link_static_lib_as_system_lib.*") "")))))
+             '())
          (delete 'check)
          (add-after 'install 'check
            (lambda* (#:key outputs tests? #:allow-other-keys)
-- 
cgit 1.4.1


From a041bbb4bf98cce72b14c554369fc56eeacc2f5d Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Fri, 14 Jul 2023 11:47:46 +0100
Subject: Revert "gnu: mig: Update to 1.8+git20230520."

As noted in the comment, I think using git-fetch caused problems computing
derivaations for i586-linux (Guix would just use more and more memory).

This reverts commit 999a6ac0cfd9339e138007ed9e4e544a55e92e3e.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/hurd.scm                              | 20 ++++++++------
 ...missing-const_mach_port_name_array_t-type.patch | 32 ++++++++++++++++++++++
 3 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 71a13462ab..b5c28dafac 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1288,6 +1288,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/gnome-session-support-elogind.patch	\
   %D%/packages/patches/gnome-tweaks-search-paths.patch		\
   %D%/packages/patches/gnumach-support-noide.patch		\
+  %D%/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch \
   %D%/packages/patches/gnupg-default-pinentry.patch		\
   %D%/packages/patches/gnupg-1-build-with-gcc10.patch		\
   %D%/packages/patches/gnutls-skip-trust-store-test.patch	\
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 7e788d398d..0e47a954d7 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -91,20 +91,24 @@
 (define-public mig
   (package
     (name "mig")
-    (version "1.8+git20230520")
+    (version "1.8+git20220827")
     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://git.savannah.gnu.org/git/hurd/mig.git")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
+              (method url-fetch)
+              ;; XXX: Version 2.35 of glibc can only be built with an
+              ;; unreleased version of MiG:
+              ;; <https://lists.gnu.org/archive/html/bug-hurd/2023-03/msg00025.html>.
+              ;; It cannot be fetched from Git though, as the extra dependency
+              ;; on Autoconf/Automake would complicate bootstrapping.
+              (uri (string-append "mirror://gnu/guix/mirror/mig-"
+                                  version ".tar.gz"))
               (sha256
                (base32
-                "10r0fdjqjzqsy6ajb21rifvhw0wpjvrw6a1zdyliqlzqny5k0qlz"))))
+                "163d37s9lscd6zxyfng421m9nl857464mgjj90xsrcl5ykbng5p2"))
+              (patches (search-patches "mig-cpu.h-generation.patch"))))
     (build-system gnu-build-system)
     ;; Flex is needed both at build and run time.
     (inputs (list gnumach-headers flex))
-    (native-inputs (list autoconf automake flex bison))
+    (native-inputs (list flex bison))
     (arguments
      (list #:tests? #f
            #:phases
diff --git a/gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch b/gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch
new file mode 100644
index 0000000000..73c99ade23
--- /dev/null
+++ b/gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch
@@ -0,0 +1,32 @@
+From 17335d49a3c9e866a81abc051420d73a59d669bf Mon Sep 17 00:00:00 2001
+Message-Id: <17335d49a3c9e866a81abc051420d73a59d669bf.1678745341.git.dev@jpoiret.xyz>
+From: Josselin Poiret <dev@jpoiret.xyz>
+Date: Sun, 28 Aug 2022 01:17:34 +0200
+Subject: [PATCH] Add missing const_mach_port_name_array_t type
+
+From: Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+---
+ include/mach/port.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/mach/port.h b/include/mach/port.h
+index 3c226f6c..d25eb0b4 100644
+--- a/include/mach/port.h
++++ b/include/mach/port.h
+@@ -43,6 +43,7 @@
+  */
+ typedef unsigned int mach_port_name_t;
+ typedef mach_port_name_t *mach_port_name_array_t;
++typedef const mach_port_name_t *const_mach_port_name_array_t;
+ 
+ /*
+  * A port is represented
+
+base-commit: 3e1702a65fb3caf50c8d09a1b383b0056a5efc82
+prerequisite-patch-id: 4688654277aef235ccd1797a72dce27d52b04616
+prerequisite-patch-id: 8f1e7dd6429c15cc8ed1d411dba0a75b6e745236
+prerequisite-patch-id: 605553ee086473ad9bc24e59c91d49a12dbf8631
+-- 
+2.39.1
+
-- 
cgit 1.4.1


From 5f7c714c63dd4313dbc0ba466ac73c7fb68966db Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Fri, 14 Jul 2023 11:51:18 +0100
Subject: gnu: rumpkernel: Don't error for non x86 systems.

As the lack of handling other systems, say aarch64-linux here seemed to cause
problems with guix pull on these systems.  This should work around #64609.

* gnu/packages/hurd.scm (rumpkernel)[arguments]: Don't error for any system.
---
 gnu/packages/hurd.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 0e47a954d7..3785c47750 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -746,7 +746,8 @@ in userland processes thanks to the DDE layer.")
                                      ((? target-x86-32?)
                                       "i386")
                                      ((? target-x86-64?)
-                                      "amd64")))
+                                      "amd64")
+                                     (_ "unknown")))
                        (toprump (string-append
                                  (getcwd)
                                  "/buildrump.sh/src/sys/rump"))
-- 
cgit 1.4.1


From 24e5db1bc242aeee7798d96942d0e06ca280ef06 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 2 Jul 2023 02:00:01 +0200
Subject: gnu: borg: Update to 1.2.4.

* gnu/packages/backup.scm (borg): Update to 1.2.4.
---
 gnu/packages/backup.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 921398bad6..54386fc538 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -634,13 +634,13 @@ detection, and lossless compression.")
 (define-public borg
   (package
     (name "borg")
-    (version "1.2.3")
+    (version "1.2.4")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "borgbackup" version))
        (sha256
-        (base32 "11b7jqv9sw22a9512b270d12k3mrcgmmcaimh6bgm5iwcgw1h973"))
+        (base32 "1a2d6z2ln476l0fcnkl4rpciij5b2lql44b71aivg0cy8vlm9gd4"))
        (modules '((guix build utils)))
        (snippet
         #~(begin
-- 
cgit 1.4.1


From d3fa3e7313075a1eec96aa6a86696c242f07cdfa Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: aiger: Use HTTPS source & home page.

* gnu/packages/maths.scm (aiger)[source, home-page]: Use HTTPS.
---
 gnu/packages/maths.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index b0b3e382ae..adde13ee65 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -7686,7 +7686,7 @@ optimized algorithms and implementation.")
     (version "1.9.9")
     (source (origin
              (method url-fetch)
-             (uri (string-append "http://fmv.jku.at/aiger/aiger-"
+             (uri (string-append "https://fmv.jku.at/aiger/aiger-"
                                  version ".tar.gz"))
              (sha256
                (base32
@@ -7725,7 +7725,7 @@ optimized algorithms and implementation.")
                      (for-each (lambda (f) (install-file f incl))
                                (find-files "." "\\.h$"))))))))
     (inputs (list gzip))
-    (home-page "http://fmv.jku.at/aiger")
+    (home-page "https://fmv.jku.at/aiger")
     (synopsis "Utilities for And-Inverter Graphs")
     (description "AIGER is a format, library and set of utilities for
 @acronym{AIG, And-Inverter Graphs}s.  The focus is on conversion utilities and a
-- 
cgit 1.4.1


From 75c7f790b0433d137c8c4a7f060bbbef47f06f11 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: download: Remove obsolete Savannah subdirectory.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* guix/download.scm (%mirrors): Remove ‘releases-noredirect’ URL.
---
 guix/download.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/guix/download.scm b/guix/download.scm
index 561a893eee..8344145ee8 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -103,7 +103,6 @@
        "https://mirror.csclub.uwaterloo.ca/nongnu/"
        "https://nongnu.askapache.com/"
        "https://savannah.c3sl.ufpr.br/"
-       "http://download.savannah.gnu.org/releases-noredirect/"
        "https://download-mirror.savannah.gnu.org/releases/"
        "ftp://ftp.twaren.net/Unix/NonGNU/"
        "ftp://mirror.csclub.uwaterloo.ca/nongnu/"
-- 
cgit 1.4.1


From 11ae5491f9e8527ef36e5bea21737199218d6d80 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: alpine: Download over HTTPS.

* gnu/packages/mail.scm (alpine)[source]: Use HTTPS.
---
 gnu/packages/mail.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index c41685f22c..7acb9c83ea 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3794,7 +3794,7 @@ operators and scripters.")
        ;; the patched version, and so do we to not break expectations.
        ;; http://alpine.freeiz.com/alpine/readme/README.patches
        (uri (git-reference
-             (url "http://repo.or.cz/alpine.git")
+             (url "https://repo.or.cz/alpine.git")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-- 
cgit 1.4.1


From 1d7e1fbc3850185348a5cc712980158a4ac37841 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: altermime: Download over HTTPS.

* gnu/packages/mail.scm (altermime)[source]: Use HTTPS.
---
 gnu/packages/mail.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 7acb9c83ea..717c132e22 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -830,7 +830,7 @@ Extension (MIME).")
     (version "0.3.11")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://pldaniels.com/altermime/altermime-"
+              (uri (string-append "https://pldaniels.com/altermime/altermime-"
                                   version ".tar.gz"))
               (sha256
                (base32
-- 
cgit 1.4.1


From bce8c88f42b0fb26a11fa134d10baad626441fd0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: altermime: Use G-expressions.

* gnu/packages/mail.scm (altermime)[arguments]:
Rewrite as G-expressions.  Don't explicitly return #t from phases.
---
 gnu/packages/mail.scm | 61 +++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 717c132e22..c72e99dc0d 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -837,37 +837,36 @@ Extension (MIME).")
                 "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags (list "CC=gcc"
-                          (string-append "PREFIX=" (assoc-ref %outputs "out")))
-       #:tests? #f ; there are none
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (add-after 'unpack 'fix-bugs
-           (lambda _
-             (substitute* "MIME_headers.c"
-               (("hinfo->filename, sizeof\\(hinfo->name\\)")
-                "hinfo->filename, sizeof(hinfo->filename)")
-               (("memset\\(hinfo->defects, 0, _MIMEH_DEFECT_ARRAY_SIZE\\);")
-                "memset(hinfo->defects, 0, sizeof(hinfo->defects));"))
-             (substitute* "pldstr.c"
-               (("if \\(\\(st->start\\)&&\\(st->start != '\\\\0'\\)\\)")
-                "if ((st->start)&&(*st->start != '\\0'))"))
-             (substitute* "qpe.c"
-               (("if \\(lineend != '\\\\0'\\)")
-                "if (*lineend != '\\0')"))
-             #t))
-         (add-after 'unpack 'install-to-prefix
-           (lambda _
-             (substitute* "Makefile"
-               (("/usr/local") "${PREFIX}")
-               (("cp altermime.*") "install -D -t ${PREFIX}/bin altermime\n"))
-             #t))
-         (add-after 'unpack 'disable-Werror
-           (lambda _
-             (substitute* "Makefile"
-               (("-Werror") ""))
-             #t)))))
+     (list
+      #:make-flags
+      #~(list "CC=gcc"
+              (string-append "PREFIX=" #$output))
+      #:tests? #f                       ; there are none
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure)
+          (add-after 'unpack 'fix-bugs
+            (lambda _
+              (substitute* "MIME_headers.c"
+                (("hinfo->filename, sizeof\\(hinfo->name\\)")
+                 "hinfo->filename, sizeof(hinfo->filename)")
+                (("memset\\(hinfo->defects, 0, _MIMEH_DEFECT_ARRAY_SIZE\\);")
+                 "memset(hinfo->defects, 0, sizeof(hinfo->defects));"))
+              (substitute* "pldstr.c"
+                (("if \\(\\(st->start\\)&&\\(st->start != '\\\\0'\\)\\)")
+                 "if ((st->start)&&(*st->start != '\\0'))"))
+              (substitute* "qpe.c"
+                (("if \\(lineend != '\\\\0'\\)")
+                 "if (*lineend != '\\0')"))))
+          (add-after 'unpack 'install-to-prefix
+            (lambda _
+              (substitute* "Makefile"
+                (("/usr/local") "${PREFIX}")
+                (("cp altermime.*") "install -D -t ${PREFIX}/bin altermime\n"))))
+          (add-after 'unpack 'disable-Werror
+            (lambda _
+              (substitute* "Makefile"
+                (("-Werror") "")))))))
     (home-page "https://pldaniels.com/altermime/")
     (synopsis "Modify MIME-encoded messages")
     (description
-- 
cgit 1.4.1


From 57995527394a04abc48bf89b9678cc35a9836662 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: altermime: Cross-compile.

* gnu/packages/mail.scm (altermime)[arguments]: Use CC-FOR-TARGET.
Add a new 'do-not-strip phase.
---
 gnu/packages/mail.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index c72e99dc0d..8728b11b3a 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -839,7 +839,7 @@ Extension (MIME).")
     (arguments
      (list
       #:make-flags
-      #~(list "CC=gcc"
+      #~(list (string-append "CC=" #$(cc-for-target))
               (string-append "PREFIX=" #$output))
       #:tests? #f                       ; there are none
       #:phases
@@ -866,7 +866,11 @@ Extension (MIME).")
           (add-after 'unpack 'disable-Werror
             (lambda _
               (substitute* "Makefile"
-                (("-Werror") "")))))))
+                (("-Werror") ""))))
+          (add-after 'unpack 'do-not-strip
+            (lambda _
+              (substitute* "Makefile"
+                (("\\bstrip\\b") "true")))))))
     (home-page "https://pldaniels.com/altermime/")
     (synopsis "Modify MIME-encoded messages")
     (description
-- 
cgit 1.4.1


From b0e5576702057ed2fb4898f07b655a55789484a3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: anthy: Add source mirror URL.

* gnu/packages/anthy.scm (anthy)[source]: Add a Japanese Gentoo
distfiles mirror.
---
 gnu/packages/anthy.scm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/anthy.scm b/gnu/packages/anthy.scm
index 0d86347e88..4a0066a621 100644
--- a/gnu/packages/anthy.scm
+++ b/gnu/packages/anthy.scm
@@ -27,15 +27,17 @@
   (package
     (name "anthy")
     (version "9100h")
-    (source (origin
-              (method url-fetch)
-              ;; The URI does not appear to be easily guessable.  For
-              ;; example, you cannot download version "9100g" simply
-              ;; by replacing "9100h" in the URI.
-              (uri "http://dl.osdn.jp/anthy/37536/anthy-9100h.tar.gz")
-              (sha256
-               (base32
-                "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"))))
+    (source
+     (origin
+       (method url-fetch)
+       ;; The URI does not appear to be easily guessable.  For
+       ;; example, you cannot download version "9100g" simply
+       ;; by replacing "9100h" in the URI.
+       (uri (list (string-append "https://ftp.jaist.ac.jp/pub/Linux/Gentoo/"
+                                 "distfiles/31/anthy-9100h.tar.gz")
+                  "https://osdn.dl.osdn.net/anthy/37536/anthy-9100h.tar.gz"))
+       (sha256
+        (base32 "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"))))
     (build-system gnu-build-system)
     ;; Anthy also contains elisp modules for using anthy within Emacs.
     ;; However, these modules are incompatible with the latest version
-- 
cgit 1.4.1


From 5cbb60562d4a53ae020a7988493fde3c64ee529e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:00 +0200
Subject: gnu: anthy: Mark up description.

* gnu/packages/anthy.scm (anthy)[description]: Use @file{}.
---
 gnu/packages/anthy.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/anthy.scm b/gnu/packages/anthy.scm
index 4a0066a621..d26cf4a058 100644
--- a/gnu/packages/anthy.scm
+++ b/gnu/packages/anthy.scm
@@ -57,7 +57,7 @@
 hiragana text to mixed kana and kanji.  It is written in the C
 programming language.  Anthy stores personal customizations (words it
 has learned from the user's input, words the user has explicitly
-added, etc.) in the ~/.anthy/ directory.  This package contains the
+added, etc.) in the @file{~/.anthy/} directory.  This package contains the
 anthy C libraries, the cannadic and alt-cannadic kana dictionaries, as
 well as command-line tools for using anthy and managing
 dictionaries.")
-- 
cgit 1.4.1


From b29bd4d35e26951c719f31fc505c7c2bc566b4e1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:00 +0200
Subject: gnu: antiword: Use Web Archive URLs.

* gnu/packages/textutils.scm (antiword)[source, home-page]:
Use copies archived by the Wayback Machine.
---
 gnu/packages/textutils.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 51df3748cd..4e026fc6f9 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -606,7 +606,9 @@ regular expression object can be specified.")
     (version "0.37")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://www.winfield.demon.nl/linux"
+              ;; Development stopped in 2005; as of 2023 the home page 404s.
+              (uri (string-append "https://web.archive.org/web/20200621222738/"
+                                  "http://www.winfield.demon.nl/linux"
                                   "/antiword-" version ".tar.gz"))
               (sha256
                (base32
@@ -634,7 +636,8 @@ regular expression object can be specified.")
          (replace 'install
            (lambda* (#:key make-flags #:allow-other-keys)
              (apply invoke "make" `("global_install" ,@make-flags)))))))
-    (home-page "http://www.winfield.demon.nl/")
+    (home-page (string-append "https://web.archive.org/web/20220121050627/"
+                              "http://www.winfield.demon.nl"))
     (synopsis "Microsoft Word document reader")
     (description "Antiword is an application for displaying Microsoft Word
 documents.  It can also convert the document to PostScript or XML.  Only
-- 
cgit 1.4.1


From 67fb8efdf782592c133726a1ab7bc6692259e385 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: ghostscript: Fix CVE-2023-36664.

* gnu/packages/ghostscript.scm (ghostscript/fixed): New variable.
(ghostscript)[replacement]: Assign it to new field.
* gnu/packages/patches/ghostscript-CVE-2023-36664.patch,
gnu/packages/patches/ghostscript-CVE-2023-36664-fixup.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
---
 gnu/local.mk                                       |   2 +
 gnu/packages/ghostscript.scm                       |   7 +
 .../patches/ghostscript-CVE-2023-36664-fixup.patch |  56 ++++++++
 .../patches/ghostscript-CVE-2023-36664.patch       | 142 +++++++++++++++++++++
 4 files changed, 207 insertions(+)
 create mode 100644 gnu/packages/patches/ghostscript-CVE-2023-36664-fixup.patch
 create mode 100644 gnu/packages/patches/ghostscript-CVE-2023-36664.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index b5c28dafac..06a376a99a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1237,6 +1237,8 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghc-bloomfilter-ghc9.2.patch	\
   %D%/packages/patches/ghc-bytestring-handle-ghc9.patch	\
   %D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch	\
+  %D%/packages/patches/ghostscript-CVE-2023-36664.patch		\
+  %D%/packages/patches/ghostscript-CVE-2023-36664-fixup.patch	\
   %D%/packages/patches/ghostscript-no-header-id.patch		\
   %D%/packages/patches/ghostscript-no-header-uuid.patch		\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 1813cc367e..8d35f1195c 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -145,6 +145,7 @@ printing, and psresize, for adjusting page sizes.")
   (package
     (name "ghostscript")
     (version "9.56.1")
+    (replacement ghostscript/fixed)
     (source
      (origin
        (method url-fetch)
@@ -266,6 +267,12 @@ output file formats and printers.")
     (home-page "https://www.ghostscript.com/")
     (license license:agpl3+)))
 
+(define ghostscript/fixed
+  (package-with-patches
+   ghostscript
+   (search-patches "ghostscript-CVE-2023-36664.patch"
+                   "ghostscript-CVE-2023-36664-fixup.patch")))
+
 (define-public ghostscript/x
   (package/inherit ghostscript
     (name (string-append (package-name ghostscript) "-with-x"))
diff --git a/gnu/packages/patches/ghostscript-CVE-2023-36664-fixup.patch b/gnu/packages/patches/ghostscript-CVE-2023-36664-fixup.patch
new file mode 100644
index 0000000000..c2a222701f
--- /dev/null
+++ b/gnu/packages/patches/ghostscript-CVE-2023-36664-fixup.patch
@@ -0,0 +1,56 @@
+From 0974e4f2ac0005d3731e0b5c13ebc7e965540f4d Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Wed, 14 Jun 2023 09:08:12 +0100
+Subject: [PATCH] Bug 706778: 706761 revisit
+
+Two problems with the original commit. The first a silly typo inverting the
+logic of a test.
+
+The second was forgetting that we actually actually validate two candidate
+strings for pipe devices. One with the expected "%pipe%" prefix, the other
+using the pipe character prefix: "|".
+
+This addresses both those.
+---
+ base/gpmisc.c   | 2 +-
+ base/gslibctx.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/base/gpmisc.c b/base/gpmisc.c
+index 58511270e..2b0064bea 100644
+--- a/base/gpmisc.c
++++ b/base/gpmisc.c
+@@ -1081,7 +1081,7 @@ gp_validate_path_len(const gs_memory_t *mem,
+     /* "%pipe%" do not follow the normal rules for path definitions, so we
+        don't "reduce" them to avoid unexpected results
+      */
+-    if (len > 5 && memcmp(path, "%pipe", 5) != 0) {
++    if (path[0] == '|' || (len > 5 && memcmp(path, "%pipe", 5) == 0)) {
+         bufferfull = buffer = (char *)gs_alloc_bytes(mem->thread_safe_memory, len + 1, "gp_validate_path");
+         if (buffer == NULL)
+             return gs_error_VMerror;
+diff --git a/base/gslibctx.c b/base/gslibctx.c
+index d2a1aa91d..42af99090 100644
+--- a/base/gslibctx.c
++++ b/base/gslibctx.c
+@@ -743,7 +743,7 @@ gs_add_control_path_len_flags(const gs_memory_t *mem, gs_path_control_t type, co
+     /* "%pipe%" do not follow the normal rules for path definitions, so we
+        don't "reduce" them to avoid unexpected results
+      */
+-    if (len > 5 && memcmp(path, "%pipe", 5) != 0) {
++    if (path[0] == '|' || (len > 5 && memcmp(path, "%pipe", 5) == 0)) {
+         buffer = (char *)gs_alloc_bytes(core->memory, len + 1, "gs_add_control_path_len");
+         if (buffer == NULL)
+             return gs_error_VMerror;
+@@ -850,7 +850,7 @@ gs_remove_control_path_len_flags(const gs_memory_t *mem, gs_path_control_t type,
+     /* "%pipe%" do not follow the normal rules for path definitions, so we
+        don't "reduce" them to avoid unexpected results
+      */
+-    if (len > 5 && memcmp(path, "%pipe", 5) != 0) {
++    if (path[0] == '|' || (len > 5 && memcmp(path, "%pipe", 5) == 0)) {
+         buffer = (char *)gs_alloc_bytes(core->memory, len + 1, "gs_remove_control_path_len");
+         if (buffer == NULL)
+             return gs_error_VMerror;
+-- 
+2.34.1
+
diff --git a/gnu/packages/patches/ghostscript-CVE-2023-36664.patch b/gnu/packages/patches/ghostscript-CVE-2023-36664.patch
new file mode 100644
index 0000000000..e9c53c1f87
--- /dev/null
+++ b/gnu/packages/patches/ghostscript-CVE-2023-36664.patch
@@ -0,0 +1,142 @@
+From 505eab7782b429017eb434b2b95120855f2b0e3c Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Wed, 7 Jun 2023 10:23:06 +0100
+Subject: [PATCH] Bug 706761: Don't "reduce" %pipe% file names for permission
+ validation
+
+For regular file names, we try to simplfy relative paths before we use them.
+
+Because the %pipe% device can, effectively, accept command line calls, we
+shouldn't be simplifying that string, because the command line syntax can end
+up confusing the path simplifying code. That can result in permitting a pipe
+command which does not match what was originally permitted.
+
+Special case "%pipe" in the validation code so we always deal with the entire
+string.
+---
+ base/gpmisc.c   | 31 +++++++++++++++++++--------
+ base/gslibctx.c | 56 ++++++++++++++++++++++++++++++++++++-------------
+ 2 files changed, 64 insertions(+), 23 deletions(-)
+
+diff --git a/base/gpmisc.c b/base/gpmisc.c
+index 5f39ebba7..2fb87f769 100644
+--- a/base/gpmisc.c
++++ b/base/gpmisc.c
+@@ -1076,16 +1076,29 @@ gp_validate_path_len(const gs_memory_t *mem,
+              && !memcmp(path + cdirstrl, dirsepstr, dirsepstrl)) {
+           prefix_len = 0;
+     }
+-    rlen = len+1;
+-    bufferfull = (char *)gs_alloc_bytes(mem->thread_safe_memory, rlen + prefix_len, "gp_validate_path");
+-    if (bufferfull == NULL)
+-        return gs_error_VMerror;
+-
+-    buffer = bufferfull + prefix_len;
+-    if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success)
+-        return gs_error_invalidfileaccess;
+-    buffer[rlen] = 0;
+ 
++    /* "%pipe%" do not follow the normal rules for path definitions, so we
++       don't "reduce" them to avoid unexpected results
++     */
++    if (len > 5 && memcmp(path, "%pipe", 5) != 0) {
++        bufferfull = buffer = (char *)gs_alloc_bytes(mem->thread_safe_memory, len + 1, "gp_validate_path");
++        if (buffer == NULL)
++            return gs_error_VMerror;
++        memcpy(buffer, path, len);
++        buffer[len] = 0;
++        rlen = len;
++    }
++    else {
++        rlen = len+1;
++        bufferfull = (char *)gs_alloc_bytes(mem->thread_safe_memory, rlen + prefix_len, "gp_validate_path");
++        if (bufferfull == NULL)
++            return gs_error_VMerror;
++
++        buffer = bufferfull + prefix_len;
++        if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success)
++            return gs_error_invalidfileaccess;
++        buffer[rlen] = 0;
++    }
+     while (1) {
+         switch (mode[0])
+         {
+diff --git a/base/gslibctx.c b/base/gslibctx.c
+index eb566ed06..d2a1aa91d 100644
+--- a/base/gslibctx.c
++++ b/base/gslibctx.c
+@@ -740,14 +740,28 @@ gs_add_control_path_len_flags(const gs_memory_t *mem, gs_path_control_t type, co
+             return gs_error_rangecheck;
+     }
+ 
+-    rlen = len+1;
+-    buffer = (char *)gs_alloc_bytes(core->memory, rlen, "gp_validate_path");
+-    if (buffer == NULL)
+-        return gs_error_VMerror;
++    /* "%pipe%" do not follow the normal rules for path definitions, so we
++       don't "reduce" them to avoid unexpected results
++     */
++    if (len > 5 && memcmp(path, "%pipe", 5) != 0) {
++        buffer = (char *)gs_alloc_bytes(core->memory, len + 1, "gs_add_control_path_len");
++        if (buffer == NULL)
++            return gs_error_VMerror;
++        memcpy(buffer, path, len);
++        buffer[len] = 0;
++        rlen = len;
++    }
++    else {
++        rlen = len + 1;
+ 
+-    if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success)
+-        return gs_error_invalidfileaccess;
+-    buffer[rlen] = 0;
++        buffer = (char *)gs_alloc_bytes(core->memory, rlen, "gs_add_control_path_len");
++        if (buffer == NULL)
++            return gs_error_VMerror;
++
++        if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success)
++            return gs_error_invalidfileaccess;
++        buffer[rlen] = 0;
++    }
+ 
+     n = control->num;
+     for (i = 0; i < n; i++)
+@@ -833,14 +847,28 @@ gs_remove_control_path_len_flags(const gs_memory_t *mem, gs_path_control_t type,
+             return gs_error_rangecheck;
+     }
+ 
+-    rlen = len+1;
+-    buffer = (char *)gs_alloc_bytes(core->memory, rlen, "gp_validate_path");
+-    if (buffer == NULL)
+-        return gs_error_VMerror;
++    /* "%pipe%" do not follow the normal rules for path definitions, so we
++       don't "reduce" them to avoid unexpected results
++     */
++    if (len > 5 && memcmp(path, "%pipe", 5) != 0) {
++        buffer = (char *)gs_alloc_bytes(core->memory, len + 1, "gs_remove_control_path_len");
++        if (buffer == NULL)
++            return gs_error_VMerror;
++        memcpy(buffer, path, len);
++        buffer[len] = 0;
++        rlen = len;
++    }
++    else {
++        rlen = len+1;
+ 
+-    if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success)
+-        return gs_error_invalidfileaccess;
+-    buffer[rlen] = 0;
++        buffer = (char *)gs_alloc_bytes(core->memory, rlen, "gs_remove_control_path_len");
++        if (buffer == NULL)
++            return gs_error_VMerror;
++
++        if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success)
++            return gs_error_invalidfileaccess;
++        buffer[rlen] = 0;
++    }
+ 
+     n = control->num;
+     for (i = 0; i < n; i++) {
+-- 
+2.34.1
+
-- 
cgit 1.4.1


From 6d552a1426ea83d96a90b94ab660e06c8f0f1f49 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: Use aquamaniac.de/ as home page for its projects.

* gnu/packages/gnucash.scm (gwenhywfar, aqbanking)[home-page]:
Use top-level directory as done upstream.
---
 gnu/packages/gnucash.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm
index aa033c0b9a..178162a4a0 100644
--- a/gnu/packages/gnucash.scm
+++ b/gnu/packages/gnucash.scm
@@ -264,7 +264,7 @@ to be read using the GNOME Yelp program.")
      (list libgcrypt gnutls openssl gtk+))
     (native-inputs
      (list pkg-config))
-    (home-page "https://www.aquamaniac.de/sites/aqbanking/index.php")
+    (home-page "https://www.aquamaniac.de")
     (synopsis "Utility library for networking and security applications")
     (description
      "This package provides a helper library for networking and security
@@ -303,7 +303,7 @@ applications and libraries.  It is used by AqBanking.")
      (list gmp xmlsec gnutls))
     (native-inputs
      (list pkg-config gettext-minimal libltdl))
-    (home-page "https://www.aquamaniac.de/sites/aqbanking/index.php")
+    (home-page "https://www.aquamaniac.de")
     (synopsis "Interface for online banking tasks")
     (description
      "AqBanking is a modular and generic interface to online banking tasks,
-- 
cgit 1.4.1


From 24d2c2bcda0c5b4e66cac7a90fd3d59a336fa123 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: aspell-dict-nb: Correct to 0.50-2.

* gnu/packages/aspell.scm (aspell-dict-nb): Fix version number.
No hash change.
---
 gnu/packages/aspell.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm
index 83b54a2986..17ba794201 100644
--- a/gnu/packages/aspell.scm
+++ b/gnu/packages/aspell.scm
@@ -329,7 +329,7 @@ dictionaries, including personal ones.")
 
 (define-public aspell-dict-nb
   (aspell-dictionary "nb" "Norwegian Bokmål"
-                     #:version "0.50.1-2"
+                     #:version "0.50-2"
                      #:prefix "aspell-"
                      #:sha256
                      (base32
-- 
cgit 1.4.1


From 0f766e8439f31738322817f6304a6110e374c057 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: armadillo: Update to 12.4.1.

* gnu/packages/maths.scm (armadillo): Update to 12.4.1.
---
 gnu/packages/maths.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index adde13ee65..7ac66daacd 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -4492,14 +4492,14 @@ full text searching.")
 (define-public armadillo
   (package
     (name "armadillo")
-    (version "9.100.5")
+    (version "12.4.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/arma/armadillo-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1ka1vd9fcmvp12qkcm4888dkfqwnalvv00x04wy29f3nx3qwczby"))))
+                "15zkvjbdxiiazhvh0g6y0ig9pgc4rvwnzplmnkx9dffz4xfn69w1"))))
     (build-system cmake-build-system)
     (arguments `(#:tests? #f))          ; no test target
     (inputs
-- 
cgit 1.4.1


From 8a9a7ae36ed24eaa012041110d131ab7cee96023 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:00 +0200
Subject: gnu: aumix: Use Web Archive URLs.

* gnu/packages/linux.scm (aumix)[source, home-page]:
Use copies archived by the Wayback Machine.
---
 gnu/packages/linux.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 7214dcae2f..f548b7307d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3476,6 +3476,7 @@ settings.")
     (source (origin
               (method url-fetch)
               (uri (string-append
+                    "https://web.archive.org/web/20211201184543/"
                     "http://www.jpj.net/~trevor/aumix/releases/aumix-"
                     version ".tar.bz2"))
               (sha256
@@ -3486,7 +3487,8 @@ settings.")
      ;; Allow compilation with GCC 10.
      '(#:configure-flags '("CFLAGS=-O2 -g -fcommon")))
     (inputs (list ncurses))
-    (home-page "http://www.jpj.net/~trevor/aumix.html")
+    (home-page (string-append "https://web.archive.org/web/20211201184543/"
+                              "http://jpj.net/~trevor/aumix.html"))
     (synopsis "Audio mixer for X and the console")
     (description
      "Aumix adjusts an audio mixer from X, the console, a terminal,
-- 
cgit 1.4.1


From 2be1a6795fd51cb7e7ed0552114b7da1b3c13ecc Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: 4ti2: Update home page.

* gnu/packages/maths.scm (4ti2)[home-page]: Update.
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 7ac66daacd..b9b63c81c1 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -814,7 +814,7 @@ LP/MIP solver is included in the package.")
      (list (@ (gnu packages base) which))) ; for the tests
     (inputs
      (list glpk gmp))
-    (home-page "http://www.4ti2.de/")
+    (home-page "https://4ti2.github.io")
     (synopsis "Mathematical tool suite for problems on linear spaces")
     (description
      "4ti2 implements algorithms for solving algebraic, geometric and
-- 
cgit 1.4.1


From 158a218deaa5cae5e140b31d9ec1c52411b65a1a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:00 +0200
Subject: download: Remove obsolete kernel.org mirrors.

* guix/download.scm (%mirrors): Remove kernel.osuosl.org and
mirror.linux.org.au.
---
 guix/download.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/guix/download.scm b/guix/download.scm
index 8344145ee8..01ebe31897 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -128,9 +128,7 @@
        "ftp://www.lt.netfilter.org/pub/")
       (kernel.org
        "http://linux-kernel.uio.no/pub/"
-       "http://kernel.osuosl.org/pub/"
        "http://ftp.be.debian.org/pub/"
-       "http://mirror.linux.org.au/"
        "https://mirrors.edge.kernel.org/pub/"
        "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/")
       (apache             ; from http://www.apache.org/mirrors/dist.html
-- 
cgit 1.4.1


From bdd359526eb0544530d1c93143d5948931571c32 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:03 +0200
Subject: gnu: avfs: Use HTTPS home page.

* gnu/packages/file-systems.scm (avfs)[home-page]: Use HTTPS.
---
 gnu/packages/file-systems.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 0b024d6b92..7cebdf841e 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -296,7 +296,7 @@ Example file names:
 
 @code{emacs-dired-hacks} has @code{dired-avfs} module which enables seamless
 integration with @code{avfs}.")
-    (home-page "http://avf.sourceforge.net/")
+    (home-page "https://avf.sourceforge.net")
     (license license:gpl2+)))
 
 (define-public davfs2
-- 
cgit 1.4.1


From 084f2c08ede2929f9ebfdf3cc390bbc084e397e7 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 13 Jul 2023 23:02:39 +0200
Subject: doc: Fix invalid use of @deftypevar.

* doc/guix.texi (Virtualization Services): Replace invalid use of
@deftypevar with @deftypevr.
---
 doc/guix.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 8e4508b237..9af1b4417b 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -35159,9 +35159,9 @@ Its value must be a @code{virtlog-configuration}.
 @end lisp
 @end defvar
 
-@deftypevar {@code{libvirt} parameter} package libvirt
+@deftypevr {@code{libvirt} parameter} package libvirt
 Libvirt package.
-@end deftypevar
+@end deftypevr
 
 @deftypevr {@code{virtlog-configuration} parameter} integer log-level
 Logging level.  4 errors, 3 warnings, 2 information, 1 debug.
-- 
cgit 1.4.1


From ff4f5a725e2888c1443b50d97d90ad575a59c335 Mon Sep 17 00:00:00 2001
From: Philip McGrath <philip@philipmcgrath.com>
Date: Fri, 23 Jun 2023 06:32:51 -0400
Subject: gnu: racket: Update to 8.9.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/chez.scm (chez-scheme-for-racket): Update to
9.9.9-pre-release.16.
* gnu/packages/racket.scm (%racket-version): Update to 8.9.
(racket)[inputs]<deinprogramm, draw, drracket, future-visualizer, gui>
<htdp, macro-debugger, math, pict, plot, rackunit, redex, scribble>
<slideshow, snip, typed-racket, srfi, swindle, syntax-color>
<web-server>: Update checksums.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/chez.scm   |  2 +-
 gnu/packages/racket.scm | 44 ++++++++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index ab6eaba6bd..bb389c7a77 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -466,7 +466,7 @@ and 32-bit PowerPC architectures.")
   (package
     (inherit chez-scheme)
     (name "chez-scheme-for-racket")
-    (version "9.9.9-pre-release.14")
+    (version "9.9.9-pre-release.16")
     ;; The version should match `scheme-version`.
     ;; See racket/src/ChezScheme/s/cmacros.ss c. line 360.
     ;; It will always be different than the upstream version!
diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm
index 92060da283..dce7cd9587 100644
--- a/gnu/packages/racket.scm
+++ b/gnu/packages/racket.scm
@@ -190,7 +190,7 @@
 ;;
 ;; CODE:
 
-(define %racket-version "8.8") ; Remember to update chez-scheme-for-racket!
+(define %racket-version "8.9") ; Remember to update chez-scheme-for-racket!
 (define %zuo-version "1.6") ; defined in racket/src/zuo/zuo.c
 (define %racket-commit
   (string-append "v" %racket-version))
@@ -201,7 +201,7 @@
           (url "https://github.com/racket/racket")
           (commit %racket-commit)))
     (sha256
-     (base32 "0d1dknnj93r6rmz9zhgn93z937csrni5xpjam2ci41zc070p09y7"))
+     (base32 "120djvscm2x1nv46is0kzwahd22rcc8gc0ssf12jnj7w290dpmra"))
     (file-name (git-file-name "racket" %racket-version))
     (patches (search-patches "racket-chez-scheme-bin-sh.patch"
                              "racket-rktio-bin-sh.patch"
@@ -707,16 +707,16 @@ DrRacket IDE, are not included.")
        "db" (base32 "0xx0k8yw2vb9b4vk2dwjfbpixnmriqsv7kpv3fvfxbwyg42y0db5")
        '("db" "db-doc" "db-lib"))
       (simple-racket-origin
-       "deinprogramm" (base32 "0glnk8f1gi8r9y27glmz59fjib2vx8xwwil9jsds99bsvbp24g06")
+       "deinprogramm" (base32 "0iv14kig8w6kwxxmcfsxskk6x7a4kgzppzgyznzgy1mk6p5rxbjg")
        '("deinprogramm" "deinprogramm-signature"))
       (simple-racket-origin
        "distributed-places" (base32 "1dajpkj9balqcpv6cdk9hwjz592h1vq8rrx5vncariiac4vbdpa0")
        '("distributed-places" "distributed-places-doc" "distributed-places-lib"))
       (simple-racket-origin
-       "draw" (base32 "0p69yk1c1jad5xmr8xxbxvrmq5yb3cr5zlj1kydx3nd0ij3g5dir")
+       "draw" (base32 "0vf40hp6h14zgs0gx40jzdzxm4ai1vxwpmg65y00lwmdxc97b2ji")
        '("draw" "draw-doc" "draw-lib"))
       (simple-racket-origin
-       "drracket" (base32 "19x5j1zj8zyg3kfhjshwqayiddbv7kqlsjd5zw0cpv7a3adkjr65")
+       "drracket" (base32 "1b2fammrkb01kglf0n1rzdq2ngay4adnjh3gdmnza7mxz09y35m2")
        '("drracket"
          "drracket-plugin-lib"
          "drracket-tool"
@@ -742,7 +742,7 @@ DrRacket IDE, are not included.")
        "frtime" (base32 "0ydz2yn8vvv6z7brwlswcyx0f31a6y6d443i89rysfvd2xkhpfd5")
        '(("frtime" ".")))
       (simple-racket-origin
-       "future-visualizer" (base32 "1758qq769m0r14xf64sl2ix2l9z340kvapar0j7s5kdg42lmvnhm")
+       "future-visualizer" (base32 "0yzfs4ls5h9224wnssm21mm6dig40r9k6zh66sbi1vrlwyswpym0")
        '("future-visualizer"
          "future-visualizer-pict"
          "future-visualizer-typed"))
@@ -750,13 +750,13 @@ DrRacket IDE, are not included.")
        "games" (base32 "0kpn3izlx1ccd0pj0dnvmnrhny51b85xy418a7psj70lz8j8415d")
        '(("games" ".")))
       (simple-racket-origin
-       "gui" (base32 "1dddr8c5v6vp42jmnrrfsm1v1hgha0q0wvvpdkl7x0ri23plgcrm")
+       "gui" (base32 "01ydlr10gkdm66x1gx3im5lwiap0ssiph8nmaisv0xrnrirbnp51")
        '("gui" "gui-doc" "gui-lib" "tex-table"))
       (simple-racket-origin
        "gui-pkg-manager" (base32 "1ji9448d723nklqvycwdswj0ni28sabrncag14f9mx47did5myb5")
        '("gui-pkg-manager-lib"))
       (simple-racket-origin
-       "htdp" (base32 "1ba4pj7v8mi8kvwdn7iw4jc435hm2d04i7gqgys79b47i6qyyf6h")
+       "htdp" (base32 "1qnnnh9d9kjzlaasql7gi0h8z893bzb9kffay00mwg2j0bfzsf2s")
        '("htdp" "htdp-doc" "htdp-lib"))
       (simple-racket-origin
        "html" (base32 "18n1jnjgzfknc8nv8dppi85nb8q08gqdwkg6hfjk08x0p00anx2x")
@@ -771,7 +771,7 @@ DrRacket IDE, are not included.")
        "lazy" (base32 "176ylzgbdsbmqknpihaz519afq71pyjkv1h87j5v8jfbpbddyfsf")
        '(("lazy" ".")))
       (simple-racket-origin
-       "macro-debugger" (base32 "14hyrwbkffr61fk44l02xb47bhv5zccw0ymaa9kxld86hvyqhqbm")
+       "macro-debugger" (base32 "133b74pxavbafcsmp34kgvwmx1l6xx4bykzvgwwjg3kg2fa5bg1g")
        '("macro-debugger" "macro-debugger-text-lib"))
       (simple-racket-origin
        "main-distribution" (base32 "0m2n9s32s8a4a2gn4ywrm9l8jycdm5ayi5w9kh5wchhrrw7qzq7y")
@@ -780,7 +780,7 @@ DrRacket IDE, are not included.")
        "make" (base32 "10852fj30bz5r46c3d99s37fkgy5yh44gb01j29sf3kxnhi0g2sa")
        '(("make" ".")))
       (simple-racket-origin
-       "math" (base32 "072hkk9lih1265pyjvafd4pill9x5wjs41kmm6cgwzwy5hqv0qyw")
+       "math" (base32 "1qz4k6iwbrf9l7dhivrznghrpbqhxx14yczkgqpkz6yqawi642x9")
        '("math" "math-doc" "math-lib"))
       (simple-racket-origin
        "mysterx" (base32 "11p9jzrafw0hizhl0cs4sxx7rv281185q8hryic2rpk0kzjdyr48")
@@ -824,7 +824,7 @@ DrRacket IDE, are not included.")
        "pconvert" (base32 "00czi0p399mmyrvxyrs5kniizpkqfxyz2ncxqi2jy79a7wk79pb1")
        '("pconvert-lib"))
       (simple-racket-origin
-       "pict" (base32 "0hiwld84kd5s07rppswv8hd83sx8vk78xbhkbbwrnc51cfqwvvfj")
+       "pict" (base32 "0j6m95pq523pz526d7my8b3cg8a3jssag2mafxcq531prlnzq9sq")
        '("pict" "pict-doc" "pict-lib"))
       (simple-racket-origin
        "pict-snip" (base32 "081nwiy4a0n4f7xws16hqbhf0j3kz5alizndi3nnyr3chm4kng6x")
@@ -839,7 +839,7 @@ DrRacket IDE, are not included.")
        "planet" (base32 "0r2yqrzrmdjjyr14k6hhlzc5kzrcx3583m1s02mhrcmpfw0s85w9")
        '("planet" "planet-doc" "planet-lib"))
       (simple-racket-origin
-       "plot" (base32 "1129k78vyqg2cbc87r9ak95zpa1ghh26fmz3wr8gm556j5j0k6y5")
+       "plot" (base32 "13i6cwkscb4j6zmdc122iidmykwpxfk8xjmq09c6gv77slfynivl")
        '("plot" "plot-compat" "plot-doc" "plot-gui-lib" "plot-lib"))
       (simple-racket-origin
        "preprocessor" (base32 "1p5aid58ifnjy4xl0ysh85cq39k25661v975jrpk182z3k5621mg")
@@ -878,7 +878,7 @@ DrRacket IDE, are not included.")
        "racklog" (base32 "0fbq0fpfb3l6h7h772dvkmlzlk2dnq5f8296xx1qxhhwypibqzr9")
        '(("racklog" ".")))
       (simple-racket-origin
-       "rackunit" (base32 "1gpz9sgnm8hrc0cb3rii0wzbcwp9mgy5k1amnxidy7gyzl7prn81")
+       "rackunit" (base32 "03v1yvqgk3f65caqiwnadq00sjbg813ic949hys29f4c8mxz6gic")
        '("rackunit"
          "rackunit-doc"
          "rackunit-gui"
@@ -894,7 +894,7 @@ DrRacket IDE, are not included.")
        "realm" (base32 "0rlvwyd6rpyl0zda4a5p8dp346fvqzc8555dgfnrhliymkxb6x4g")
        '(("realm" ".")))
       (simple-racket-origin
-       "redex" (base32 "1dlivxllz1y7lsh402i6bmljbwbbphcvhbgf8jsnhip2vhck5rp4")
+       "redex" (base32 "16kyi4nxxi4a05gjarb9dayysg032vsad5mmwn1j6d6yxxhbw9jr")
        '("redex"
          "redex-benchmark"
          "redex-doc"
@@ -909,7 +909,7 @@ DrRacket IDE, are not included.")
        "scheme-lib" (base32 "0pcf0y8rp4qyjhaz5ww5sr5diq0wpcdfrrnask7zapyklzx1jx8x")
        '(("scheme-lib" ".")))
       (simple-racket-origin
-       "scribble" (base32 "1m3s7nz4qk71hnl2qhnm4fbk4mfz1z53ig21czhinbxpall8l4d1")
+       "scribble" (base32 "06q5jhfblps47ly9fv5pkcz3nk8akfgad9ank32dh1svagq9plzf")
        '("scribble"
          "scribble-doc"
          "scribble-html-lib"
@@ -935,13 +935,13 @@ DrRacket IDE, are not included.")
        "slatex" (base32 "0pkm2isbbdk63slrbsxcql7rr0wdrw5kapw1xq4ps5k8dhlzv8x0")
        '(("slatex" ".")))
       (simple-racket-origin
-       "slideshow" (base32 "0s6w4iq7m263jwx01c5czkk1a2950hdpxn5yirxvnr26qpjpfyzr")
+       "slideshow" (base32 "0phq0mvy0dh8hhbhxhmsini286dyggy6cgxq7mcwj4n2sbw38sas")
        '("slideshow" "slideshow-doc" "slideshow-exe" "slideshow-lib" "slideshow-plugin"))
       (simple-racket-origin
-       "snip" (base32 "19n2i1m2nysrbv38jxk32abymdbhcxdcrrjsg4ppfbng8niygc8x")
+       "snip" (base32 "1j7sk364w2cggr4i5my1p2ibyvslrnj45xwxhihx6zypkbk59c3m")
        '("snip" "snip-lib"))
       (simple-racket-origin
-       "typed-racket" (base32 "1hhc0nss68814xsxhl5rnw4smnm06573j6ka0wp77almqg5nzhpv")
+       "typed-racket" (base32 "0iz62xy2grkwyi4krz0chi3fswg74zd5s5jpdqyhxhdqq3gcscp0")
        '("source-syntax"
          "typed-racket"
          "typed-racket-compatibility"
@@ -949,16 +949,16 @@ DrRacket IDE, are not included.")
          "typed-racket-lib"
          "typed-racket-more"))
       (simple-racket-origin
-       "srfi" (base32 "13xvfzr5546m3a4kksyawzcl93nrklasr1slfa5ar3p77h962la4")
+       "srfi" (base32 "0rvx49ni1v8ikbx1a6qg97pprpkxmy7cgl918f52hq7jlx91b71x")
        '("srfi" "srfi-doc" "srfi-lib" "srfi-lite-lib"))
       (simple-racket-origin
        "string-constants" (base32 "1lxab9323xmxqs4mxbgr504xgcgsf9dvx2xsb4p92fjzsif0d64y")
        '("string-constants" "string-constants-doc" "string-constants-lib"))
       (simple-racket-origin
-       "swindle" (base32 "03n9ymjhrw45h7hxkw4nq8nidnvs9mfzb4228s2cjfaqbgqxvsyb")
+       "swindle" (base32 "1q8vdxpzczzwdw2mys2caab45yvadmqkixsr29k8pl03n8dsg8j9")
        '(("swindle" ".")))
       (simple-racket-origin
-       "syntax-color" (base32 "1xxbvcqca99px01cnh40r69w1ica8zl97yyryb6xz30j6nblsmb6")
+       "syntax-color" (base32 "03fjmpww2958sryicrrcrpqwq6ibslfxd86ckl1mgafm3kr02qhp")
        '("syntax-color" "syntax-color-doc" "syntax-color-lib"))
       (simple-racket-origin
        "trace" (base32 "070ihla5j796hdarn5wxdwn4xj0xnkm50shgh49jy994mribvhia")
@@ -967,7 +967,7 @@ DrRacket IDE, are not included.")
        "unix-socket" (base32 "02dfwas5ynbpyz74w9kwb4wgb37y5wys7svrlmir8k0n9ph9vq0y")
        '("unix-socket" "unix-socket-doc" "unix-socket-lib"))
       (simple-racket-origin
-       "web-server" (base32 "104lnzjykkd6f3gxpv7p14l94if6zac33nmb4sj5jxmd6r3fwcpf")
+       "web-server" (base32 "0xfg0n0rg1g5rbqq4mm0qjgqkkrgm3ilzkffga2bjx253jrrrcai")
        '("web-server" "web-server-doc" "web-server-lib"))
       (simple-racket-origin
        "wxme" (base32 "1qp5gr9gqsakiq3alw6m4yyv5vw4i3hp4y4nhq8vl2nkjmirvn0b")
-- 
cgit 1.4.1


From a33a335c89ce3766e2bd662bffc897bd0da2b9cd Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 14 Jul 2023 16:15:38 +0200
Subject: doc: Mention gexps in the "Scheme Crash Course".

* doc/guix-cookbook.texi (A Scheme Crash Course): Add note on gexps.
---
 doc/guix-cookbook.texi | 47 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi
index b3c3bac971..2e58c6c795 100644
--- a/doc/guix-cookbook.texi
+++ b/doc/guix-cookbook.texi
@@ -234,10 +234,11 @@ A list structure can be created with the @code{list} procedure:
 @end lisp
 
 @item
-The @dfn{quote} disables evaluation of a parenthesized expression: the
-first term is not called over the other terms (@pxref{Expression Syntax,
-quote,, guile, GNU Guile Reference Manual}).  Thus it effectively
-returns a list of terms.
+@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
+the other terms (@pxref{Expression Syntax, quote,, guile, GNU Guile
+Reference Manual}).  Thus it effectively returns a list of terms.
 
 @lisp
 '(display (string-append "Hello " "Guix" "\n"))
@@ -248,9 +249,10 @@ returns a list of terms.
 @end lisp
 
 @item
-The @dfn{quasiquote} disables evaluation of a parenthesized expression
-until @dfn{unquote} (a comma) re-enables it.  Thus it provides us with
-fine-grained control over what is evaluated and what is not.
+The @code{quasiquote} (@code{`}, a backquote) disables evaluation of a
+parenthesized expression until @code{unquote} (@code{,}, a comma)
+re-enables it.  Thus it provides us with fine-grained control over what
+is evaluated and what is not.
 
 @lisp
 `(2 a 5 7 (2 ,a 5 ,(+ a 4)))
@@ -260,6 +262,37 @@ fine-grained control over what is evaluated and what is not.
 Note that the above result is a list of mixed elements: numbers, symbols (here
 @code{a}) and the last element is a list itself.
 
+@item
+@cindex G-expressions, syntax
+@cindex gexps, syntax
+@findex #~
+@findex #$
+@findex gexp
+@findex ungexp
+Guix defines a variant of S-expressions on steroids called
+@dfn{G-expressions} or ``gexps'', which come with a variant of
+@code{quasiquote} and @code{unquote}: @code{#~} (or @code{gexp}) and
+@code{#$} (or @code{ungexp}).  They let you @emph{stage code for later
+execution}.
+
+For example, you'll encounter gexps in some package definitions where
+they provide code to be executed during the package build process.  They
+look like this:
+
+@lisp
+;; Below is a G-expression representing staged code.
+#~(begin
+    ;; Invoke 'ls' from the package defined by the 'coreutils'
+    ;; variable.
+    (system* #$(file-append coreutils "/bin/ls") "-l")
+
+    ;; Create this package's output directory.
+    (mkdir #$output))
+@end lisp
+
+@xref{G-Expressions,,, guix, GNU Guix Reference Manual}, for more on
+gexps.
+
 @item
 Multiple variables can be named locally with @code{let} (@pxref{Local
 Bindings,,, guile, GNU Guile Reference Manual}):
-- 
cgit 1.4.1


From 49b0a5ee5f908d8efa8e792f8635f723fd1d26ed Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Fri, 14 Jul 2023 10:53:19 -0400
Subject: gnu: Add freetype-with-brotli.

* gnu/packages/fontutils.scm (freetype-with-brotli): New variable.
---
 gnu/packages/fontutils.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 1b4e0064f4..e5170b5ae3 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -16,6 +16,7 @@
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
 ;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -124,6 +125,16 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
     (license license:freetype)          ; some files have other licenses
     (home-page "https://freetype.org/")))
 
+;; TODO: Make this change directly in freetype in the next large rebuild cycle
+;; and remove this package.
+(define-public freetype-with-brotli
+  (package
+    (inherit freetype)
+    (name "freetype-with-brotli")
+    (propagated-inputs
+     (modify-inputs (package-propagated-inputs freetype)
+       (prepend brotli)))))
+
 (define-public opentype-sanitizer
   (package
     (name "opentype-sanitizer")
-- 
cgit 1.4.1


From 09e73683a2c303016fa57bf5d84a8e997d4c0a30 Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Fri, 14 Jul 2023 11:08:31 -0400
Subject: gnu: godot: Update to 4.1.  Rename godot@3 to godot-lts.

* gnu/packages/game-development.scm (godot): Update to 4.1.
[source]: Update snippet: remove embree and enet; add amd-fsr, astcenc,
basis_universal, brotli, linuxbsd_headers, etcpak, meshoptimizer, msdfgen,
noise, openxr, rvo2, spirv-reflect, thorvg, volk, vulkan.
[arguments]: Remove #:scons.  Update #:scons-flags to unbundle more
libraries.
[phases]: Remove 'build-headless phase (headless is no longer has a separate
build).  Add 'fix-dl-open-paths and 'unbundle-xkbcommon phases.  In 'install
phase, remove headless output.  Update 'wrap phase to remove eudev.
[outputs]: Remove headless.
[inputs]: Add dbus, embree, enet, fontconfig, glslang, libpng, harfbuzz,
icu4c, libxkbcommon, openxr, speech-dispatcher, vulkan-loader, zlib.  Remove
bullet.  Rename freetype to freetype-with-brotli.
(godot-lts): New variable.  godot@3 is the LTS release.
* gnu/packages/games.scm (superstarfighter)[native-inputs]: Use it.
[inputs]: Use it.
---
 gnu/packages/game-development.scm | 255 +++++++++++++++++++++++++++++++++++++-
 gnu/packages/games.scm            |   4 +-
 2 files changed, 256 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index eebe8ecbf4..f97c126441 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -28,6 +28,7 @@
 ;;; Copyright © 2022 Felix Gruber <felgru@posteo.net>
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
 ;;; Copyright © 2022 dan <i@dan.games>
+;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -54,6 +55,7 @@
   #:use-module (guix git-download)
   #:use-module (guix svn-download)
   #:use-module (guix utils)
+  #:use-module (guix build utils)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
@@ -86,6 +88,7 @@
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
@@ -95,6 +98,7 @@
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages music)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages networking)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
@@ -105,12 +109,14 @@
   #:use-module (gnu packages readline)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages sdl)
+  #:use-module (gnu packages speech)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages stb)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages video)
+  #:use-module (gnu packages vulkan)
   #:use-module (gnu packages web)
   #:use-module (gnu packages wxwidgets)
   #:use-module (gnu packages xdisorg)
@@ -1812,7 +1818,7 @@ games.")
     (home-page "https://openmw.org")
     (license license:gpl3)))
 
-(define-public godot
+(define-public godot-lts
   (package
     (name "godot")
     (version "3.4.2")
@@ -1982,6 +1988,253 @@ provide high-quality 3D rendering, it contains an animation editor, and can be
 scripted in a Python-like language.")
     (license license:expat)))
 
+(define-public godot
+  (package
+    (name "godot")
+    (version "4.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/godotengine/godot")
+                    (commit (string-append version "-stable"))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0rc34w4nb1qwmxk7ijcm689kk4gdxrmgzbj4qqz8gkqhysn8mnmz"))
+              (modules '((guix build utils)
+                         (ice-9 ftw)
+                         (srfi srfi-1)))
+              (snippet
+               '(begin
+                  ;; Keep only those bundled files we have not (yet) replaced
+                  ;; with Guix versions. Note that some of these may be
+                  ;; modified; see "thirdparty/README.md".
+                  (with-directory-excursion "thirdparty"
+                    (let* ((preserved-files
+                            '("README.md"
+                              "amd-fsr"
+                              "assimp"
+                              "astcenc"
+                              "basis_universal"
+                              ;; TODO: Can unbundle once
+                              ;; <https://github.com/godotengine/godot/pull/79101>
+                              ;; is merged
+                              "brotli"
+                              ;; Godot needs ca-certificates.crt, but that is
+                              ;; not available in build environment
+                              "certs"
+                              "cvtt"
+                              "linuxbsd_headers"
+                              "etc2comp"
+                              "etcpak"
+                              "fonts"
+                              "glad"
+                              "jpeg-compressor"
+                              "libsimplewebm"
+                              "meshoptimizer"
+                              "minimp3"
+                              "miniupnpc"
+                              "minizip"
+                              "misc"
+                              "msdfgen"
+                              "nanosvg"
+                              "noise"
+                              "oidn"
+                              "openxr"
+                              "pvrtccompressor"
+                              "recastnavigation"
+                              "rvo2"
+                              "spirv-reflect"
+                              "squish"
+                              "stb_rect_pack"
+                              "thorvg"
+                              "tinyexr"
+                              "vhacd"
+                              "volk"
+                              "vulkan"
+                              "xatlas")))
+                      (for-each delete-file-recursively
+                                (lset-difference string=?
+                                                 (scandir ".")
+                                                 (cons* "." ".." preserved-files)))))))))
+    (build-system scons-build-system)
+    (arguments
+     (list
+      #:scons-flags #~`("platform=linuxbsd" "target=editor" "production=yes"
+                        ;; XXX: There may be advantages to enabling volk,
+                        ;; requiring unbundling and patching to use our input.
+                        "use_volk=no"
+                        ;; Avoid using many of the bundled libs.
+                        ;; Note: These options can be found in the SConstruct file.
+                        "builtin_embree=no"
+                        "builtin_enet=no"
+                        "builtin_freetype=no"
+                        "builtin_glslang=no"
+                        "builtin_graphite=no"
+                        "builtin_harfbuzz=no"
+                        "builtin_icu4c=no"
+                        "builtin_libogg=no"
+                        "builtin_libpng=no"
+                        "builtin_libtheora=no"
+                        "builtin_libvorbis=no"
+                        "builtin_libwebp=no"
+                        "builtin_mbedtls=no"
+                        "builtin_pcre2=no"
+                        "builtin_pcre2_with_jit=no"
+                        "builtin_wslay=no"
+                        "builtin_zlib=no"
+                        "builtin_zstd=no")
+      #:tests? #f                      ; There are no tests
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'scons-use-env
+            (lambda _
+              ;; Scons does not use the environment variables by default,
+              ;; but this substitution makes it do so.
+              (substitute* "SConstruct"
+                (("env_base = Environment\\(tools=custom_tools\\)")
+                 (string-append
+                  "env_base = Environment(tools=custom_tools)\n"
+                  "env_base = Environment(ENV=os.environ)")))))
+          (add-after 'scons-use-env 'fix-dlopen-paths
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((files '("drivers/alsa/asound-so_wrap.c"
+                             "drivers/pulseaudio/pulse-so_wrap.c"
+                             "platform/linuxbsd/dbus-so_wrap.c"
+                             "platform/linuxbsd/fontconfig-so_wrap.c"
+                             "platform/linuxbsd/libudev-so_wrap.c"
+                             "platform/linuxbsd/speechd-so_wrap.c"
+                             "platform/linuxbsd/x11/display_server_x11.cpp"
+                             "platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.c"
+                             "platform/linuxbsd/x11/dynwrappers/xext-so_wrap.c"
+                             "platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.c"
+                             "platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.c"
+                             "platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.c"
+                             "platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.c"
+                             "platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.c"
+                             "platform/linuxbsd/xkbcommon-so_wrap.c"
+                             "thirdparty/volk/volk.c"
+                             "thirdparty/volk/volk.c"))
+                    (libs '("libasound.so.2"
+                            "libpulse.so.0"
+                            "libdbus-1.so.3"
+                            "libfontconfig.so.1"
+                            "libudev.so.1"
+                            "libspeechd.so.2"
+                            "libXrandr.so.2"
+                            "libXcursor.so.1"
+                            "libXext.so.6"
+                            "libXinerama.so.1"
+                            "libXi.so.6"
+                            "libX11.so.6"
+                            "libXrandr.so.2"
+                            "libXrender.so.1"
+                            "libxkbcommon.so.0"
+                            "libvulkan.so.1"
+                            "libvulkan.so")))
+                (for-each (lambda (file lib)
+                            (substitute* file
+                              (((string-append "dlopen\\(\"" lib "\""))
+                               (string-append "dlopen(\""
+                                              (search-input-file
+                                               inputs (string-append "lib/" lib))
+                                              "\""))))
+                          files libs))
+              (substitute* "thirdparty/glad/gl.c"
+                (("libGL.so") ; for both .so and .so.1
+                 (string-append (search-input-file inputs "lib/libGL.so"))))
+              (substitute* "thirdparty/glad/glx.c"
+                (("libGL.so") ; for both .so and .so.1
+                 (string-append (search-input-file inputs "lib/libGL.so"))))))
+          (add-after 'fix-dlopen-paths 'unbundle-xkbcommon
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "platform/linuxbsd/xkbcommon-so_wrap.c"
+                (("./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon.h")
+                 (string-append
+                  (search-input-file inputs "include/xkbcommon/xkbcommon.h")))
+                (("./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon-compose.h")
+                 (string-append
+                  (search-input-file inputs "include/xkbcommon/xkbcommon-compose.h")))
+                (("./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon-keysyms.h")
+                 (string-append
+                  (search-input-file inputs "include/xkbcommon/xkbcommon-keysyms.h"))))))
+          (replace 'install
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((zenity (search-input-file inputs "bin/zenity")))
+                ;; Strip build info from filenames.
+                (with-directory-excursion "bin"
+                  (for-each
+                   (lambda (file)
+                     (let ((dest (car (string-split (basename file) #\.))))
+                       (rename-file file dest)))
+                   (find-files "." "godot.*\\.linuxbsd\\.editor.*"))
+                  (install-file "godot" (string-append #$output "/bin")))
+                ;; Tell the editor where to find zenity for OS.alert().
+                ;; TODO: This could be changed in
+                ;; platform/linuxbsd/os_linuxbsd.cpp directly, along with the
+                ;; other alert programs.
+                (wrap-program (string-append #$output "/bin/godot")
+                  `("PATH" ":" prefix (,(string-append zenity "/bin")))))))
+          (add-after 'install 'install-godot-desktop
+            (lambda _
+              (let ((applications (string-append #$output "/share/applications"))
+                     (icons (string-append #$output "/share/icons/hicolor")))
+                (mkdir-p applications)
+                (copy-file "misc/dist/linux/org.godotengine.Godot.desktop"
+                           (string-append applications "/godot.desktop"))
+                (for-each (lambda (icon dest)
+                            (mkdir-p (dirname dest))
+                            (copy-file icon dest))
+                          '("icon.png" "icon.svg")
+                           `(,(string-append icons "/256x256/apps/godot.png")
+                             ,(string-append icons "/scalable/apps/godot.svg")))))))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list alsa-lib
+           dbus
+           embree
+           enet
+           eudev
+           fontconfig
+           freetype-with-brotli
+           glew
+           glslang
+           glu
+           libpng
+           harfbuzz
+           icu4c
+           libtheora
+           libvorbis
+           libvpx
+           libwebp
+           libx11
+           libxcursor
+           libxi
+           libxinerama
+           libxkbcommon
+           libxrandr
+           mbedtls-apache
+           mesa
+           openxr
+           opusfile
+           pcre2
+           pulseaudio
+           speech-dispatcher
+           vulkan-loader
+           wslay
+           zenity
+           zlib
+           `(,zstd "lib")))
+    (home-page "https://godotengine.org/")
+    (synopsis "Advanced 2D and 3D game engine")
+    (description
+     "Godot is an advanced multi-platform game engine written in C++.  If
+features design tools such as a visual editor, can import 3D models and
+provide high-quality 3D rendering, it contains an animation editor, and can be
+scripted in a Python-like language.")
+    (license license:expat)))
+
 (define-public entt
   (package
     (name "entt")
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index fdd3a0e21e..f0d29f2367 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2826,9 +2826,9 @@ runnable=true
                 #:categories '("Game" "ArcadeGame")))
              #t)))))
     (native-inputs
-     `(("godot-headless" ,godot "headless")))
+     `(("godot-headless" ,godot-lts "headless")))
     (inputs
-     (list godot))
+     (list godot-lts))
     (home-page "https://notapixel.itch.io/superstarfighter")
     (synopsis "Fast-paced local multiplayer arcade game")
     (description "In SuperStarfighter, up to four local players compete in a
-- 
cgit 1.4.1


From 221806905b68f9b52b90bd5c80722d4a5ab3f353 Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Fri, 14 Jul 2023 12:13:34 -0400
Subject: gnu: python-pyscard: Update to 2.0.7.

* gnu/packages/security-token.scm (python-pyscard): Update to 2.0.7.
[arguments]{phases}: Use search-input-directory.  Remove trailing #t.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
---
 gnu/packages/security-token.scm | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 76e220ad7c..cb72468b3b 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2023 Jake Leporte <jakeleporte@outlook.com>
 ;;; Copyright © 2023 Timotej Lazar <timotej.lazar@araneo.si>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2023 Pierre Langlois <pierre.langlois@gmx.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -462,7 +463,7 @@ retrieve a YubiKey's serial number, and so forth.")
 (define-public python-pyscard
   (package
     (name "python-pyscard")
-    (version "1.9.9")
+    (version "2.0.7")
     (source (origin
               (method url-fetch)
               ;; The maintainer publishes releases on various sites, but
@@ -472,7 +473,7 @@ retrieve a YubiKey's serial number, and so forth.")
                     version "/pyscard-" version ".tar.gz"))
               (sha256
                (base32
-                "082cjkbxadaz2jb4rbhr0mkrirzlqyqhcf3r823qb0q1k50ybgg6"))))
+                "1gy1hmzrhfa7bqs132v89pchm9q3rpnqf3a6225vwpx7bx959017"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -480,24 +481,21 @@ retrieve a YubiKey's serial number, and so forth.")
          ;; Tell pyscard where to find the PCSC include directory.
          (add-after 'unpack 'patch-platform-include-dirs
            (lambda* (#:key inputs #:allow-other-keys)
-             (let ((pcsc-include-dir (string-append
-                                      (assoc-ref inputs "pcsc-lite")
-                                      "/include/PCSC")))
+             (let ((pcsc-include-dir (search-input-directory
+                                      inputs "/include/PCSC")))
                (substitute* "setup.py"
                  (("platform_include_dirs = \\[.*?\\]")
                   (string-append
-                   "platform_include_dirs = ['" pcsc-include-dir "']")))
-               #t)))
+                   "platform_include_dirs = ['" pcsc-include-dir "']"))))))
          ;; pyscard wants to dlopen libpcsclite, so tell it where it is.
          (add-after 'unpack 'patch-dlopen
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "smartcard/scard/winscarddll.c"
                (("lib = \"libpcsclite\\.so\\.1\";")
-                (simple-format #f
-                               "lib = \"~a\";"
-                               (search-input-file inputs
-                                                  "/lib/libpcsclite.so.1"))))
-             #t)))))
+                (simple-format
+                 #f
+                 "lib = \"~a\";"
+                 (search-input-file inputs "/lib/libpcsclite.so.1")))))))))
     (inputs
      (list pcsc-lite))
     (native-inputs
-- 
cgit 1.4.1


From 66f0304e1de40bdc39ba2abc515e2cf8433c8f93 Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Fri, 14 Jul 2023 12:13:53 -0400
Subject: gnu: python-fido2: Update to 1.1.1.

* gnu/packages/security-tokens.scm (python-fido2): Update to 1.1.1.
[build-system]: Switch to pyproject-build-system.
[arguments]: Enable tests.  Use gexps in phases.
[propagated-inputs]: Remove python-six.  Add python-pyscard.
[native-inputs]: Remove python-mock and python-pyfakefs.  Add
python-poetry-core and python-pytest.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
---
 gnu/packages/security-token.scm | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index cb72468b3b..3a250d2b1d 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -49,6 +49,7 @@
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system glib-or-gtk)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
@@ -81,6 +82,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages swig)
@@ -682,7 +684,7 @@ your existing infrastructure.")
 (define-public python-fido2
   (package
     (name "python-fido2")
-    (version "0.9.3")
+    (version "1.1.1")
     (source (origin
               (method url-fetch)
               (uri
@@ -691,31 +693,30 @@ your existing infrastructure.")
                 version "/fido2-" version ".tar.gz"))
               (sha256
                (base32
-                "1v366h449f8q74jkmy1291ffj2345nm7cdsipgqvgz4w22k8jpml"))
+                "1hwz0xagkmy6hhcyfl66dxf2vfa69lqqqjrv70vw7harik59bi2x"))
               (snippet
                ;; Remove bundled dependency.
                '(delete-file "fido2/public_suffix_list.dat"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(;; This attempts to access
-       ;; /System/Library/Frameworks/IOKit.framework/IOKit
-       ;; The recommendation is to use tox for testing.
-       #:tests? #false
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'install-public-suffix-list
-           (lambda* (#:key inputs #:allow-other-keys)
-             (copy-file
-              (search-input-file inputs
-                                 (string-append
-                                  "/share/public-suffix-list-"
-                                  ,(package-version public-suffix-list)
-                                  "/public_suffix_list.dat"))
-              "fido2/public_suffix_list.dat"))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'install-public-suffix-list
+            (lambda* (#:key inputs #:allow-other-keys)
+              (copy-file
+               (search-input-file inputs
+                                  (string-append
+                                   "/share/public-suffix-list-"
+                                   #$(package-version public-suffix-list)
+                                   "/public_suffix_list.dat"))
+               "fido2/public_suffix_list.dat"))))))
     (propagated-inputs
-     (list python-cryptography python-six))
+     (list python-cryptography python-pyscard))
     (native-inputs
-     (list python-mock python-pyfakefs public-suffix-list))
+     (list python-poetry-core
+           python-pytest
+           public-suffix-list))
     (home-page "https://github.com/Yubico/python-fido2")
     (synopsis "Python library for communicating with FIDO devices over USB")
     (description
-- 
cgit 1.4.1


From 51de28452a9ef2e1fe7393ee49daeb87866541ba Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Fri, 14 Jul 2023 12:14:08 -0400
Subject: gnu: Add python-makefun.

* gnu/packages/python-xyz.scm (python-makefun): New variable.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
---
 gnu/packages/python-xyz.scm | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 069d60fdda..8cdb3a08bc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -61,7 +61,7 @@
 ;;; Copyright © 2019, 2023 Jack Hill <jackhill@jackhill.us>
 ;;; Copyright © 2019-2023, Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
-;;; Copyright © 2019, 2020, 2021, 2022 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2019, 2020, 2021, 2022, 2023 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com>
 ;;; Copyright © 2019, 2020, 2021 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
@@ -5272,6 +5272,26 @@ recognition library with full Unicode support.  It has features like:
 @end itemize")
     (license license:expat)))
 
+(define-public python-makefun
+  (package
+    (name "python-makefun")
+    (version "1.15.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "makefun" version))
+              (sha256
+               (base32
+                "19a8dga8rnmjn5gy1cy1wdi28swbkdkypwbqikbxil6ynqcg3c20"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-pytest python-setuptools-scm))
+    (home-page "https://github.com/smarie/python-makefun")
+    (synopsis "Library to dynamically create python functions")
+    (description "@code{makefun} helps create functions dynamically with a
+given signature.  It was largely inspired by @code{python-decorator} and
+@code{functools}.")
+    (license license:bsd-3)))
+
 (define-public python-markdown-it-py
   (package
     (name "python-markdown-it-py")
-- 
cgit 1.4.1


From 917a299831361f253ea664f009176b4bbe06900a Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Fri, 14 Jul 2023 12:14:27 -0400
Subject: gnu: python-yubikey-manager: Update to 5.1.1.

* gnu/packages/security-tokens.scm (python-yubikey-manager): Update to
5.1.1.
[source]: Update url.
[build-system]: Switch to pyproject-build-system.
[arguments]: Delete.
[propagated-inputs]: Remove python-six.  Add python-keyring.  Reorder alphabetically.
[native-inputs]: Remove python-mock.  Add python-makefun, python-poetry-code and
python-pytest.  Reorder alphabetically.

Co-authored-by: John Kehayias <john.kehayias@protonmail.com>
---
 gnu/packages/security-token.scm | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 3a250d2b1d..2513f6dce0 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -14,7 +14,7 @@
 ;;; Copyright © 2021 Sergey Trofimov <sarg@sarg.org.ru>
 ;;; Copyright © 2021 Dhruvin Gandhi <contact@dhruvin.dev>
 ;;; Copyright © 2021 Ahmad Jarara <git@ajarara.io>
-;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2023 Jake Leporte <jakeleporte@outlook.com>
@@ -738,33 +738,31 @@ implementing a Relying Party.")
 (define-public python-yubikey-manager
   (package
     (name "python-yubikey-manager")
-    (version "4.0.7")
+    (version "5.1.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "https://developers.yubico.com/yubikey-manager/Releases"
-                    "/yubikey-manager-" version ".tar.gz"))
+                    "/yubikey_manager-" version ".tar.gz"))
               (sha256
                (base32
-                "0kzwal7i4kyywm4f5zh8b823mh0ih2nsh5c0c4dfn4vw3j5dnwlr"))))
-    (build-system python-build-system)
-    (arguments
-     '(;; This attempts to access
-       ;; /System/Library/Frameworks/IOKit.framework/IOKit
-       ;; The recommendation is to use tox for testing.
-       #:tests? #false))
+                "1kma08rxvpzn2gf8b9vxyyb2pvrakm7hhpdmbnb54nwbdnbxp1v4"))))
+    (build-system pyproject-build-system)
     (propagated-inputs
-     (list python-six
-           python-pyscard
-           python-pyusb
-           python-click
+     (list python-click
            python-cryptography
+           python-fido2
+           python-keyring
            python-pyopenssl
-           python-fido2))
+           python-pyscard
+           python-pyusb))
     (inputs
      (list pcsc-lite))
     (native-inputs
-     (list swig python-mock))
+     (list python-makefun
+           python-poetry-core
+           python-pytest
+           swig))
     (home-page "https://developers.yubico.com/yubikey-manager/")
     (synopsis "Command line tool and library for configuring a YubiKey")
     (description
-- 
cgit 1.4.1


From c2c13e3225977b4fc23da825e8a2331d86ba8435 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: download: Remove broken X.org mirrors.

These are still at <https://www.x.org/wiki/Releases/Download>, but
then that page hasn't been updated since 2018.

* guix/download.scm (%mirrors): Remove mirror.us.leaseweb.net and
x.cs.pu.edu.tw.
---
 guix/download.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/guix/download.scm b/guix/download.scm
index 01ebe31897..e619a8a730 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -148,7 +148,6 @@
        "http://www.x.org/releases/" ; main mirrors
        "http://mirror.csclub.uwaterloo.ca/x.org/" ; North America
        "http://xorg.mirrors.pair.com/"
-       "http://mirror.us.leaseweb.net/xorg/"
        "ftp://mirror.csclub.uwaterloo.ca/x.org/"
        "ftp://xorg.mirrors.pair.com/"
        "ftp://artfiles.org/x.org/" ; Europe
@@ -165,8 +164,7 @@
        "ftp://mirror.switch.ch/mirror/X11/"
        "ftp://mirrors.ircam.fr/pub/x.org/"
        "ftp://x.mirrors.skynet.be/pub/ftp.x.org/"
-       "http://x.cs.pu.edu.tw/" ; East Asia
-       "ftp://ftp.cs.cuhk.edu.hk/pub/X11"
+       "ftp://ftp.cs.cuhk.edu.hk/pub/X11" ; East Asia
        "ftp://ftp.u-aizu.ac.jp/pub/x11/x.org/"
        "ftp://ftp.yz.yamagata-u.ac.jp/pub/X11/x.org/"
        "ftp://ftp.kaist.ac.kr/x.org/"
-- 
cgit 1.4.1


From 4920d11ec12c055d3d0a630059b599228617ef5b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:03 +0200
Subject: download: Remove stale Yandex GNOME mirror.

* guix/download.scm (%mirrors): Remove mirror.yandex.ru from gnome.
---
 guix/download.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/guix/download.scm b/guix/download.scm
index e619a8a730..30d7c5a86e 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -91,8 +91,7 @@
        "ftp://ftp.gnupg.org/gcrypt/")
       (gnome
        "https://download.gnome.org/"
-       "http://ftp.gnome.org/pub/GNOME/"
-       "http://mirror.yandex.ru/mirrors/ftp.gnome.org/")
+       "http://ftp.gnome.org/pub/GNOME/")
       (hackage
        "http://hackage.haskell.org/")
       (savannah           ; http://download0.savannah.gnu.org/mirmon/savannah/
-- 
cgit 1.4.1


From 86e95b2205742e1204d174ce9156742a4c39776b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: boolector: Use HTTPS home page.

* gnu/packages/maths.scm (boolector)[home-page]: Use HTTPS.
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index b9b63c81c1..25eca2135e 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -6133,7 +6133,7 @@ find_package(louvain_communities)")
    (inputs (list btor2tools
                  boost cryptominisat louvain-community sqlite))
    (native-inputs (list googletest pkg-config python-wrapper))
-   (home-page "http://boolector.github.io/")
+   (home-page "https://boolector.github.io")
    (synopsis "Bitvector-based theory solver")
    (description "Boolector is a @acronym{SMT, satisfiability modulo theories}
 solver for the theories of fixed-size bit-vectors, arrays and uninterpreted
-- 
cgit 1.4.1


From 69c3a06a1c81fa535539a85bc2dc2b61d001e39b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: btor2tools: Use HTTPS home page.

* gnu/packages/maths.scm (btor2tools)[home-page]: Use HTTPS.
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 25eca2135e..03f8a56ea0 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -7757,7 +7757,7 @@ generic reader and writer API.")
                 (lambda* (#:key tests? #:allow-other-keys)
                   (when tests?
                     (invoke "sh" "test/runtests.sh")))))))
-   (home-page "http://boolector.github.io/")
+   (home-page "https://boolector.github.io")
    (synopsis "Parser for BTOR2 format")
    (description "This package provides a parser for the BTOR2 format used by
 Boolector.")
-- 
cgit 1.4.1


From 626c0b7cd6a20a1388d4460ea813dac13798b7d6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: nsd: Update to 4.7.0.

* gnu/packages/dns.scm (nsd): Update to 4.7.0.
---
 gnu/packages/dns.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index a34e4ced89..f4811e631f 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -513,14 +513,14 @@ the two.")
 (define-public nsd
   (package
     (name "nsd")
-    (version "4.6.1")
+    (version "4.7.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-"
                            version ".tar.gz"))
        (sha256
-        (base32 "0ym2fgkjar94y99lyvp93p7jpj33ysprvqd7py28xxn37shs6q1z"))))
+        (base32 "057jxhhyggqhy4swwqlwf1lflc96cfqpm200l1gr3lls557a9b4g"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit 1.4.1


From eaac21173011badba2ec6ccd30c48a2cc28cd1c1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: nsd: Use G-expressions.

* gnu/packages/dns.scm (nsd)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/dns.scm | 71 ++++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index f4811e631f..661c3e2497 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -523,41 +523,42 @@ the two.")
         (base32 "057jxhhyggqhy4swwqlwf1lflc96cfqpm200l1gr3lls557a9b4g"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags
-       (list "--enable-pie"             ; fully benefit from ASLR
-             "--enable-ratelimit"
-             "--enable-recvmmsg"
-             "--enable-relro-now"       ; protect GOT and .dtor areas
-             "--disable-radix-tree"
-             (string-append "--with-libevent="
-                            (assoc-ref %build-inputs "libevent"))
-             (string-append "--with-ssl="
-                            (assoc-ref %build-inputs "openssl"))
-             "--with-configdir=/etc"
-             "--with-nsd_conf_file=/etc/nsd/nsd.conf"
-             "--with-logfile=/var/log/nsd.log"
-             "--with-pidfile=/var/db/nsd/nsd.pid"
-             "--with-dbfile=/var/db/nsd/nsd.db"
-             "--with-zonesdir=/etc/nsd"
-             "--with-xfrdfile=/var/db/nsd/xfrd.state"
-             "--with-zonelistfile=/var/db/nsd/zone.list")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'patch-installation-paths
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (doc (string-append out "/share/doc/" ,name "-" ,version)))
-               ;; The ‘make install’ target tries to create the parent
-               ;; directories of run-time things like ‘pidfile’ above, and
-               ;; useless empty directories like 'configdir'.  Remove such
-               ;; '$(INSTALL)' lines and install the example configuration file
-               ;; in an appropriate location.
-               (substitute* "Makefile.in"
-                 ((".*INSTALL.*\\$\\((config|pid|xfr|db)dir" command)
-                  (string-append "#" command))
-                 (("\\$\\(nsdconfigfile\\)\\.sample" file-name)
-                  (string-append doc "/examples/" file-name)))))))
-       #:tests? #f))                    ; no tests
+     (list
+      #:configure-flags
+      #~(list "--enable-pie"            ; fully benefit from tasty ASLR
+              "--enable-ratelimit"
+              "--enable-recvmmsg"
+              "--enable-relro-now"      ; protect GOT and .dtor areas
+              "--disable-radix-tree"
+              (string-append "--with-libevent="
+                             #$(this-package-input "libevent"))
+              (string-append "--with-ssl="
+                             #$(this-package-input "openssl"))
+              "--with-configdir=/etc"
+              "--with-nsd_conf_file=/etc/nsd/nsd.conf"
+              "--with-logfile=/var/log/nsd.log"
+              "--with-pidfile=/var/db/nsd/nsd.pid"
+              "--with-dbfile=/var/db/nsd/nsd.db"
+              "--with-zonesdir=/etc/nsd"
+              "--with-xfrdfile=/var/db/nsd/xfrd.state"
+              "--with-zonelistfile=/var/db/nsd/zone.list")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'patch-installation-paths
+            (lambda _
+              (let ((doc (string-append #$output "/share/doc/"
+                                        #$name "-" #$version)))
+                ;; The ‘make install’ target tries to create the parent
+                ;; directories of run-time things like ‘pidfile’ above, and
+                ;; useless empty directories like 'configdir'.  Remove such
+                ;; '$(INSTALL)' lines and install the example configuration file
+                ;; in an appropriate location.
+                (substitute* "Makefile.in"
+                  ((".*INSTALL.*\\$\\((config|pid|xfr|db)dir" command)
+                   (string-append "#" command))
+                  (("\\$\\(nsdconfigfile\\)\\.sample" file-name)
+                   (string-append doc "/examples/" file-name)))))))
+      #:tests? #f))                    ; no tests
     (inputs
      (list libevent openssl))
     (home-page "https://www.nlnetlabs.nl/projects/nsd/about/")
-- 
cgit 1.4.1


From 60bb22a9da9aa41d219efc2973266e3f149578b7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: knot: Update to 3.2.8.

* gnu/packages/dns.scm (knot): Update to 3.2.8.
---
 gnu/packages/dns.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 661c3e2497..86f2b4338e 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -841,7 +841,7 @@ Extensions} (DNSSEC).")
 (define-public knot
   (package
     (name "knot")
-    (version "3.2.7")
+    (version "3.2.8")
     (source
      (origin
        (method git-fetch)
@@ -850,7 +850,7 @@ Extensions} (DNSSEC).")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1zrx5ih8wy0l9dka7ql9v32z6z8bxcdsfs1zmjn052xrzb01qjkw"))
+        (base32 "05yhm1n0zphcvicy2brlbv3azp4lvdjprcqf3lybz7mzd6ghr25c"))
        (modules '((guix build utils)))
        (snippet
         '(begin
-- 
cgit 1.4.1


From 1c347cd56a8feb260e40ab187d7de37076010b50 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:04 +0200
Subject: gnu: knot: Use G-expressions.

* gnu/packages/dns.scm (knot)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/dns.scm | 144 +++++++++++++++++++++++++--------------------------
 1 file changed, 71 insertions(+), 73 deletions(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 86f2b4338e..5dda69d4ab 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -866,79 +866,77 @@ Extensions} (DNSSEC).")
     (build-system gnu-build-system)
     (outputs (list "out" "doc" "lib" "tools"))
     (arguments
-     `(#:configure-flags
-       (list (string-append "--docdir=" (assoc-ref %outputs "doc")
-                            "/share/" ,name "-" ,version)
-             (string-append "--infodir=" (assoc-ref %outputs "doc")
-                            "/share/info")
-             (string-append "--libdir=" (assoc-ref %outputs "lib") "/lib")
-             "--sysconfdir=/etc"
-             "--localstatedir=/var"
-             "--disable-static"         ; static libraries are built by default
-             "--enable-dnstap"          ; let tools read/write capture files
-             "--enable-fastparser"      ; disabled by default when .git/ exists
-             "--enable-xdp=yes"
-             "--with-module-dnstap=yes") ; detailed query capturing & logging
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'link-missing-libbpf-dependency
-           ;; Linking against -lbpf later would fail to find -lz: libbpf.pc has
-           ;; zlib in its Requires.private (not Requires) field.  Add it here.
-           (lambda _
-             (substitute* "configure.ac"
-               (("enable_xdp=yes" match)
-                (string-append match "\nlibbpf_LIBS=\"$libbpf_LIBS -lz\"")))))
-         (add-before 'bootstrap 'update-parser
-           (lambda _
-             (with-directory-excursion "src"
-               (invoke "sh" "../scripts/update-parser.sh"))))
-         (add-before 'configure 'disable-directory-pre-creation
-           (lambda _
-             ;; Don't install empty directories like ‘/etc’ outside the store.
-             ;; This is needed even when using ‘make config_dir=... install’.
-             (substitute* "src/Makefile.in" (("\\$\\(INSTALL\\) -d") "true"))))
-         (add-after 'build 'build-info
-           (lambda* (#:key make-flags parallel-build? #:allow-other-keys)
-             (apply invoke "make" "info"
-                    `(,@(if parallel-build?
-                            `("-j" ,(number->string (parallel-job-count)))
-                            '())
-                      ,@make-flags))))
-         (replace 'install
-           (lambda* (#:key make-flags outputs parallel-build? #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (doc (string-append out "/share/doc/" ,name "-" ,version))
-                    (etc (string-append doc "/examples/etc")))
-               (apply invoke "make" "install"
-                      (string-append "config_dir=" etc)
-                      `(,@(if parallel-build?
-                              `("-j" ,(number->string (parallel-job-count)))
-                              '())
-                        ,@make-flags)))))
-         (add-after 'install 'install-info
-           (lambda* (#:key make-flags parallel-build? #:allow-other-keys)
-             (apply invoke "make" "install-info"
-                    `(,@(if parallel-build?
-                            `("-j" ,(number->string (parallel-job-count)))
-                            '())
-                      ,@make-flags))))
-         (add-after 'install 'break-circular-:lib->:out-reference
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((lib (assoc-ref outputs "lib")))
-               (for-each (lambda (file)
-                           (substitute* file
-                             (("(prefix=).*" _ assign)
-                              (string-append assign lib "\n"))))
-                         (find-files lib "\\.pc$")))))
-         (add-after 'install 'split-:tools
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out   (assoc-ref outputs "out"))
-                    (tools (assoc-ref outputs "tools")))
-               (mkdir-p (string-append tools "/share/man"))
-               (rename-file (string-append out   "/bin")
-                            (string-append tools "/bin"))
-               (rename-file (string-append out   "/share/man/man1")
-                            (string-append tools "/share/man/man1"))))))))
+     (list
+      #:configure-flags
+      #~(list (string-append "--docdir=" #$output:doc
+                             "/share/" #$name "-" #$version)
+              (string-append "--infodir=" #$output:doc "/share/info")
+              (string-append "--libdir=" #$output:lib "/lib")
+              "--sysconfdir=/etc"
+              "--localstatedir=/var"
+              "--disable-static"       ; static libraries are built by default
+              "--enable-dnstap"        ; let tools read/write capture files
+              "--enable-fastparser"    ; disabled by default when .git/ exists
+              "--enable-xdp=yes"
+              "--with-module-dnstap=yes") ; detailed query capturing & logging
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'link-missing-libbpf-dependency
+            ;; Linking against -lbpf later would fail to find -lz: libbpf.pc has
+            ;; zlib in its Requires.private (not Requires) field.  Add it here.
+            (lambda _
+              (substitute* "configure.ac"
+                (("enable_xdp=yes" match)
+                 (string-append match "\nlibbpf_LIBS=\"$libbpf_LIBS -lz\"")))))
+          (add-before 'bootstrap 'update-parser
+            (lambda _
+              (with-directory-excursion "src"
+                (invoke "sh" "../scripts/update-parser.sh"))))
+          (add-before 'configure 'disable-directory-pre-creation
+            (lambda _
+              ;; Don't install empty directories like ‘/etc’ outside the store.
+              ;; This is needed even when using ‘make config_dir=... install’.
+              (substitute* "src/Makefile.in" (("\\$\\(INSTALL\\) -d") "true"))))
+          (add-after 'build 'build-info
+            (lambda* (#:key make-flags parallel-build? #:allow-other-keys)
+              (apply invoke "make" "info"
+                     `(,@(if parallel-build?
+                             `("-j" ,(number->string (parallel-job-count)))
+                             '())
+                       ,@make-flags))))
+          (replace 'install
+            (lambda* (#:key make-flags parallel-build? #:allow-other-keys)
+              (let* ((doc (string-append #$output "/share/doc/"
+                                         #$name "-" #$version))
+                     (etc (string-append doc "/examples/etc")))
+                (apply invoke "make" "install"
+                       (string-append "config_dir=" etc)
+                       `(,@(if parallel-build?
+                               `("-j" ,(number->string (parallel-job-count)))
+                               '())
+                         ,@make-flags)))))
+          (add-after 'install 'install-info
+            (lambda* (#:key make-flags parallel-build? #:allow-other-keys)
+              (apply invoke "make" "install-info"
+                     `(,@(if parallel-build?
+                             `("-j" ,(number->string (parallel-job-count)))
+                             '())
+                       ,@make-flags))))
+          (add-after 'install 'break-circular-:lib->:out-reference
+            (lambda _
+              (for-each (lambda (file)
+                          (substitute* file
+                            (("(prefix=).*" _ assign)
+                             (string-append assign #$output:lib "\n"))))
+                        (find-files #$output:lib "\\.pc$"))))
+          (add-after 'install 'split:tools
+            (lambda _
+              (define (move source target file)
+                (mkdir-p (dirname (string-append target "/" file)))
+                (rename-file (string-append source "/" file)
+                             (string-append target "/" file)))
+              (move #$output #$output:tools "bin")
+              (move #$output #$output:tools "share/man/man1"))))))
     (native-inputs
      (list autoconf
            automake
-- 
cgit 1.4.1


From a1ae54b10bfd19722a37f10c2aa729a4df36367f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: yadifa: Update to 2.6.4.

* gnu/packages/dns.scm (yadifa): Update to 2.6.4.
[arguments]: Add a new 'unhard-code phase.
---
 gnu/packages/dns.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 5dda69d4ab..9879998776 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -795,16 +795,16 @@ served by AS112.  Stub and forward zones are supported.")
 (define-public yadifa
   (package
     (name "yadifa")
-    (version "2.5.3")
+    (version "2.6.4")
     (source
-     (let ((build "10333"))
+     (let ((build "10892"))
        (origin
          (method url-fetch)
          (uri
           (string-append "https://www.yadifa.eu/sites/default/files/releases/"
                          "yadifa-" version "-" build ".tar.gz"))
          (sha256
-          (base32 "1mwy6sfnlaslx26f3kpj9alh8i8y8bf1nbnsdd5j04hjsbavd07p")))))
+          (base32 "0wdm0gc01bhd04p3jqxy3y8lgx5v8wlm8saiy35llna5ssi77fyq")))))
     (build-system gnu-build-system)
     (native-inputs
      (list which))
@@ -813,6 +813,12 @@ served by AS112.  Stub and forward zones are supported.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'unhard-code
+           (lambda _
+             (substitute* (list "lib/dnslg/Makefile.in"
+                                "lib/dnsdb/Makefile.in"
+                                "lib/dnscore/Makefile.in")
+               (("/usr/bin/(install)" _ command) command))))
          (add-before 'configure 'omit-example-configurations
            (lambda _
              (substitute* "Makefile.in"
-- 
cgit 1.4.1


From 6f80e25f357abc59d79e83a62d7c703ab487758d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:05 +0200
Subject: gnu: blasr-libcpp, blasr: Use Web Archived home pages.

* gnu/packages/bioinformatics.scm (blasr-libcpp, blasr)[home-page]:
 Refer to Web Archive.
---
 gnu/packages/bioinformatics.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 341731d066..851be23deb 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -1254,7 +1254,9 @@ libblasr_gtest_dep = cpp.find_library('gtest_main', dirs : '~a')\n"
      (list boost hdf5 htslib pbbam zlib))
     (native-inputs
      (list googletest pkg-config))
-    (home-page "https://github.com/PacificBiosciences/blasr_libcpp")
+    (home-page
+     (string-append "https://web.archive.org/web/20201106122415/"
+                    "https://github.com/PacificBiosciences/blasr_libcpp"))
     (synopsis "Library for analyzing PacBio genomic sequences")
     (description
      "This package provides three libraries used by applications for analyzing
@@ -1296,7 +1298,8 @@ cpp.find_library('hdf5_cpp', dirs : '~a'), "
      (list boost blasr-libcpp hdf5 pbbam zlib))
     (native-inputs
      (list pkg-config))
-    (home-page "https://github.com/PacificBiosciences/blasr")
+    (home-page (string-append "https://web.archive.org/web/20210813124135/"
+                              "https://github.com/PacificBiosciences/blasr"))
     (synopsis "PacBio long read aligner")
     (description
      "Blasr is a genomic sequence aligner for processing PacBio long reads.")
-- 
cgit 1.4.1


From c848cd643c9a5c3e831cba318da501254e7f8b6e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:03 +0200
Subject: gnu: brdf-explorer: Use Web Archived home page.

* gnu/packages/graphics.scm (brdf-explorer)[home-page]:
 Refer to Web Archive.
---
 gnu/packages/graphics.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 85e7b03a33..f830b22158 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1642,7 +1642,9 @@ exec -a \"$0\" ~a/.brdf-real~%"
        (list qttools-5)) ;for 'qmake'
       (inputs
        (list qtbase-5 mesa glew freeglut zlib))
-      (home-page "https://www.disneyanimation.com/technology/brdf.html")
+      (home-page
+       (string-append "https://web.archive.org/web/20190115030100/"
+                      "https://www.disneyanimation.com/technology/brdf.html"))
       (synopsis
        "Analyze bidirectional reflectance distribution functions (BRDFs)")
       (description
-- 
cgit 1.4.1


From de088be221a491484d6992089fa2a80b06040d70 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: brdf-explorer: Mark up description.

* gnu/packages/graphics.scm (brdf-explorer)[synopsis, description]:
 Use @acronym{}.
---
 gnu/packages/graphics.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index f830b22158..02b73d5197 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1646,15 +1646,15 @@ exec -a \"$0\" ~a/.brdf-real~%"
        (string-append "https://web.archive.org/web/20190115030100/"
                       "https://www.disneyanimation.com/technology/brdf.html"))
       (synopsis
-       "Analyze bidirectional reflectance distribution functions (BRDFs)")
+       "@acronym{BRDF, bidirectional reflectance distribution function} analyzer")
       (description
        "BRDF Explorer is an application that allows the development and analysis
-of bidirectional reflectance distribution functions (BRDFs).  It can load and
-plot analytic BRDF functions (coded as functions in OpenGL's GLSL shader
-language), measured material data from the MERL database, and anisotropic
-measured material data from MIT CSAIL.  Graphs and visualizations update in
-real time as parameters are changed, making it a useful tool for evaluating
-and understanding different BRDFs (and other component functions).")
+of @acronym{BRDF, bidirectional reflectance distribution functions}.  It can
+load and plot analytic BRDF functions (coded as functions in OpenGL's GLSL
+shader language), measured material data from the MERL database, and anisotropic
+measured material data from MIT CSAIL.  Graphs and visualizations update in real
+time as parameters are changed, making it a useful tool for evaluating and
+understanding different BRDFs (and other component functions).")
       (license license:ms-pl))))
 
 (define-public agg
-- 
cgit 1.4.1


From 2195645725d1509e601f6bbc5b5e0f5ba7a755ff Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:00 +0200
Subject: gnu: bwa-pssm: Update home page.

* gnu/packages/bioinformatics.scm (bwa-pssm)[home-page]: Update.
---
 gnu/packages/bioinformatics.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 851be23deb..485e425b5c 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -3350,7 +3350,9 @@ and more accurate.  BWA-MEM also has better performance than BWA-backtrack for
                  (("inline int map") "int map"))))))))
     (inputs
      (list gdsl zlib perl))
-    (home-page "http://bwa-pssm.binf.ku.dk/")
+    ;; https://bwa-pssm.binf.ku.dk is down, and all Web Archived copies are
+    ;; blank (they actually have "display:none" for some nefarious reason).
+    (home-page "https://github.com/pkerpedjiev/bwa-pssm")
     (synopsis "Burrows-Wheeler transform-based probabilistic short read mapper")
     (description
      "BWA-PSSM is a probabilistic short genomic sequence read aligner based on
-- 
cgit 1.4.1


From 00ed2901f5171e4f9435641a91678217cae38030 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: cabal-install, ghc-cabal-syntax: Use HTTPS home page.

* gnu/packages/haskell-apps.scm (cabal-install)[home-page]: Use HTTPS.
* gnu/packages/haskell-xyz.scm (ghc-cabal-syntax)[home-page]: Likewise.
---
 gnu/packages/haskell-apps.scm | 2 +-
 gnu/packages/haskell-xyz.scm  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index 9aba12b713..4286ce206d 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -121,7 +121,7 @@ library.  It is primarily used with HLint's @code{--refactor} flag.")
    (arguments
     `(#:cabal-revision ("2"
                         "1kpgyfl5njxp4c8ax5ziag1bhqvph3h0pn660v3vpxalz8d1j6xv")))
-   (home-page "http://www.haskell.org/cabal/")
+   (home-page "https://www.haskell.org/cabal/")
    (synopsis "Command-line interface for Cabal and Hackage")
    (description
     "The cabal command-line program simplifies the process of managing
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 12d1246c58..71df4192dc 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -15813,7 +15813,7 @@ benchmarks](https://hackage.haskell.org/package/random-bytestring-0.1.3.2/src/be
                 "0lcj4g55sj5iv727g7k57pscgyj0fx3smwapm1gmd5qkc3yfa9fa"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "Cabal-syntax")))
-    (home-page "http://www.haskell.org/cabal/")
+    (home-page "https://www.haskell.org/cabal/")
     (synopsis "A library for working with .cabal files")
     (description
      "This library provides tools for reading and manipulating the .cabal file format.
-- 
cgit 1.4.1


From 529d91de1efde94d00ba3c185dbccb741cc9939d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Thu, 13 Jul 2023 10:30:14 +0200
Subject: gnu: node-lts: Simplify snippet.

* gnu/packages/node.scm (node-lts)[source]: Remove quasiquote, trailing #T,
and IF with explicit booleans.
---
 gnu/packages/node.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 7695614b3a..c0bb4f2342 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018-2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com>
-;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2020, 2023 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021, 2022 Philip McGrath <philip@philipmcgrath.com>
@@ -748,13 +748,12 @@ source files.")
                 "0vcc132z7lkxnw5clmiz6sp6ccmw35pyb69hczphrig5frfmqkva"))
               (modules '((guix build utils)))
               (snippet
-               `(begin
+               '(begin
                   ;; openssl.cnf is required for build.
                   (for-each delete-file-recursively
                             (find-files "deps/openssl"
                                         (lambda (file stat)
-                                          (if (string-contains file "nodejs-openssl.cnf")
-                                              #f #t))))
+                                          (not (string-contains file "nodejs-openssl.cnf")))))
                   ;; Remove bundled software, where possible
                   (for-each delete-file-recursively
                             '("deps/cares"
@@ -764,8 +763,7 @@ source files.")
                   (substitute* "Makefile"
                     ;; Remove references to bundled software.
                     (("deps/uv/uv.gyp") "")
-                    (("deps/zlib/zlib.gyp") ""))
-                  #t))))
+                    (("deps/zlib/zlib.gyp") ""))))))
     (arguments
      (substitute-keyword-arguments (package-arguments node)
        ((#:configure-flags configure-flags)
-- 
cgit 1.4.1


From 5dc2a88f99e2e448f7e9ca842a4a0d072a8f8f20 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Thu, 13 Jul 2023 10:47:01 +0200
Subject: gnu: node-lts: Install files irrespective of number of hardlinks.

* gnu/packages/node.scm (node-lts)[arguments]: Add build phase
'ignore-number-of-hardlinks.
---
 gnu/packages/node.scm | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index c0bb4f2342..8ba57dd4e0 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -874,7 +874,36 @@ source files.")
                  (copy-file (string-append llhttp "/src/http.c")
                             "deps/llhttp/src/http.c")
                  (copy-file (string-append llhttp "/include/llhttp.h")
-                            "deps/llhttp/include/llhttp.h"))))))))
+                            "deps/llhttp/include/llhttp.h"))))
+           ;; npm installs dependencies by copying their files over a tar
+           ;; stream.  A file with more than one hardlink is marked as a
+           ;; "Link".  pacote/lib/fetcher.js calls node-tar's extractor with a
+           ;; filter that ignores any "Link" entries.  This means that
+           ;; dependending on the number of hardlinks on files in a node-*
+           ;; package *some* of its files may not be installed when generating
+           ;; another package's "node_modules" directory.  The build output
+           ;; would differ depending on irrelevant file system state.
+           ;;
+           ;; To avoid this, we patch node-tar to treat files with hardlinks
+           ;; the same as any other file, so that node-tar has no choice but
+           ;; to extract all of them --- independent of pacote's filter.
+           ;;
+           ;; Why not patch pacote's filter instead?  This has led to subtle
+           ;; differences in where the files are installed, so it's easier to
+           ;; just ensure that files with hardlinks are always treated as
+           ;; regular files.
+           ;;
+           ;; Discussion:
+           ;;   https://lists.gnu.org/archive/html/guix-devel/2023-07/msg00040.html
+           ;; Upstream bug report:
+           ;;   https://github.com/npm/pacote/issues/285
+           (add-after 'install 'ignore-number-of-hardlinks
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((file (string-append (assoc-ref outputs "out")
+                                          "/lib/node_modules/npm/node_modules"
+                                          "/tar/lib/write-entry.js")))
+                 (substitute* file
+                   (("this.stat.nlink > 1") "false")))))))))
     (native-inputs
      (list ;; Runtime dependencies for binaries used as a bootstrap.
            c-ares-for-node
-- 
cgit 1.4.1


From b5a5e4d712d0a1998995be62bb41b03955b7dcf1 Mon Sep 17 00:00:00 2001
From: Artyom Bologov <mail@aartaka.me>
Date: Fri, 14 Jul 2023 18:09:12 +0400
Subject: gnu: cl-nhooks: Update to 1.2.1.

* gnu/packages/lisp-xyz.scm (sbcl-nhooks): Update to 1.2.1.
  [native-inputs]: Remove sbcl-fiveam, add sbcl-lisp-unit2.

Co-authored-by: Guillaume Le Vaillant <glv@posteo.net>
---
 gnu/packages/lisp-xyz.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index a59c555f9a..9fc5341521 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -25508,22 +25508,22 @@ JavaScript code.")
 (define-public sbcl-nhooks
   (package
     (name "sbcl-nhooks")
-    (version "1.2.0")
+    (version "1.2.1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/atlas-engineer/nhooks")
              (commit version)))
-       (file-name (git-file-name "nhooks" version))
+       (file-name (git-file-name "cl-nhooks" version))
        (sha256
         (base32
-         "1cpd9ydxkrl4vxn2clfwljl4q5hdybxkc96qshq7dczq2jvg1nfs"))))
+         "10ym4ybda2l426flicqz0f4yg7fbw7yjk1k0wqpf4wfk24gm1b8g"))))
     (build-system asdf-build-system/sbcl)
     (inputs
      (list sbcl-serapeum))
     (native-inputs
-     (list sbcl-fiveam))
+     (list sbcl-lisp-unit2))
     (home-page "https://github.com/atlas-engineer/nhooks")
     (synopsis "Hook facility for Common Lisp")
     (description "This package holds an enhanced implementation of
-- 
cgit 1.4.1


From a065e12f82cf220c8802e2cc6e9fff47d6920673 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 15 Jul 2023 11:07:44 +0200
Subject: gnu: r-pando: Relax requirements.

* gnu/packages/bioinformatics.scm (r-pando)[arguments]: Patch DESCRIPTION
file.
---
 gnu/packages/bioinformatics.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 485e425b5c..fb0f0d5fd7 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -9831,6 +9831,14 @@ differently labelled data.")
         (base32 "04kr1b28p5j7h48g32cldkg87xcmxnmd4kspygkfs7a4amihpi66"))))
     (properties `((upstream-name . "Pando")))
     (build-system r-build-system)
+    (arguments
+     (list
+      #:phases
+      '(modify-phases %standard-phases
+         (add-after 'unpack 'loosen-requirements
+           (lambda _
+             (substitute* "DESCRIPTION"
+               ((" \\(==.*,") ",")))))))
     (propagated-inputs
      (list r-bayestestr
            r-foreach
-- 
cgit 1.4.1


From b592732d8b4e4b44c40b9c728e86dae47e1ea354 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 15 Jul 2023 13:20:24 +0200
Subject: gnu: python-dask: Update to 2023.7.0.

* gnu/packages/python-xyz.scm (python-dask): Update to 2023.7.0.
---
 gnu/packages/python-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8cdb3a08bc..973216c5ed 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -25591,16 +25591,16 @@ decisions with any given backend.")
 (define-public python-dask
   (package
     (name "python-dask")
-    (version "2023.4.1")
+    (version "2023.7.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/dask/dask/")
-             (commit "a69a808f75a961504a9ba18058bff5e458be97fb")))
+             (commit "8523b3bae2ec0183d9d92cc536a3405f15189b7e")))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "089kz6hcgl4yxwx99br1124sg1gkdy554hf120z9a5cfbrf0ah9y"))))
+        (base32 "1x617m0jlc63v938kqga9mhflhac3aj1ylq5mkpf2g9pd9x2hcbz"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-- 
cgit 1.4.1


From 01412c6c6a98e4da10676560638640d0f33e1a02 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 15 Jul 2023 13:36:02 +0200
Subject: gnu: python-distributed: Update to 2023.7.0.

* gnu/packages/python-science.scm (python-distributed): Update to 2023.7.0.
---
 gnu/packages/python-science.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 00d6ad7305..1962553cf0 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -1150,7 +1150,7 @@ Mathematics (GLM) library to Python.")
 (define-public python-distributed
   (package
     (name "python-distributed")
-    (version "2023.4.1")
+    (version "2023.7.0")
     (source
      (origin
        ;; The test files are not included in the archive on pypi
@@ -1161,7 +1161,7 @@ Mathematics (GLM) library to Python.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "164xp2dxac95nngmgdhlk0vwnnvbmajqliz994bdvw72xnv1ya18"))))
+         "0b93fpwz7kw31pkzfyihpkw8mzbqshzd6rw5vcwld7n3z2aaaxxb"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-- 
cgit 1.4.1


From 49f74b67a44882d2af0529abf3e60a9c37512f2c Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 10 Jul 2023 13:50:45 -0400
Subject: gnu: Add linux-libre 6.4

* gnu/packages/linux.scm (linux-libre-6.4-version, linux-libre-6.4-gnu-revision,
deblob-scripts-6.4, linux-libre-6.4-pristine-source, linux-libre-6.4-source,
linux-libre-headers-6.4, linux-libre-6.4: New variables.
* gnu/packages/aux-files/linux-libre/6.4-arm.conf,
* gnu/packages/aux-files/linux-libre/6.4-arm64.conf,
* gnu/packages/aux-files/linux-libre/6.4-i686.conf,
* gnu/packages/aux-files/linux-libre/6.4-x86_64.conf: New files.
* Makefile.am (AUX_FILES): Add them.
---
 Makefile.am                                        |     2 +
 gnu/packages/aux-files/linux-libre/6.4-arm.conf    | 10777 +++++++++++++++++
 gnu/packages/aux-files/linux-libre/6.4-arm64.conf  | 11406 ++++++++++++++++++
 gnu/packages/aux-files/linux-libre/6.4-i686.conf   | 11652 ++++++++++++++++++
 gnu/packages/aux-files/linux-libre/6.4-x86_64.conf | 11837 +++++++++++++++++++
 gnu/packages/linux.scm                             |    33 +
 6 files changed, 45707 insertions(+)
 create mode 100644 gnu/packages/aux-files/linux-libre/6.4-arm.conf
 create mode 100644 gnu/packages/aux-files/linux-libre/6.4-arm64.conf
 create mode 100644 gnu/packages/aux-files/linux-libre/6.4-i686.conf
 create mode 100644 gnu/packages/aux-files/linux-libre/6.4-x86_64.conf

diff --git a/Makefile.am b/Makefile.am
index a386e6033c..d680c8c76c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -410,6 +410,8 @@ AUX_FILES =						\
   gnu/packages/aux-files/chromium/master-preferences.json		\
   gnu/packages/aux-files/emacs/guix-emacs.el		\
   gnu/packages/aux-files/guix.vim			\
+  gnu/packages/aux-files/linux-libre/6.4-i686.conf	\
+  gnu/packages/aux-files/linux-libre/6.4-x86_64.conf	\
   gnu/packages/aux-files/linux-libre/6.3-arm.conf	\
   gnu/packages/aux-files/linux-libre/6.3-arm64.conf	\
   gnu/packages/aux-files/linux-libre/6.3-i686.conf	\
diff --git a/gnu/packages/aux-files/linux-libre/6.4-arm.conf b/gnu/packages/aux-files/linux-libre/6.4-arm.conf
new file mode 100644
index 0000000000..d14f0320ee
--- /dev/null
+++ b/gnu/packages/aux-files/linux-libre/6.4-arm.conf
@@ -0,0 +1,10777 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm 6.4.2 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=110300
+CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23800
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23800
+CONFIG_LLD_VERSION=0
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
+CONFIG_PAHOLE_VERSION=0
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_TABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_WERROR is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_XZ=y
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+CONFIG_DEFAULT_INIT=""
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_WATCH_QUEUE=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_INJECTION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
+CONFIG_GENERIC_IRQ_IPI=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_CONTEXT_TRACKING=y
+CONFIG_CONTEXT_TRACKING_IDLE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+CONFIG_BPF=y
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# BPF subsystem
+#
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
+# CONFIG_BPF_PRELOAD is not set
+CONFIG_BPF_LSM=y
+# end of BPF subsystem
+
+CONFIG_PREEMPT_VOLUNTARY_BUILD=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_SCHED_THERMAL_PRESSURE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+# CONFIG_PSI_DEFAULT_DISABLED is not set
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_TREE_SRCU=y
+CONFIG_NEED_SRCU_NMI_SAFE=y
+CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_TASKS_RUDE_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKHEADERS is not set
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+# CONFIG_PRINTK_INDEX is not set
+CONFIG_GENERIC_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
+CONFIG_CC_NO_ARRAY_BOUNDS=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+# CONFIG_CGROUP_FAVOR_DYNMODS is not set
+CONFIG_MEMCG=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_SCHED_MM_CID=y
+CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+# CONFIG_CGROUP_BPF is not set
+CONFIG_CGROUP_MISC=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
+CONFIG_BOOT_CONFIG=y
+# CONFIG_BOOT_CONFIG_FORCE is not set
+# CONFIG_BOOT_CONFIG_EMBED is not set
+CONFIG_INITRAMFS_PRESERVE_MTIME=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_LD_ORPHAN_WARN=y
+CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+# CONFIG_SGETMASK_SYSCALL is not set
+# CONFIG_SYSFS_SYSCALL is not set
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_SELFTEST is not set
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+# CONFIG_PC104 is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_ARM=y
+CONFIG_ARM_HAS_GROUP_RELOCS=y
+CONFIG_ARM_DMA_USE_IOMMU=y
+CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_NO_IOPORT_MAP=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_ARCH_HAS_BANDGAP=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIQ=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_GENERIC_BUG=y
+CONFIG_PGTABLE_LEVELS=2
+
+#
+# System Type
+#
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
+CONFIG_ARCH_MULTIPLATFORM=y
+
+#
+# Platform selection
+#
+
+#
+# CPU Core family selection
+#
+# CONFIG_ARCH_MULTI_V6 is not set
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_MULTI_V6_V7=y
+# end of Platform selection
+
+CONFIG_ARCH_VIRT=y
+CONFIG_ARCH_AIROHA=y
+# CONFIG_ARCH_ACTIONS is not set
+# CONFIG_ARCH_ALPINE is not set
+# CONFIG_ARCH_ARTPEC is not set
+# CONFIG_ARCH_ASPEED is not set
+# CONFIG_ARCH_AT91 is not set
+CONFIG_ARCH_BCM=y
+
+#
+# IPROC architected SoCs
+#
+# CONFIG_ARCH_BCM_CYGNUS is not set
+# CONFIG_ARCH_BCM_HR2 is not set
+# CONFIG_ARCH_BCM_NSP is not set
+# CONFIG_ARCH_BCM_5301X is not set
+
+#
+# KONA architected SoCs
+#
+# CONFIG_ARCH_BCM_281XX is not set
+# CONFIG_ARCH_BCM_21664 is not set
+# CONFIG_ARCH_BCM_23550 is not set
+
+#
+# Other Architectures
+#
+CONFIG_ARCH_BCM2835=y
+# CONFIG_ARCH_BCM_53573 is not set
+# CONFIG_ARCH_BRCMSTB is not set
+# CONFIG_ARCH_BCMBCA is not set
+
+#
+# BCMBCA sub platforms
+#
+# CONFIG_ARCH_BERLIN is not set
+# CONFIG_ARCH_DIGICOLOR is not set
+# CONFIG_ARCH_DOVE is not set
+CONFIG_ARCH_EXYNOS=y
+CONFIG_S5P_DEV_MFC=y
+# CONFIG_ARCH_EXYNOS3 is not set
+CONFIG_ARCH_EXYNOS4=y
+CONFIG_ARCH_EXYNOS5=y
+
+#
+# Exynos SoCs
+#
+CONFIG_CPU_EXYNOS4210=y
+CONFIG_SOC_EXYNOS4412=y
+CONFIG_SOC_EXYNOS5250=y
+CONFIG_SOC_EXYNOS5260=y
+CONFIG_SOC_EXYNOS5410=y
+CONFIG_SOC_EXYNOS5420=y
+CONFIG_SOC_EXYNOS5800=y
+CONFIG_EXYNOS_MCPM=y
+CONFIG_EXYNOS_CPU_SUSPEND=y
+CONFIG_ARCH_HIGHBANK=y
+# CONFIG_ARCH_HISI is not set
+CONFIG_ARCH_HPE=y
+CONFIG_ARCH_HPE_GXP=y
+CONFIG_ARCH_MXC=y
+CONFIG_MXC_TZIC=y
+CONFIG_HAVE_IMX_ANATOP=y
+CONFIG_HAVE_IMX_GPC=y
+CONFIG_HAVE_IMX_MMDC=y
+CONFIG_HAVE_IMX_SRC=y
+
+#
+# Cortex-A platforms
+#
+CONFIG_SOC_IMX5=y
+# CONFIG_SOC_IMX50 is not set
+CONFIG_SOC_IMX51=y
+CONFIG_SOC_IMX53=y
+CONFIG_SOC_IMX6=y
+CONFIG_SOC_IMX6Q=y
+# CONFIG_SOC_IMX6SL is not set
+# CONFIG_SOC_IMX6SLL is not set
+# CONFIG_SOC_IMX6SX is not set
+# CONFIG_SOC_IMX6UL is not set
+# CONFIG_SOC_LS1021A is not set
+
+#
+# Cortex-A/Cortex-M asymmetric multiprocessing platforms
+#
+# CONFIG_SOC_IMX7D is not set
+# CONFIG_SOC_IMX7ULP is not set
+# CONFIG_SOC_VF610 is not set
+# CONFIG_ARCH_KEYSTONE is not set
+# CONFIG_ARCH_MEDIATEK is not set
+# CONFIG_ARCH_MESON is not set
+# CONFIG_ARCH_MILBEAUT is not set
+# CONFIG_ARCH_MMP is not set
+CONFIG_ARCH_MSTARV7=y
+CONFIG_MACH_INFINITY=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_MACH_MVEBU_ANY=y
+CONFIG_MACH_MVEBU_V7=y
+CONFIG_MACH_ARMADA_370=y
+CONFIG_MACH_ARMADA_375=y
+CONFIG_MACH_ARMADA_38X=y
+CONFIG_MACH_ARMADA_39X=y
+CONFIG_MACH_ARMADA_XP=y
+# CONFIG_MACH_DOVE is not set
+# CONFIG_ARCH_NPCM is not set
+CONFIG_ARCH_OMAP=y
+
+#
+# TI OMAP/AM/DM/DRA Family
+#
+CONFIG_OMAP_HWMOD=y
+CONFIG_ARCH_OMAP3=y
+CONFIG_ARCH_OMAP4=y
+CONFIG_SOC_OMAP5=y
+CONFIG_SOC_AM33XX=y
+# CONFIG_SOC_AM43XX is not set
+CONFIG_SOC_DRA7XX=y
+CONFIG_ARCH_OMAP2PLUS=y
+CONFIG_OMAP_INTERCONNECT_BARRIER=y
+
+#
+# TI OMAP2/3/4 Specific Features
+#
+CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
+CONFIG_SOC_HAS_OMAP2_SDRC=y
+CONFIG_SOC_HAS_REALTIME_COUNTER=y
+CONFIG_POWER_AVS_OMAP=y
+CONFIG_POWER_AVS_OMAP_CLASS3=y
+# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
+CONFIG_SOC_OMAP3430=y
+CONFIG_SOC_TI81XX=y
+
+#
+# OMAP Legacy Platform Data Board Type
+#
+CONFIG_MACH_OMAP_GENERIC=y
+# end of TI OMAP2/3/4 Specific Features
+
+# CONFIG_OMAP5_ERRATA_801819 is not set
+# end of TI OMAP/AM/DM/DRA Family
+
+# CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_RDA is not set
+CONFIG_ARCH_REALTEK=y
+CONFIG_ARCH_ROCKCHIP=y
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_RENESAS is not set
+CONFIG_ARCH_INTEL_SOCFPGA=y
+# CONFIG_SOCFPGA_SUSPEND is not set
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_ARCH_STI is not set
+# CONFIG_ARCH_STM32 is not set
+CONFIG_ARCH_SUNPLUS=y
+CONFIG_SOC_SP7021=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+CONFIG_MACH_SUN6I=y
+CONFIG_MACH_SUN7I=y
+CONFIG_MACH_SUN8I=y
+CONFIG_MACH_SUN9I=y
+CONFIG_ARCH_SUNXI_MC_SMP=y
+CONFIG_ARCH_TEGRA=y
+# CONFIG_ARCH_UNIPHIER is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_REALVIEW is not set
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
+# CONFIG_ARCH_VEXPRESS_DCSCB is not set
+# CONFIG_ARCH_VEXPRESS_SPC is not set
+# CONFIG_ARCH_VEXPRESS_TC2_PM is not set
+CONFIG_ARCH_VT8500=y
+CONFIG_ARCH_WM8850=y
+# CONFIG_ARCH_ZYNQ is not set
+CONFIG_PLAT_ORION=y
+CONFIG_PLAT_VERSATILE=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_PJ4B=y
+CONFIG_CPU_V7=y
+CONFIG_CPU_THUMB_CAPABLE=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_HAS_ASID=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_LPAE is not set
+CONFIG_ARM_THUMB=y
+CONFIG_ARM_THUMBEE=y
+CONFIG_ARM_VIRT_EXT=y
+CONFIG_SWP_EMULATE=y
+CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_CPU_SPECTRE=y
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
+CONFIG_HARDEN_BRANCH_HISTORY=y
+CONFIG_KUSER_HELPERS=y
+CONFIG_VDSO=y
+CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_CACHE_FEROCEON_L2=y
+# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
+CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_CACHE_L2X0=y
+# CONFIG_CACHE_L2X0_PMU is not set
+CONFIG_PL310_ERRATA_588369=y
+CONFIG_PL310_ERRATA_727915=y
+CONFIG_PL310_ERRATA_753970=y
+CONFIG_PL310_ERRATA_769419=y
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+CONFIG_ARM_HEAVY_MB=y
+CONFIG_DEBUG_ALIGN_RODATA=y
+CONFIG_IWMMXT=y
+CONFIG_PJ4B_ERRATA_4742=y
+CONFIG_ARM_ERRATA_430973=y
+CONFIG_ARM_ERRATA_643719=y
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_ARM_ERRATA_754322=y
+CONFIG_ARM_ERRATA_754327=y
+CONFIG_ARM_ERRATA_764369=y
+CONFIG_ARM_ERRATA_764319=y
+CONFIG_ARM_ERRATA_775420=y
+CONFIG_ARM_ERRATA_798181=y
+CONFIG_ARM_ERRATA_773022=y
+# CONFIG_ARM_ERRATA_818325_852422 is not set
+# CONFIG_ARM_ERRATA_821420 is not set
+# CONFIG_ARM_ERRATA_825619 is not set
+CONFIG_ARM_ERRATA_857271=y
+# CONFIG_ARM_ERRATA_852421 is not set
+# CONFIG_ARM_ERRATA_852423 is not set
+CONFIG_ARM_ERRATA_857272=y
+# end of System Type
+
+#
+# Bus support
+#
+CONFIG_ARM_ERRATA_814220=y
+# end of Bus support
+
+#
+# Kernel Features
+#
+CONFIG_HAVE_SMP=y
+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
+CONFIG_CURRENT_POINTER_IN_TPIDRURO=y
+CONFIG_IRQSTACKS=y
+CONFIG_ARM_CPU_TOPOLOGY=y
+# CONFIG_SCHED_MC is not set
+# CONFIG_SCHED_SMT is not set
+CONFIG_HAVE_ARM_SCU=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
+CONFIG_HAVE_ARM_TWD=y
+CONFIG_MCPM=y
+# CONFIG_BIG_LITTLE is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_NR_CPUS=8
+CONFIG_HOTPLUG_CPU=y
+CONFIG_ARM_PSCI=y
+CONFIG_HZ_FIXED=0
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_200 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_500 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+# CONFIG_THUMB2_KERNEL is not set
+CONFIG_ARM_PATCH_IDIV=y
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_HIGHMEM=y
+CONFIG_HIGHPTE=y
+CONFIG_CPU_SW_DOMAIN_PAN=y
+CONFIG_HW_PERF_EVENTS=y
+# CONFIG_ARM_MODULE_PLTS is not set
+CONFIG_ARCH_FORCE_MAX_ORDER=12
+CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_XEN_DOM0=y
+CONFIG_XEN=y
+CONFIG_STACKPROTECTOR_PER_TASK=y
+# end of Kernel Features
+
+#
+# Boot options
+#
+CONFIG_USE_OF=y
+CONFIG_ATAGS=y
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
+CONFIG_CMDLINE=""
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
+# CONFIG_CRASH_DUMP is not set
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI=y
+CONFIG_DMI=y
+# end of Boot options
+
+#
+# CPU Power Management
+#
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_CPUFREQ_DT=m
+CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m
+CONFIG_ARM_ARMADA_37XX_CPUFREQ=m
+CONFIG_ARM_ARMADA_8K_CPUFREQ=m
+CONFIG_ARM_HIGHBANK_CPUFREQ=m
+CONFIG_ARM_IMX6Q_CPUFREQ=m
+CONFIG_ARM_IMX_CPUFREQ_DT=m
+CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
+CONFIG_ARM_SCMI_CPUFREQ=m
+CONFIG_ARM_TEGRA20_CPUFREQ=m
+CONFIG_ARM_TEGRA124_CPUFREQ=y
+# CONFIG_ARM_TI_CPUFREQ is not set
+# end of CPU Frequency scaling
+
+#
+# CPU Idle
+#
+# CONFIG_CPU_IDLE is not set
+CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
+# end of CPU Idle
+# end of CPU Power Management
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
+# CONFIG_KERNEL_MODE_NEON is not set
+# end of Floating point emulation
+
+#
+# Power management options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_USERSPACE_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_APM_EMULATION=y
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_CPU_PM=y
+CONFIG_ENERGY_MODEL=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+# end of Power management options
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_OPTPROBES=y
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_KEEPINITRD=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_32BIT_OFF_T=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_MMU_LAZY_TLB_REFCOUNT=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_LTO_NONE=y
+CONFIG_HAVE_CONTEXT_TRACKING_USER=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_HAVE_ARCH_PFN_VALID=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_HAVE_GCC_PLUGINS=y
+CONFIG_GCC_PLUGINS=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y
+CONFIG_FUNCTION_ALIGNMENT=0
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_DEBUG is not set
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODULE_UNLOAD_TAINT_TRACKING is not set
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS_NONE is not set
+CONFIG_MODULE_COMPRESS_GZIP=y
+# CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
+CONFIG_MODULE_DECOMPRESS=y
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+CONFIG_MODPROBE_PATH="/run/current-system/profile/bin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLOCK_LEGACY_AUTOLOAD=y
+CONFIG_BLK_RQ_ALLOC_TIME=y
+CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_CGROUP_PUNT_BIO=y
+CONFIG_BLK_DEV_BSG_COMMON=y
+CONFIG_BLK_ICQ=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_INTEGRITY_T10=y
+# CONFIG_BLK_DEV_ZONED is not set
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
+CONFIG_BLK_WBT=y
+CONFIG_BLK_WBT_MQ=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+CONFIG_BLK_CGROUP_IOCOST=y
+CONFIG_BLK_CGROUP_IOPRIO=y
+CONFIG_BLK_DEBUG_FS=y
+# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_INLINE_ENCRYPTION=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
+# end of Partition Types
+
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
+CONFIG_BLK_MQ_STACKING=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_IOSCHED_BFQ=m
+CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_ELF_FDPIC is not set
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_ARCH_HAS_BINFMT_FLAT=y
+# CONFIG_BINFMT_FLAT is not set
+CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_ZPOOL=y
+CONFIG_SWAP=y
+CONFIG_ZSWAP=y
+# CONFIG_ZSWAP_DEFAULT_ON is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+CONFIG_ZBUD=y
+# CONFIG_Z3FOLD is not set
+CONFIG_ZSMALLOC=m
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_ZSMALLOC_CHAIN_SIZE=8
+
+#
+# SLAB allocator options
+#
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+# end of SLAB allocator options
+
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_EXCLUSIVE_SYSTEM_RAM=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
+CONFIG_PAGE_REPORTING=y
+CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_BOUNCE=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_SYSFS=y
+CONFIG_CMA_AREAS=7
+CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_PAGE_IDLE_FLAG=y
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
+CONFIG_ZONE_DMA=y
+CONFIG_HMM_MIRROR=y
+CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_TEST is not set
+# CONFIG_DMAPOOL_TEST is not set
+CONFIG_KMAP_LOCAL=y
+CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y
+CONFIG_ANON_VMA_NAME=y
+CONFIG_USERFAULTFD=y
+CONFIG_LRU_GEN=y
+# CONFIG_LRU_GEN_ENABLED is not set
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_LOCK_MM_AND_FIND_VMA=y
+
+#
+# Data Access Monitoring
+#
+CONFIG_DAMON=y
+CONFIG_DAMON_VADDR=y
+CONFIG_DAMON_PADDR=y
+CONFIG_DAMON_SYSFS=y
+# CONFIG_DAMON_DBGFS is not set
+CONFIG_DAMON_RECLAIM=y
+CONFIG_DAMON_LRU_SORT=y
+# end of Data Access Monitoring
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_AF_UNIX_OOB=y
+CONFIG_UNIX_DIAG=m
+# CONFIG_TLS is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_AH=m
+CONFIG_XFRM_ESP=m
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+# CONFIG_SMC is not set
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
+CONFIG_NET_HANDSHAKE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+# CONFIG_INET_ESP_OFFLOAD is not set
+# CONFIG_INET_ESPINTCP is not set
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_TABLE_PERTURB_ORDER=16
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+# CONFIG_INET_RAW_DIAG is not set
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+# CONFIG_INET6_ESP_OFFLOAD is not set
+# CONFIG_INET6_ESPINTCP is not set
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
+# CONFIG_IPV6_RPL_LWTUNNEL is not set
+# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
+# CONFIG_NETLABEL is not set
+CONFIG_MPTCP=y
+CONFIG_INET_MPTCP_DIAG=m
+CONFIG_MPTCP_IPV6=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_EGRESS=y
+CONFIG_NETFILTER_SKIP_EGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_BPF_LINK=y
+CONFIG_NETFILTER_NETLINK_HOOK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_NETLINK_OSF=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_SYSLOG=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CONNTRACK_OVS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NF_NAT_OVS=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+# CONFIG_IP_SET_HASH_IPMAC is not set
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_TWOS=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_CRYPTO=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_BRIDGE_MRP=y
+CONFIG_BRIDGE_CFM=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_NONE=m
+CONFIG_NET_DSA_TAG_AR9331=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_LEGACY=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_HELLCREEK=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_OCELOT=m
+CONFIG_NET_DSA_TAG_OCELOT_8021Q=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_RTL4_A=m
+CONFIG_NET_DSA_TAG_RTL8_4=m
+CONFIG_NET_DSA_TAG_RZN1_A5PSW=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
+CONFIG_NET_DSA_TAG_XRS700X=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_MQPRIO_LIB=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_SCH_ETS=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+# CONFIG_NET_ACT_SAMPLE is not set
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_MPLS=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_ACT_CT=m
+CONFIG_NET_ACT_GATE=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+# CONFIG_NET_TC_SKB_EXT is not set
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=m
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_BATMAN_V is not set
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VSOCKETS_LOOPBACK=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=y
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+# CONFIG_HSR is not set
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_QRTR=m
+CONFIG_QRTR_TUN=m
+CONFIG_QRTR_MHI=m
+# CONFIG_NET_NCSI is not set
+CONFIG_PCPU_DEV_REFCNT=y
+CONFIG_MAX_SKB_FRAGS=17
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_DROP_MONITOR=m
+# end of Network testing
+# end of Networking options
+
+# CONFIG_HAMRADIO is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+CONFIG_CAN_J1939=m
+CONFIG_CAN_ISOTP=m
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_LE_L2CAP_ECRED=y
+CONFIG_BT_6LOWPAN=m
+# CONFIG_BT_LEDS is not set
+CONFIG_BT_MSFTEXT=y
+CONFIG_BT_AOSPEXT=y
+CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_SELFTEST is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_MTK=m
+CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
+CONFIG_BT_HCIBTUSB_POLL_SYNC=y
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_MTK=y
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIBCM203X is not set
+CONFIG_BT_HCIBCM4377=m
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIVHCI is not set
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_HCIRSI=m
+CONFIG_BT_VIRTIO=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_INJECT_RX_DELAY is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=y
+# CONFIG_RXPERF is not set
+# CONFIG_AF_KCM is not set
+CONFIG_MCTP=y
+CONFIG_MCTP_FLOWS=y
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+# CONFIG_RFKILL_GPIO is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_FD=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_XEN is not set
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+# CONFIG_NFC_NCI is not set
+# CONFIG_NFC_HCI is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+# CONFIG_NFC_TRF7970A is not set
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+# CONFIG_NFC_PN533_I2C is not set
+# CONFIG_NFC_ST95HF is not set
+# end of Near Field Communication (NFC) devices
+
+# CONFIG_PSAMPLE is not set
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_NET_SELFTESTS=y
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_PAGE_POOL_STATS=y
+CONFIG_FAILOVER=m
+CONFIG_ETHTOOL_NETLINK=y
+
+#
+# Device Drivers
+#
+CONFIG_ARM_AMBA=y
+CONFIG_TEGRA_AHB=y
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_DOMAINS_GENERIC=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_PCIE_DPC=y
+CONFIG_PCIE_PTM=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_STUB=m
+CONFIG_PCI_DOE=y
+CONFIG_PCI_ECAM=y
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
+CONFIG_PCI_LABEL=y
+# CONFIG_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# PCI controller drivers
+#
+# CONFIG_PCIE_ALTERA is not set
+CONFIG_PCIE_BRCMSTB=m
+# CONFIG_PCI_FTPCI100 is not set
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCIE_MEDIATEK=m
+# CONFIG_PCIE_MICROCHIP_HOST is not set
+CONFIG_PCI_TEGRA=y
+CONFIG_PCIE_ROCKCHIP=y
+CONFIG_PCIE_ROCKCHIP_HOST=m
+# CONFIG_PCI_V3_SEMI is not set
+# CONFIG_PCIE_XILINX is not set
+
+#
+# Cadence-based PCIe controllers
+#
+CONFIG_PCIE_CADENCE=y
+CONFIG_PCIE_CADENCE_HOST=y
+CONFIG_PCIE_CADENCE_PLAT=y
+CONFIG_PCIE_CADENCE_PLAT_HOST=y
+# CONFIG_PCI_J721E_HOST is not set
+# end of Cadence-based PCIe controllers
+
+#
+# DesignWare-based PCIe controllers
+#
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+# CONFIG_PCI_MESON is not set
+CONFIG_PCI_IMX6=y
+CONFIG_PCI_IMX6_HOST=y
+# CONFIG_PCI_LAYERSCAPE is not set
+# CONFIG_PCIE_ARMADA_8K is not set
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+CONFIG_PCIE_ROCKCHIP_DW_HOST=y
+CONFIG_PCI_EXYNOS=m
+CONFIG_PCI_DRA7XX=m
+CONFIG_PCI_DRA7XX_HOST=m
+# end of DesignWare-based PCIe controllers
+
+#
+# Mobiveil-based PCIe controllers
+#
+# end of Mobiveil-based PCIe controllers
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+# CONFIG_PCI_SW_SWITCHTEC is not set
+# end of PCI switch controller drivers
+
+CONFIG_CXL_BUS=m
+CONFIG_CXL_PCI=m
+# CONFIG_CXL_MEM_RAW_COMMANDS is not set
+CONFIG_CXL_MEM=m
+CONFIG_CXL_PORT=m
+CONFIG_CXL_SUSPEND=y
+# CONFIG_PCCARD is not set
+# CONFIG_RAPIDIO is not set
+
+#
+# Generic Driver Options
+#
+CONFIG_AUXILIARY_BUS=y
+# CONFIG_UEVENT_HELPER is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEVTMPFS_SAFE=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_DEBUG=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_FW_LOADER_SYSFS=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_LOADER_COMPRESS_XZ=y
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+CONFIG_FW_CACHE=y
+CONFIG_FW_UPLOAD=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_SYS_HYPERVISOR=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_SOC_BUS=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_AC97=m
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_W1=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SCCB=m
+CONFIG_REGMAP_SPI_AVMM=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+CONFIG_GENERIC_ARCH_TOPOLOGY=y
+# CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+CONFIG_ARM_CCI=y
+CONFIG_ARM_CCI400_COMMON=y
+CONFIG_ARM_CCI400_PORT_CTRL=y
+# CONFIG_BRCMSTB_GISB_ARB is not set
+# CONFIG_MOXTET is not set
+# CONFIG_IMX_WEIM is not set
+CONFIG_MVEBU_MBUS=y
+CONFIG_OMAP_INTERCONNECT=y
+CONFIG_OMAP_OCP2SCP=m
+CONFIG_SUN50I_DE2_BUS=y
+CONFIG_SUNXI_RSB=y
+# CONFIG_TEGRA_GMI is not set
+CONFIG_TI_PWMSS=y
+CONFIG_TI_SYSC=y
+CONFIG_VEXPRESS_CONFIG=y
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=m
+CONFIG_MHI_BUS_EP=m
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+CONFIG_ARM_SCMI_PROTOCOL=y
+# CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set
+CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
+CONFIG_ARM_SCMI_HAVE_SHMEM=y
+CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y
+CONFIG_ARM_SCMI_TRANSPORT_SMC=y
+# CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set
+CONFIG_ARM_SCMI_POWER_DOMAIN=m
+CONFIG_ARM_SCMI_POWER_CONTROL=m
+# end of ARM System Control and Management Interface Protocol
+
+# CONFIG_ARM_SCPI_PROTOCOL is not set
+# CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y
+CONFIG_RASPBERRYPI_FIRMWARE=y
+CONFIG_QCOM_SCM=m
+# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+CONFIG_SYSFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_TRUSTED_FOUNDATIONS=y
+# CONFIG_TURRIS_MOX_RWTM is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_PARAMS_FROM_FDT=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_GENERIC_STUB=y
+CONFIG_EFI_ARMSTUB_DTB_LOADER=y
+# CONFIG_EFI_BOOTLOADER_CONTROL is not set
+# CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+CONFIG_RESET_ATTACK_MITIGATION=y
+# CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
+CONFIG_EFI_COCO_SECRET=y
+# end of EFI (Extensible Firmware Interface) Support
+
+# CONFIG_IMX_DSP is not set
+# CONFIG_IMX_SCU is not set
+CONFIG_ARM_PSCI_FW=y
+CONFIG_HAVE_ARM_SMCCC=y
+CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
+CONFIG_ARM_SMCCC_SOC_ID=y
+
+#
+# Tegra firmware driver
+#
+# CONFIG_TEGRA_IVC is not set
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_GNSS=m
+CONFIG_GNSS_USB=m
+CONFIG_MTD=y
+# CONFIG_MTD_TESTS is not set
+
+#
+# Partition parsers
+#
+CONFIG_MTD_AR7_PARTS=m
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_OF_PARTS=m
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+
+#
+# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK.
+#
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+# CONFIG_SM_FTL is not set
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PHYSMAP_OF is not set
+CONFIG_MTD_PHYSMAP_GPIO_ADDR=y
+CONFIG_MTD_PCI=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
+# CONFIG_MTD_MCHP23K256 is not set
+# CONFIG_MTD_MCHP48L640 is not set
+CONFIG_MTD_SST25L=m
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
+#
+# NAND
+#
+CONFIG_MTD_NAND_CORE=y
+CONFIG_MTD_ONENAND=y
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+# CONFIG_MTD_ONENAND_GENERIC is not set
+CONFIG_MTD_ONENAND_OMAP2=m
+# CONFIG_MTD_ONENAND_OTP is not set
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_RAW_NAND=m
+
+#
+# Raw/parallel NAND flash controllers
+#
+# CONFIG_MTD_NAND_DENALI_PCI is not set
+# CONFIG_MTD_NAND_DENALI_DT is not set
+CONFIG_MTD_NAND_OMAP2=m
+# CONFIG_MTD_NAND_OMAP_BCH is not set
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_ORION=m
+CONFIG_MTD_NAND_MARVELL=m
+# CONFIG_MTD_NAND_BRCMNAND is not set
+CONFIG_MTD_NAND_GPMI_NAND=m
+CONFIG_MTD_NAND_MXC=m
+CONFIG_MTD_NAND_SUNXI=m
+CONFIG_MTD_NAND_MXIC=m
+CONFIG_MTD_NAND_TEGRA=m
+# CONFIG_MTD_NAND_GPIO is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+CONFIG_MTD_NAND_CADENCE=m
+CONFIG_MTD_NAND_ARASAN=m
+# CONFIG_MTD_NAND_INTEL_LGM is not set
+CONFIG_MTD_NAND_ROCKCHIP=m
+CONFIG_MTD_NAND_PL35X=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+CONFIG_MTD_SPI_NAND=m
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
+CONFIG_MTD_NAND_ECC_MXIC=y
+# end of ECC engine support
+# end of NAND
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# CONFIG_MTD_LPDDR2_NVM is not set
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set
+CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_HYPERBUS=m
+CONFIG_DTC=y
+CONFIG_OF=y
+# CONFIG_OF_UNITTEST is not set
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_KOBJ=y
+CONFIG_OF_DYNAMIC=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_RESERVED_MEM=y
+CONFIG_OF_RESOLVE=y
+CONFIG_OF_OVERLAY=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+# CONFIG_PARPORT_PC is not set
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_CDROM=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+# CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_ZRAM_MULTI_COMP=y
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLK_DEV_RNBD=y
+CONFIG_BLK_DEV_RNBD_CLIENT=m
+CONFIG_BLK_DEV_RNBD_SERVER=m
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+# CONFIG_NVME_MULTIPATH is not set
+# CONFIG_NVME_VERBOSE_ERRORS is not set
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+# CONFIG_NVME_FC is not set
+# CONFIG_NVME_TCP is not set
+# CONFIG_NVME_AUTH is not set
+CONFIG_NVME_TARGET=m
+# CONFIG_NVME_TARGET_PASSTHRU is not set
+# CONFIG_NVME_TARGET_LOOP is not set
+CONFIG_NVME_TARGET_RDMA=m
+# CONFIG_NVME_TARGET_FC is not set
+# CONFIG_NVME_TARGET_TCP is not set
+# CONFIG_NVME_TARGET_AUTH is not set
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_PHANTOM is not set
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_SMPRO_ERRMON=m
+CONFIG_SMPRO_MISC=m
+CONFIG_GEHC_ACHC=m
+# CONFIG_HP_ILO is not set
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+CONFIG_SRAM=y
+CONFIG_SRAM_EXEC=y
+CONFIG_DW_XDATA_PCIE=m
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_XILINX_SDFEC=m
+CONFIG_MISC_RTSX=m
+CONFIG_HISI_HIKEY_USB=m
+# CONFIG_OPEN_DICE is not set
+CONFIG_VCPU_STALL_DETECTOR=m
+CONFIG_C2PORT=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_IDT_89HPESX is not set
+# CONFIG_EEPROM_EE1004 is not set
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+# CONFIG_SENSORS_LIS3_SPI is not set
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+# CONFIG_ECHO is not set
+CONFIG_BCM_VK=m
+CONFIG_BCM_VK_TTY=y
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_UACCE=m
+# CONFIG_PVPANIC is not set
+CONFIG_GP_PCI1XXXX=m
+# end of Misc devices
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_COMMON=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_PROC_FS is not set
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_BLK_DEV_BSG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+CONFIG_SCSI_HPSA=m
+# CONFIG_SCSI_3W_9XXX is not set
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_ADVANSYS=m
+# CONFIG_SCSI_ARCMSR is not set
+CONFIG_SCSI_ESAS2R=m
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
+# CONFIG_SCSI_HPTIOP is not set
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
+# CONFIG_SCSI_MYRB is not set
+# CONFIG_SCSI_MYRS is not set
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_FDOMAIN=m
+CONFIG_SCSI_FDOMAIN_PCI=m
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+CONFIG_SCSI_STEX=m
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_QEDI is not set
+# CONFIG_QEDF is not set
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+# CONFIG_SCSI_EFCT is not set
+# CONFIG_SCSI_DC395x is not set
+CONFIG_SCSI_AM53C974=m
+# CONFIG_SCSI_NSP32 is not set
+CONFIG_SCSI_WD719X=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_ATA=m
+CONFIG_SATA_HOST=y
+CONFIG_PATA_TIMINGS=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_FORCE=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_AHCI_PLATFORM=m
+# CONFIG_AHCI_DM816 is not set
+CONFIG_AHCI_DWC=m
+CONFIG_AHCI_IMX=m
+# CONFIG_AHCI_CEVA is not set
+CONFIG_AHCI_MVEBU=m
+CONFIG_AHCI_SUNXI=m
+CONFIG_AHCI_TEGRA=m
+# CONFIG_SATA_INIC162X is not set
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+# CONFIG_SATA_DWC is not set
+CONFIG_SATA_HIGHBANK=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+CONFIG_PATA_ARTOP=m
+# CONFIG_PATA_ATIIXP is not set
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+CONFIG_PATA_IMX=m
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+# CONFIG_PATA_NETCELL is not set
+CONFIG_PATA_NINJA32=m
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_OF_PLATFORM=m
+# CONFIG_PATA_RZ1000 is not set
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_ATA_GENERIC=m
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+# CONFIG_MD_CLUSTER is not set
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+# CONFIG_DM_WRITECACHE is not set
+CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_HST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+# CONFIG_DM_INTEGRITY is not set
+CONFIG_DM_AUDIT=y
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_REMOTE_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
+CONFIG_EQUALIZER=m
+# CONFIG_NET_FC is not set
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+# CONFIG_IPVTAP is not set
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_GTP=m
+CONFIG_AMT=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_TUN=m
+CONFIG_TAP=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+CONFIG_VSOCKMON=m
+CONFIG_MHI_NET=m
+# CONFIG_ARCNET is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_ENI is not set
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+# CONFIG_ATM_IDT77252 is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+# CONFIG_ATM_HE is not set
+CONFIG_ATM_SOLOS=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_B53=m
+# CONFIG_B53_SPI_DRIVER is not set
+CONFIG_B53_MDIO_DRIVER=m
+# CONFIG_B53_MMAP_DRIVER is not set
+# CONFIG_B53_SRAB_DRIVER is not set
+# CONFIG_B53_SERDES is not set
+CONFIG_NET_DSA_BCM_SF2=m
+# CONFIG_NET_DSA_LOOP is not set
+CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m
+# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
+# CONFIG_NET_DSA_MT7530 is not set
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_PTP=y
+CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI=m
+CONFIG_NET_DSA_MV88E6XXX=m
+# CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_MSCC_FELIX_DSA_LIB=m
+CONFIG_NET_DSA_MSCC_OCELOT_EXT=m
+CONFIG_NET_DSA_MSCC_FELIX=m
+CONFIG_NET_DSA_MSCC_SEVILLE=m
+CONFIG_NET_DSA_AR9331=m
+# CONFIG_NET_DSA_QCA8K is not set
+CONFIG_NET_DSA_SJA1105=m
+CONFIG_NET_DSA_SJA1105_PTP=y
+# CONFIG_NET_DSA_SJA1105_TAS is not set
+CONFIG_NET_DSA_XRS700X=m
+CONFIG_NET_DSA_XRS700X_I2C=m
+CONFIG_NET_DSA_XRS700X_MDIO=m
+CONFIG_NET_DSA_REALTEK=m
+CONFIG_NET_DSA_REALTEK_MDIO=m
+CONFIG_NET_DSA_REALTEK_SMI=m
+CONFIG_NET_DSA_REALTEK_RTL8365MB=m
+CONFIG_NET_DSA_REALTEK_RTL8366RB=m
+# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
+CONFIG_NET_DSA_VITESSE_VSC73XX=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+# CONFIG_SLICOSS is not set
+CONFIG_NET_VENDOR_ALLWINNER=y
+CONFIG_SUN4I_EMAC=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+# CONFIG_ALTERA_TSE is not set
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
+CONFIG_NET_VENDOR_AMD=y
+# CONFIG_AMD8111_ETH is not set
+CONFIG_PCNET32=m
+CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ASIX is not set
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_VENDOR_BROADCOM=y
+# CONFIG_B44 is not set
+# CONFIG_BCMGENET is not set
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+# CONFIG_SYSTEMPORT is not set
+CONFIG_BNXT=m
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+# CONFIG_BNXT_DCB is not set
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_CADENCE=y
+# CONFIG_MACB is not set
+CONFIG_NET_CALXEDA_XGMAC=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_CHELSIO_INLINE_CRYPTO=y
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_CS89x0=m
+CONFIG_CS89x0_PLATFORM=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_NET_VENDOR_CORTINA=y
+CONFIG_GEMINI_ETHERNET=m
+CONFIG_NET_VENDOR_DAVICOM=y
+# CONFIG_DM9000 is not set
+CONFIG_DM9051=m
+# CONFIG_DNET is not set
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_ENGLEDER=y
+CONFIG_TSNEP=m
+# CONFIG_TSNEP_SELFTESTS is not set
+CONFIG_NET_VENDOR_EZCHIP=y
+# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_FARADAY=y
+# CONFIG_FTMAC100 is not set
+# CONFIG_FTGMAC100 is not set
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_FEC=y
+# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
+# CONFIG_GIANFAR is not set
+# CONFIG_FSL_DPAA2_SWITCH is not set
+CONFIG_FSL_ENETC_CORE=m
+CONFIG_FSL_ENETC=m
+CONFIG_FSL_ENETC_VF=m
+CONFIG_FSL_ENETC_IERB=m
+CONFIG_FSL_ENETC_MDIO=m
+CONFIG_FSL_ENETC_PTP_CLOCK=m
+CONFIG_FSL_ENETC_QOS=y
+CONFIG_NET_VENDOR_FUNGIBLE=y
+CONFIG_FUN_CORE=m
+CONFIG_FUN_ETH=m
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_GVE=m
+CONFIG_NET_VENDOR_HISILICON=y
+# CONFIG_HIX5HD2_GMAC is not set
+# CONFIG_HISI_FEMAC is not set
+# CONFIG_HIP04_ETH is not set
+# CONFIG_HNS_DSAF is not set
+# CONFIG_HNS_ENET is not set
+# CONFIG_HNS3 is not set
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGBVF=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCB=y
+CONFIG_IXGBEVF=m
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+CONFIG_IAVF=m
+CONFIG_I40EVF=m
+# CONFIG_ICE is not set
+# CONFIG_FM10K is not set
+# CONFIG_IGC is not set
+CONFIG_JME=m
+CONFIG_NET_VENDOR_ADI=y
+CONFIG_ADIN1110=m
+CONFIG_NET_VENDOR_LITEX=y
+CONFIG_LITEX_LITEETH=m
+CONFIG_NET_VENDOR_MARVELL=y
+# CONFIG_MV643XX_ETH is not set
+CONFIG_MVMDIO=m
+# CONFIG_MVNETA_BM_ENABLE is not set
+CONFIG_MVNETA=m
+CONFIG_MVPP2=m
+# CONFIG_MVPP2_PTP is not set
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_PRESTERA=m
+CONFIG_PRESTERA_PCI=m
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+# CONFIG_MLX5_FPGA is not set
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_BRIDGE=y
+CONFIG_MLX5_CORE_EN_DCB=y
+# CONFIG_MLX5_CORE_IPOIB is not set
+CONFIG_MLX5_EN_MACSEC=y
+CONFIG_MLX5_SW_STEERING=y
+CONFIG_MLX5_SF=y
+CONFIG_MLX5_SF_MANAGER=y
+# CONFIG_MLXSW_CORE is not set
+# CONFIG_MLXFW is not set
+CONFIG_NET_VENDOR_MICREL=y
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+# CONFIG_ENCX24J600 is not set
+# CONFIG_LAN743X is not set
+# CONFIG_LAN966X_SWITCH is not set
+# CONFIG_VCAP is not set
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_MSCC_OCELOT_SWITCH_LIB=m
+CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_NET_VENDOR_MICROSOFT=y
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+# CONFIG_NFP_APP_FLOWER is not set
+CONFIG_NFP_APP_ABM_NIC=y
+# CONFIG_NFP_DEBUG is not set
+CONFIG_NET_VENDOR_8390=y
+# CONFIG_AX88796 is not set
+CONFIG_NE2K_PCI=m
+CONFIG_NET_VENDOR_NVIDIA=y
+# CONFIG_FORCEDETH is not set
+CONFIG_NET_VENDOR_OKI=y
+# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_PENSANDO=y
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QEDE=m
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_QUALCOMM=y
+# CONFIG_QCA7000_SPI is not set
+# CONFIG_QCOM_EMAC is not set
+CONFIG_RMNET=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+# CONFIG_ROCKER is not set
+CONFIG_NET_VENDOR_SAMSUNG=y
+# CONFIG_SXGBE_ETH is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+# CONFIG_SIS900 is not set
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_SFC_SIENA=m
+CONFIG_SFC_SIENA_MTD=y
+CONFIG_SFC_SIENA_MCDI_MON=y
+CONFIG_SFC_SIENA_MCDI_LOGGING=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC91X=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_SOCIONEXT=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+# CONFIG_DWMAC_DWC_QOS_ETH is not set
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_SOCFPGA=m
+CONFIG_DWMAC_SUNXI=m
+CONFIG_DWMAC_SUN8I=m
+CONFIG_DWMAC_IMX8=m
+# CONFIG_DWMAC_INTEL_PLAT is not set
+CONFIG_DWMAC_TEGRA=m
+# CONFIG_DWMAC_LOONGSON is not set
+# CONFIG_STMMAC_PCI is not set
+CONFIG_NET_VENDOR_SUN=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SUNPLUS=y
+CONFIG_SP7021_EMAC=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+CONFIG_TI_DAVINCI_EMAC=m
+CONFIG_TI_DAVINCI_MDIO=m
+CONFIG_TI_CPSW_PHY_SEL=y
+CONFIG_TI_CPSW=m
+CONFIG_TI_CPSW_SWITCHDEV=m
+# CONFIG_TI_CPTS is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VERTEXCOM=y
+CONFIG_MSE102X=m
+CONFIG_NET_VENDOR_VIA=y
+# CONFIG_VIA_RHINE is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WANGXUN=y
+CONFIG_LIBWX=m
+CONFIG_NGBE=m
+CONFIG_TXGBE=m
+CONFIG_NET_VENDOR_WIZNET=y
+# CONFIG_WIZNET_W5100 is not set
+# CONFIG_WIZNET_W5300 is not set
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_EMACLITE=m
+CONFIG_XILINX_AXI_EMAC=m
+CONFIG_XILINX_LL_TEMAC=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+CONFIG_SKFP=m
+# CONFIG_HIPPI is not set
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
+CONFIG_PHYLIB_LEDS=y
+CONFIG_FIXED_PHY=y
+CONFIG_SFP=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+CONFIG_ADIN_PHY=m
+CONFIG_ADIN1100_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM84881_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+# CONFIG_CORTINA_PHY is not set
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+# CONFIG_INTEL_XWAY_PHY is not set
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+# CONFIG_MARVELL_10G_PHY is not set
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
+CONFIG_MEDIATEK_GE_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_T1S_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MOTORCOMM_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_CBTX_PHY=m
+CONFIG_NXP_C45_TJA11XX_PHY=m
+CONFIG_NXP_TJA11XX_PHY=m
+CONFIG_NCN26000_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_DP83TD510_PHY=m
+CONFIG_VITESSE_PHY=m
+# CONFIG_XILINX_GMII2RGMII is not set
+# CONFIG_MICREL_KS8995MA is not set
+CONFIG_PSE_CONTROLLER=y
+CONFIG_PSE_REGULATOR=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_VCAN=m
+# CONFIG_CAN_VXCAN is not set
+CONFIG_CAN_NETLINK=y
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_RX_OFFLOAD=y
+CONFIG_CAN_CAN327=m
+# CONFIG_CAN_FLEXCAN is not set
+# CONFIG_CAN_GRCAN is not set
+CONFIG_CAN_KVASER_PCIEFD=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_SUN4I=m
+# CONFIG_CAN_TI_HECC is not set
+# CONFIG_CAN_C_CAN is not set
+# CONFIG_CAN_CC770 is not set
+CONFIG_CAN_CTUCANFD=m
+CONFIG_CAN_CTUCANFD_PCI=m
+CONFIG_CAN_CTUCANFD_PLATFORM=m
+# CONFIG_CAN_IFI_CANFD is not set
+# CONFIG_CAN_M_CAN is not set
+# CONFIG_CAN_PEAK_PCIEFD is not set
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_F81601=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_SJA1000_ISA=m
+# CONFIG_CAN_SJA1000_PLATFORM is not set
+CONFIG_CAN_SOFTING=m
+
+#
+# CAN SPI interfaces
+#
+# CONFIG_CAN_HI311X is not set
+# CONFIG_CAN_MCP251X is not set
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY is not set
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB=m
+CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+# CONFIG_CAN_MCBA_USB is not set
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+# CONFIG_CAN_DEBUG_DEVICES is not set
+
+#
+# MCTP Device Drivers
+#
+CONFIG_MCTP_SERIAL=m
+CONFIG_MCTP_TRANSPORT_I2C=m
+# end of MCTP Device Drivers
+
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_FWNODE_MDIO=y
+CONFIG_OF_MDIO=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_SUN4I=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_GPIO=m
+# CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MVUSB=m
+CONFIG_MDIO_MSCC_MIIM=m
+# CONFIG_MDIO_IPQ4019 is not set
+CONFIG_MDIO_IPQ8064=m
+
+#
+# MDIO Multiplexers
+#
+CONFIG_MDIO_BUS_MUX=m
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+CONFIG_PCS_LYNX=m
+# end of PCS device drivers
+
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+
+#
+# Host-side USB support is needed for USB Network Adapter support
+#
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8153_ECM=m
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+# CONFIG_ATH9K_WOW is not set
+CONFIG_ATH9K_RFKILL=y
+# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_PCI_NO_EEPROM=m
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+# CONFIG_ATH9K_HWRNG is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_TRACING=y
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_AHB is not set
+# CONFIG_ATH10K_SDIO is not set
+CONFIG_ATH10K_USB=m
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_DEBUGFS is not set
+# CONFIG_ATH10K_TRACING is not set
+# CONFIG_WCN36XX is not set
+CONFIG_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_TRACING is not set
+CONFIG_ATH12K=m
+# CONFIG_ATH12K_DEBUG is not set
+# CONFIG_ATH12K_TRACING is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+# CONFIG_ATMEL is not set
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_WLAN_VENDOR_INTEL=y
+# CONFIG_IPW2100 is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+# CONFIG_HERMES is not set
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+# CONFIG_MWIFIEX is not set
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+# CONFIG_MT76x0U is not set
+# CONFIG_MT76x0E is not set
+# CONFIG_MT76x2E is not set
+# CONFIG_MT76x2U is not set
+# CONFIG_MT7603E is not set
+# CONFIG_MT7615E is not set
+# CONFIG_MT7663U is not set
+# CONFIG_MT7663S is not set
+# CONFIG_MT7915E is not set
+# CONFIG_MT7921E is not set
+# CONFIG_MT7921S is not set
+# CONFIG_MT7921U is not set
+# CONFIG_MT7996E is not set
+CONFIG_WLAN_VENDOR_MICROCHIP=y
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set
+CONFIG_WLAN_VENDOR_PURELIFI=y
+CONFIG_PLFXLC=m
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+# CONFIG_RTL8XXXU_UNTESTED is not set
+# CONFIG_RTW88 is not set
+CONFIG_RTW89=m
+CONFIG_RTW89_CORE=m
+CONFIG_RTW89_PCI=m
+CONFIG_RTW89_8852A=m
+CONFIG_RTW89_8852B=m
+CONFIG_RTW89_8852C=m
+CONFIG_RTW89_8852AE=m
+CONFIG_RTW89_8852BE=m
+CONFIG_RTW89_8852CE=m
+# CONFIG_RTW89_DEBUGMSG is not set
+# CONFIG_RTW89_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+# CONFIG_RSI_SDIO is not set
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_SILABS=y
+CONFIG_WFX=m
+CONFIG_WLAN_VENDOR_ST=y
+# CONFIG_CW1200 is not set
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WLAN_VENDOR_ZYDAS=y
+# CONFIG_USB_ZD1201 is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+# CONFIG_QTNFMAC_PCIE is not set
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_VIRT_WIFI=m
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+CONFIG_IEEE802154_MRF24J40=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+# CONFIG_IEEE802154_CA8210 is not set
+# CONFIG_IEEE802154_MCR20A is not set
+# CONFIG_IEEE802154_HWSIM is not set
+
+#
+# Wireless WAN
+#
+CONFIG_WWAN=y
+# CONFIG_WWAN_DEBUGFS is not set
+# CONFIG_WWAN_HWSIM is not set
+CONFIG_MHI_WWAN_CTRL=m
+CONFIG_MHI_WWAN_MBIM=m
+CONFIG_IOSM=m
+CONFIG_MTK_T7XX=m
+# end of Wireless WAN
+
+CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
+# CONFIG_VMXNET3 is not set
+CONFIG_USB4_NET=m
+CONFIG_NETDEVSIM=m
+CONFIG_NET_FAILOVER=m
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+CONFIG_INPUT_VIVALDIFMAP=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_APMPOWER is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
+CONFIG_KEYBOARD_ADP5588=m
+# CONFIG_KEYBOARD_ADP5589 is not set
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+# CONFIG_KEYBOARD_QT1070 is not set
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_DLINK_DIR685 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+CONFIG_KEYBOARD_LM8323=m
+# CONFIG_KEYBOARD_LM8333 is not set
+CONFIG_KEYBOARD_MAX7359=m
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+CONFIG_KEYBOARD_SNVS_PWRKEY=m
+CONFIG_KEYBOARD_IMX=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_TEGRA=m
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_PINEPHONE=m
+# CONFIG_KEYBOARD_SAMSUNG is not set
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_STMPE is not set
+CONFIG_KEYBOARD_SUN4I_LRADC=m
+CONFIG_KEYBOARD_IQS62X=m
+CONFIG_KEYBOARD_OMAP4=m
+# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
+CONFIG_KEYBOARD_TWL4030=m
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_CROS_EC=m
+# CONFIG_KEYBOARD_CAP11XX is not set
+# CONFIG_KEYBOARD_BCM is not set
+# CONFIG_KEYBOARD_CYPRESS_SF is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_SMBUS=y
+# CONFIG_MOUSE_SERIAL is not set
+CONFIG_MOUSE_APPLETOUCH=m
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_CYAPA is not set
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+# CONFIG_MOUSE_ELAN_I2C_SMBUS is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_GPIO is not set
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+CONFIG_TOUCHSCREEN_ADC=m
+# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_BU21013 is not set
+# CONFIG_TOUCHSCREEN_BU21029 is not set
+# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMA140 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
+# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
+# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
+# CONFIG_TOUCHSCREEN_CYTTSP5 is not set
+# CONFIG_TOUCHSCREEN_DA9052 is not set
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_EGALAX is not set
+# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
+CONFIG_TOUCHSCREEN_EXC3000=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_HIDEEP=m
+CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
+CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m
+# CONFIG_TOUCHSCREEN_ILI210X is not set
+CONFIG_TOUCHSCREEN_ILITEK=m
+CONFIG_TOUCHSCREEN_S6SY761=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+# CONFIG_TOUCHSCREEN_EKTF2127 is not set
+# CONFIG_TOUCHSCREEN_ELAN is not set
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
+# CONFIG_TOUCHSCREEN_MAX11801 is not set
+CONFIG_TOUCHSCREEN_MCS5000=m
+# CONFIG_TOUCHSCREEN_MMS114 is not set
+# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
+# CONFIG_TOUCHSCREEN_MSG2638 is not set
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS=m
+CONFIG_TOUCHSCREEN_IMAGIS=m
+# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
+CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+# CONFIG_TOUCHSCREEN_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+# CONFIG_TOUCHSCREEN_TS4800 is not set
+# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+# CONFIG_TOUCHSCREEN_TSC2004 is not set
+CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
+# CONFIG_TOUCHSCREEN_RM_TS is not set
+# CONFIG_TOUCHSCREEN_SILEAD is not set
+# CONFIG_TOUCHSCREEN_SIS_I2C is not set
+# CONFIG_TOUCHSCREEN_ST1232 is not set
+# CONFIG_TOUCHSCREEN_STMFTS is not set
+CONFIG_TOUCHSCREEN_STMPE=m
+CONFIG_TOUCHSCREEN_SUN4I=m
+CONFIG_TOUCHSCREEN_SUR40=m
+# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
+# CONFIG_TOUCHSCREEN_SX8654 is not set
+CONFIG_TOUCHSCREEN_TPS6507X=m
+# CONFIG_TOUCHSCREEN_ZET6223 is not set
+# CONFIG_TOUCHSCREEN_ZFORCE is not set
+CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
+# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
+# CONFIG_TOUCHSCREEN_IQS5XX is not set
+CONFIG_TOUCHSCREEN_ZINITIX=m
+CONFIG_TOUCHSCREEN_HIMAX_HX83112B=m
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_E3X0_BUTTON is not set
+# CONFIG_INPUT_MC13783_PWRBUTTON is not set
+CONFIG_INPUT_MMA8450=m
+# CONFIG_INPUT_GPIO_BEEPER is not set
+# CONFIG_INPUT_GPIO_DECODER is not set
+# CONFIG_INPUT_GPIO_VIBRA is not set
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+# CONFIG_INPUT_KXTJ9 is not set
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+# CONFIG_INPUT_REGULATOR_HAPTIC is not set
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_TWL4030_PWRBUTTON=m
+CONFIG_INPUT_TWL4030_VIBRA=m
+CONFIG_INPUT_TWL6040_VIBRA=m
+CONFIG_INPUT_UINPUT=m
+# CONFIG_INPUT_PALMAS_PWRBUTTON is not set
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PWM_BEEPER is not set
+# CONFIG_INPUT_PWM_VIBRA is not set
+CONFIG_INPUT_RK805_PWRKEY=m
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_DA7280_HAPTICS is not set
+# CONFIG_INPUT_DA9052_ONKEY is not set
+# CONFIG_INPUT_ADXL34X is not set
+CONFIG_INPUT_IBM_PANEL=m
+# CONFIG_INPUT_IMS_PCU is not set
+# CONFIG_INPUT_IQS269A is not set
+# CONFIG_INPUT_IQS626A is not set
+# CONFIG_INPUT_IQS7222 is not set
+# CONFIG_INPUT_CMA3000 is not set
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2665_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
+# CONFIG_INPUT_RT5120_PWRKEY is not set
+CONFIG_RMI4_CORE=m
+# CONFIG_RMI4_I2C is not set
+# CONFIG_RMI4_SPI is not set
+# CONFIG_RMI4_SMB is not set
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+# CONFIG_RMI4_F34 is not set
+CONFIG_RMI4_F3A=y
+# CONFIG_RMI4_F54 is not set
+# CONFIG_RMI4_F55 is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PARKBD is not set
+CONFIG_SERIO_AMBAKMI=m
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+CONFIG_SERIO_ALTERA_PS2=m
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_SERIO_APBPS2 is not set
+CONFIG_SERIO_SUN4I_PS2=m
+CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_USERIO is not set
+# CONFIG_GAMEPORT is not set
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LEGACY_TIOCSTI is not set
+CONFIG_LDISC_AUTOLOAD=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+CONFIG_SERIAL_8250_16550A_VARIANTS=y
+# CONFIG_SERIAL_8250_FINTEK is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCILIB=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_PCI1XXXX=m
+CONFIG_SERIAL_8250_DWLIB=y
+CONFIG_SERIAL_8250_FSL=y
+CONFIG_SERIAL_8250_DW=y
+# CONFIG_SERIAL_8250_RT288X is not set
+# CONFIG_SERIAL_8250_OMAP is not set
+CONFIG_SERIAL_8250_PERICOM=y
+CONFIG_SERIAL_8250_TEGRA=y
+CONFIG_SERIAL_OF_PLATFORM=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_EARLYCON_SEMIHOST=y
+CONFIG_SERIAL_SAMSUNG=y
+CONFIG_SERIAL_SAMSUNG_UARTS=4
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_TEGRA=y
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_IMX_EARLYCON=y
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_VT8500=y
+CONFIG_SERIAL_VT8500_CONSOLE=y
+CONFIG_SERIAL_OMAP=y
+CONFIG_SERIAL_OMAP_CONSOLE=y
+# CONFIG_SERIAL_SIFIVE is not set
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+CONFIG_SERIAL_ARC=y
+CONFIG_SERIAL_ARC_CONSOLE=y
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_FSL_LINFLEXUART is not set
+# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
+# CONFIG_SERIAL_ST_ASC is not set
+# CONFIG_SERIAL_SPRD is not set
+# CONFIG_SERIAL_MVEBU_UART is not set
+CONFIG_SERIAL_SUNPLUS=y
+CONFIG_SERIAL_SUNPLUS_CONSOLE=y
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_N_GSM=m
+CONFIG_NOZOMI=m
+CONFIG_NULL_TTY=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+# CONFIG_HVC_DCC is not set
+# CONFIG_SERIAL_DEV_BUS is not set
+CONFIG_TTY_PRINTK=m
+CONFIG_TTY_PRINTK_LEVEL=6
+# CONFIG_PRINTER is not set
+# CONFIG_PPDEV is not set
+CONFIG_VIRTIO_CONSOLE=m
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_SSIF_IPMI_BMC=m
+CONFIG_IPMB_DEVICE_INTERFACE=m
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+CONFIG_HW_RANDOM_BA431=m
+CONFIG_HW_RANDOM_BCM2835=m
+CONFIG_HW_RANDOM_IPROC_RNG200=m
+CONFIG_HW_RANDOM_OMAP=m
+CONFIG_HW_RANDOM_OMAP3_ROM=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_EXYNOS=m
+CONFIG_HW_RANDOM_CCTRNG=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
+# CONFIG_APPLICOM is not set
+CONFIG_DEVMEM=y
+CONFIG_DEVPORT=y
+CONFIG_TCG_TPM=y
+CONFIG_TCG_TIS_CORE=m
+# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_TIS_SPI is not set
+CONFIG_TCG_TIS_I2C=m
+CONFIG_TCG_TIS_I2C_CR50=m
+# CONFIG_TCG_TIS_I2C_ATMEL is not set
+# CONFIG_TCG_TIS_I2C_INFINEON is not set
+# CONFIG_TCG_TIS_I2C_NUVOTON is not set
+# CONFIG_TCG_XEN is not set
+# CONFIG_TCG_VTPM_PROXY is not set
+# CONFIG_TCG_TIS_ST33ZP24_I2C is not set
+# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
+CONFIG_XILLYBUS_CLASS=m
+# CONFIG_XILLYBUS is not set
+CONFIG_XILLYUSB=m
+# end of Character devices
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=y
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_GPMUX is not set
+# CONFIG_I2C_MUX_LTC4306 is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+CONFIG_I2C_MUX_PCA954x=m
+# CONFIG_I2C_MUX_PINCTRL is not set
+# CONFIG_I2C_MUX_REG is not set
+# CONFIG_I2C_DEMUX_PINCTRL is not set
+# CONFIG_I2C_MUX_MLXCPLD is not set
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+CONFIG_I2C_ISCH=m
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_NVIDIA_GPU is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_ALTERA=m
+CONFIG_I2C_BCM2835=m
+CONFIG_I2C_BRCMSTB=m
+# CONFIG_I2C_CBUS_GPIO is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_EMEV2 is not set
+CONFIG_I2C_EXYNOS5=m
+CONFIG_I2C_GPIO=y
+# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+CONFIG_I2C_GXP=m
+CONFIG_I2C_IMX=m
+# CONFIG_I2C_IMX_LPI2C is not set
+CONFIG_I2C_MV64XXX=m
+# CONFIG_I2C_NOMADIK is not set
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_OMAP=y
+CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA is not set
+CONFIG_I2C_RK3X=m
+CONFIG_I2C_S3C2410=y
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_SUN6I_P2WI=m
+CONFIG_I2C_TEGRA=y
+CONFIG_I2C_VERSATILE=m
+# CONFIG_I2C_WMT is not set
+# CONFIG_I2C_XILINX is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_CP2615=m
+# CONFIG_I2C_PARPORT is not set
+CONFIG_I2C_PCI1XXXX=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_CROS_EC_TUNNEL=m
+CONFIG_I2C_VIRTIO=m
+# end of I2C Hardware Bus support
+
+# CONFIG_I2C_STUB is not set
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+# CONFIG_I2C_SLAVE_TESTUNIT is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+# CONFIG_I3C is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_ARMADA_3700 is not set
+# CONFIG_SPI_AXI_SPI_ENGINE is not set
+CONFIG_SPI_BCM2835=m
+CONFIG_SPI_BCM2835AUX=m
+# CONFIG_SPI_BCM_QSPI is not set
+CONFIG_SPI_BITBANG=y
+CONFIG_SPI_BUTTERFLY=m
+# CONFIG_SPI_CADENCE is not set
+# CONFIG_SPI_CADENCE_QUADSPI is not set
+# CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_FSL_LPSPI is not set
+# CONFIG_SPI_FSL_QUADSPI is not set
+CONFIG_SPI_GXP=m
+# CONFIG_SPI_NXP_FLEXSPI is not set
+CONFIG_SPI_GPIO=y
+CONFIG_SPI_IMX=m
+CONFIG_SPI_LM70_LLP=m
+# CONFIG_SPI_FSL_SPI is not set
+CONFIG_SPI_MICROCHIP_CORE=m
+CONFIG_SPI_MICROCHIP_CORE_QSPI=m
+# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
+CONFIG_SPI_TI_QSPI=m
+CONFIG_SPI_ORION=m
+CONFIG_SPI_PCI1XXXX=m
+CONFIG_SPI_PL022=m
+# CONFIG_SPI_PXA2XX is not set
+CONFIG_SPI_ROCKCHIP=m
+CONFIG_SPI_ROCKCHIP_SFC=m
+# CONFIG_SPI_S3C64XX is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
+CONFIG_SPI_SN_F_OSPI=m
+CONFIG_SPI_SUN4I=m
+CONFIG_SPI_SUN6I=m
+CONFIG_SPI_SUNPLUS_SP7021=m
+CONFIG_SPI_MXIC=m
+# CONFIG_SPI_TEGRA210_QUAD is not set
+CONFIG_SPI_TEGRA114=m
+CONFIG_SPI_TEGRA20_SFLASH=m
+# CONFIG_SPI_TEGRA20_SLINK is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
+# CONFIG_SPI_AMD is not set
+
+#
+# SPI Multiplexer support
+#
+CONFIG_SPI_MUX=m
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=y
+# CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
+# CONFIG_SPMI is not set
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+CONFIG_OMAP_SSI=m
+
+#
+# HSI clients
+#
+CONFIG_NOKIA_MODEM=m
+CONFIG_CMT_SPEECH=m
+CONFIG_SSI_PROTOCOL=m
+# CONFIG_HSI_CHAR is not set
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+# CONFIG_PPS_CLIENT_GPIO is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+CONFIG_PTP_1588_CLOCK_QORIQ=m
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_IDT82P33=m
+CONFIG_PTP_1588_CLOCK_IDTCM=m
+CONFIG_PTP_1588_CLOCK_OCP=m
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
+CONFIG_PINMUX=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AS3722=y
+CONFIG_PINCTRL_AXP209=m
+CONFIG_PINCTRL_CY8C95X0=m
+CONFIG_PINCTRL_MCP23S08_I2C=m
+CONFIG_PINCTRL_MCP23S08_SPI=m
+CONFIG_PINCTRL_MCP23S08=m
+# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
+# CONFIG_PINCTRL_OCELOT is not set
+CONFIG_PINCTRL_PALMAS=y
+CONFIG_PINCTRL_RK805=m
+CONFIG_PINCTRL_ROCKCHIP=y
+CONFIG_PINCTRL_SINGLE=y
+# CONFIG_PINCTRL_STMFX is not set
+# CONFIG_PINCTRL_SX150X is not set
+CONFIG_PINCTRL_BCM2835=y
+CONFIG_PINCTRL_MADERA=m
+CONFIG_PINCTRL_IMX=y
+CONFIG_PINCTRL_IMX51=y
+CONFIG_PINCTRL_IMX53=y
+CONFIG_PINCTRL_IMX6Q=y
+CONFIG_PINCTRL_IMX8MM=y
+CONFIG_PINCTRL_IMX8MN=y
+CONFIG_PINCTRL_IMX8MP=y
+CONFIG_PINCTRL_IMX8MQ=y
+# CONFIG_PINCTRL_IMX8ULP is not set
+# CONFIG_PINCTRL_IMXRT1050 is not set
+# CONFIG_PINCTRL_IMX93 is not set
+# CONFIG_PINCTRL_IMXRT1170 is not set
+CONFIG_PINCTRL_MVEBU=y
+CONFIG_PINCTRL_ARMADA_370=y
+CONFIG_PINCTRL_ARMADA_375=y
+CONFIG_PINCTRL_ARMADA_38X=y
+CONFIG_PINCTRL_ARMADA_39X=y
+CONFIG_PINCTRL_ARMADA_XP=y
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+CONFIG_PINCTRL_SAMSUNG=y
+CONFIG_PINCTRL_EXYNOS=y
+CONFIG_PINCTRL_EXYNOS_ARM=y
+CONFIG_PINCTRL_SPPCTL=y
+CONFIG_PINCTRL_SUNXI=y
+CONFIG_PINCTRL_SUN4I_A10=y
+CONFIG_PINCTRL_SUN5I=y
+CONFIG_PINCTRL_SUN6I_A31=y
+CONFIG_PINCTRL_SUN6I_A31_R=y
+CONFIG_PINCTRL_SUN8I_A23=y
+CONFIG_PINCTRL_SUN8I_A33=y
+CONFIG_PINCTRL_SUN8I_A83T=y
+CONFIG_PINCTRL_SUN8I_A83T_R=y
+CONFIG_PINCTRL_SUN8I_A23_R=y
+CONFIG_PINCTRL_SUN8I_H3=y
+CONFIG_PINCTRL_SUN8I_H3_R=y
+CONFIG_PINCTRL_SUN8I_V3S=y
+CONFIG_PINCTRL_SUN9I_A80=y
+CONFIG_PINCTRL_SUN9I_A80_R=y
+# CONFIG_PINCTRL_SUN20I_D1 is not set
+# CONFIG_PINCTRL_SUN50I_A64 is not set
+# CONFIG_PINCTRL_SUN50I_A64_R is not set
+# CONFIG_PINCTRL_SUN50I_A100 is not set
+# CONFIG_PINCTRL_SUN50I_A100_R is not set
+# CONFIG_PINCTRL_SUN50I_H5 is not set
+# CONFIG_PINCTRL_SUN50I_H6 is not set
+# CONFIG_PINCTRL_SUN50I_H6_R is not set
+# CONFIG_PINCTRL_SUN50I_H616 is not set
+# CONFIG_PINCTRL_SUN50I_H616_R is not set
+CONFIG_PINCTRL_TEGRA=y
+CONFIG_PINCTRL_TEGRA124=y
+CONFIG_PINCTRL_TEGRA_XUSB=y
+CONFIG_PINCTRL_TI_IODELAY=y
+CONFIG_PINCTRL_WMT=y
+CONFIG_PINCTRL_WM8850=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_OF_GPIO=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_GENERIC=y
+CONFIG_GPIO_REGMAP=m
+
+#
+# Memory mapped GPIO drivers
+#
+# CONFIG_GPIO_74XX_MMIO is not set
+# CONFIG_GPIO_ALTERA is not set
+CONFIG_GPIO_RASPBERRYPI_EXP=m
+CONFIG_GPIO_CADENCE=m
+# CONFIG_GPIO_DWAPB is not set
+CONFIG_GPIO_EN7523=m
+# CONFIG_GPIO_EXAR is not set
+# CONFIG_GPIO_FTGPIO010 is not set
+CONFIG_GPIO_GENERIC_PLATFORM=y
+# CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_HLWD is not set
+CONFIG_GPIO_LOGICVC=m
+CONFIG_GPIO_MB86S7X=m
+# CONFIG_GPIO_MPC8XXX is not set
+CONFIG_GPIO_MVEBU=y
+CONFIG_GPIO_MXC=y
+CONFIG_GPIO_OMAP=y
+CONFIG_GPIO_PL061=y
+CONFIG_GPIO_ROCKCHIP=m
+CONFIG_GPIO_SIFIVE=y
+# CONFIG_GPIO_SYSCON is not set
+CONFIG_GPIO_TEGRA=y
+# CONFIG_GPIO_TS4800 is not set
+CONFIG_GPIO_VF610=y
+CONFIG_GPIO_XILINX=m
+# CONFIG_GPIO_ZEVIO is not set
+# CONFIG_GPIO_AMD_FCH is not set
+CONFIG_GPIO_MSC313=y
+# end of Memory mapped GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+# CONFIG_GPIO_ADNP is not set
+CONFIG_GPIO_FXL6408=m
+# CONFIG_GPIO_GW_PLD is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCA9570=m
+CONFIG_GPIO_PCF857X=m
+# CONFIG_GPIO_TPIC2810 is not set
+# CONFIG_GPIO_TS4900 is not set
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_BD71815=m
+CONFIG_GPIO_BD71828=m
+CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_DA9052=m
+# CONFIG_HTC_EGPIO is not set
+CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_PALMAS=y
+# CONFIG_GPIO_STMPE is not set
+CONFIG_GPIO_TWL4030=y
+CONFIG_GPIO_TWL6040=y
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+# CONFIG_GPIO_PCI_IDIO_16 is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
+# CONFIG_GPIO_RDC321X is not set
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+# CONFIG_GPIO_74X164 is not set
+CONFIG_GPIO_MAX3191X=m
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_PISOSR is not set
+# CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_LATCH=m
+# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_VIRTIO=m
+# CONFIG_GPIO_SIM is not set
+# end of Virtual GPIO drivers
+
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+# CONFIG_W1_MASTER_MATROX is not set
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+# CONFIG_W1_MASTER_MXC is not set
+CONFIG_W1_MASTER_GPIO=m
+CONFIG_HDQ_MASTER_OMAP=m
+# CONFIG_W1_MASTER_SGI is not set
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+# CONFIG_W1_SLAVE_DS2405 is not set
+# CONFIG_W1_SLAVE_DS2408 is not set
+# CONFIG_W1_SLAVE_DS2413 is not set
+# CONFIG_W1_SLAVE_DS2406 is not set
+# CONFIG_W1_SLAVE_DS2423 is not set
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2430=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+# CONFIG_W1_SLAVE_DS2438 is not set
+# CONFIG_W1_SLAVE_DS250X is not set
+# CONFIG_W1_SLAVE_DS2780 is not set
+# CONFIG_W1_SLAVE_DS2781 is not set
+# CONFIG_W1_SLAVE_DS28E04 is not set
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_AS3722=y
+# CONFIG_POWER_RESET_BRCMKONA is not set
+# CONFIG_POWER_RESET_BRCMSTB is not set
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+# CONFIG_POWER_RESET_LINKSTATION is not set
+# CONFIG_POWER_RESET_LTC2952 is not set
+# CONFIG_POWER_RESET_QNAP is not set
+CONFIG_POWER_RESET_REGULATOR=y
+CONFIG_POWER_RESET_RESTART=y
+# CONFIG_POWER_RESET_VERSATILE is not set
+CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+CONFIG_REBOOT_MODE=m
+# CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_NVMEM_REBOOT_MODE=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+# CONFIG_APM_POWER is not set
+# CONFIG_GENERIC_ADC_BATTERY is not set
+CONFIG_IP5XXX_POWER=m
+# CONFIG_TEST_POWER is not set
+CONFIG_CHARGER_ADP5061=m
+CONFIG_BATTERY_CW2015=m
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SAMSUNG_SDI is not set
+CONFIG_BATTERY_SBS=m
+# CONFIG_CHARGER_SBS is not set
+CONFIG_MANAGER_SBS=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+# CONFIG_BATTERY_DA9052 is not set
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+CONFIG_BATTERY_MAX1721X=m
+CONFIG_BATTERY_TWL4030_MADC=m
+CONFIG_BATTERY_RX51=m
+CONFIG_CHARGER_ISP1704=m
+# CONFIG_CHARGER_MAX8903 is not set
+CONFIG_CHARGER_TWL4030=m
+# CONFIG_CHARGER_LP8727 is not set
+CONFIG_CHARGER_GPIO=m
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_LT3651 is not set
+# CONFIG_CHARGER_LTC4162L is not set
+# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+# CONFIG_CHARGER_MAX77976 is not set
+CONFIG_CHARGER_MT6360=m
+CONFIG_CHARGER_MT6370=m
+CONFIG_CHARGER_BQ2415X=m
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_BQ24257 is not set
+# CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_BQ2515X is not set
+# CONFIG_CHARGER_BQ25890 is not set
+# CONFIG_CHARGER_BQ25980 is not set
+# CONFIG_CHARGER_BQ256XX is not set
+CONFIG_CHARGER_RK817=m
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
+CONFIG_BATTERY_RT5033=m
+# CONFIG_CHARGER_RT9455 is not set
+# CONFIG_CHARGER_RT9467 is not set
+# CONFIG_CHARGER_RT9471 is not set
+CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_CROS_PCHG=m
+# CONFIG_CHARGER_UCS1002 is not set
+CONFIG_CHARGER_BD99954=m
+CONFIG_BATTERY_UG3105=m
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_SMPRO=m
+# CONFIG_SENSORS_AD7314 is not set
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+CONFIG_SENSORS_ADM1029=m
+# CONFIG_SENSORS_ADM1031 is not set
+CONFIG_SENSORS_ADM1177=m
+CONFIG_SENSORS_ADM9240=m
+# CONFIG_SENSORS_ADT7310 is not set
+# CONFIG_SENSORS_ADT7410 is not set
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_AHT10=m
+CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
+# CONFIG_SENSORS_AS370 is not set
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_AXI_FAN_CONTROL=m
+CONFIG_SENSORS_ARM_SCMI=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORSAIR_CPRO=m
+CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_DRIVETEMP=m
+CONFIG_SENSORS_DS620=m
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_DA9052_ADC is not set
+CONFIG_SENSORS_I5K_AMB=m
+# CONFIG_SENSORS_F71805F is not set
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FTSTEUTATES=m
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_GPIO_FAN=m
+# CONFIG_SENSORS_GXP_FAN_CTRL is not set
+# CONFIG_SENSORS_HIH6130 is not set
+# CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_IT87 is not set
+CONFIG_SENSORS_JC42=m
+# CONFIG_SENSORS_POWR1220 is not set
+CONFIG_SENSORS_LINEAGE=m
+# CONFIG_SENSORS_LTC2945 is not set
+CONFIG_SENSORS_LTC2947=m
+CONFIG_SENSORS_LTC2947_I2C=m
+CONFIG_SENSORS_LTC2947_SPI=m
+# CONFIG_SENSORS_LTC2990 is not set
+# CONFIG_SENSORS_LTC2992 is not set
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+# CONFIG_SENSORS_LTC4222 is not set
+CONFIG_SENSORS_LTC4245=m
+# CONFIG_SENSORS_LTC4260 is not set
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX127=m
+CONFIG_SENSORS_MAX16065=m
+# CONFIG_SENSORS_MAX1619 is not set
+CONFIG_SENSORS_MAX1668=m
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX31722 is not set
+CONFIG_SENSORS_MAX31730=m
+CONFIG_SENSORS_MAX31760=m
+# CONFIG_SENSORS_MAX6620 is not set
+CONFIG_SENSORS_MAX6621=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+# CONFIG_SENSORS_MAX6697 is not set
+# CONFIG_SENSORS_MAX31790 is not set
+CONFIG_SENSORS_MC34VR500=m
+# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_TC654 is not set
+# CONFIG_SENSORS_TPS23861 is not set
+# CONFIG_SENSORS_MR75203 is not set
+CONFIG_SENSORS_ADCXX=m
+# CONFIG_SENSORS_LM63 is not set
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+CONFIG_SENSORS_LM93=m
+# CONFIG_SENSORS_LM95234 is not set
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_PC87360 is not set
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775_CORE=m
+CONFIG_SENSORS_NCT6775_I2C=m
+# CONFIG_SENSORS_NCT7802 is not set
+# CONFIG_SENSORS_NCT7904 is not set
+# CONFIG_SENSORS_NPCM7XX is not set
+# CONFIG_SENSORS_NZXT_KRAKEN2 is not set
+# CONFIG_SENSORS_NZXT_SMART2 is not set
+# CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
+CONFIG_SENSORS_PWM_FAN=m
+CONFIG_SENSORS_RASPBERRYPI_HWMON=m
+CONFIG_SENSORS_SBTSI=m
+CONFIG_SENSORS_SBRMI=m
+# CONFIG_SENSORS_SHT15 is not set
+CONFIG_SENSORS_SHT21=m
+# CONFIG_SENSORS_SHT3x is not set
+# CONFIG_SENSORS_SHT4x is not set
+# CONFIG_SENSORS_SHTC1 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+CONFIG_SENSORS_SY7636A=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC2305=m
+CONFIG_SENSORS_EMC6W201=m
+# CONFIG_SENSORS_SMSC47M1 is not set
+CONFIG_SENSORS_SMSC47M192=m
+# CONFIG_SENSORS_SMSC47B397 is not set
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_STTS751 is not set
+CONFIG_SENSORS_SMM665=m
+# CONFIG_SENSORS_ADC128D818 is not set
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+# CONFIG_SENSORS_INA209 is not set
+# CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_INA238 is not set
+# CONFIG_SENSORS_INA3221 is not set
+# CONFIG_SENSORS_TC74 is not set
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+# CONFIG_SENSORS_TMP103 is not set
+# CONFIG_SENSORS_TMP108 is not set
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_TMP464=m
+CONFIG_SENSORS_TMP513=m
+# CONFIG_SENSORS_VEXPRESS is not set
+# CONFIG_SENSORS_VIA686A is not set
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+# CONFIG_SENSORS_W83781D is not set
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+# CONFIG_SENSORS_W83L785TS is not set
+CONFIG_SENSORS_W83L786NG=m
+# CONFIG_SENSORS_W83627HF is not set
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_NETLINK=y
+# CONFIG_THERMAL_STATISTICS is not set
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_OF=y
+# CONFIG_THERMAL_WRITABLE_TRIPS is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_BANG_BANG is not set
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
+CONFIG_CPU_THERMAL=y
+CONFIG_CPU_FREQ_THERMAL=y
+# CONFIG_DEVFREQ_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+# CONFIG_THERMAL_MMIO is not set
+# CONFIG_IMX_THERMAL is not set
+CONFIG_IMX8MM_THERMAL=m
+CONFIG_SUN8I_THERMAL=m
+CONFIG_ROCKCHIP_THERMAL=m
+CONFIG_ARMADA_THERMAL=y
+
+#
+# Broadcom thermal drivers
+#
+CONFIG_BCM2711_THERMAL=m
+CONFIG_BCM2835_THERMAL=m
+# end of Broadcom thermal drivers
+
+#
+# Texas Instruments thermal drivers
+#
+CONFIG_TI_SOC_THERMAL=m
+CONFIG_TI_THERMAL=y
+# CONFIG_OMAP3_THERMAL is not set
+CONFIG_OMAP4_THERMAL=y
+CONFIG_OMAP5_THERMAL=y
+CONFIG_DRA752_THERMAL=y
+# end of Texas Instruments thermal drivers
+
+#
+# Samsung thermal drivers
+#
+CONFIG_EXYNOS_THERMAL=y
+# end of Samsung thermal drivers
+
+#
+# NVIDIA Tegra thermal drivers
+#
+CONFIG_TEGRA_SOCTHERM=y
+# end of NVIDIA Tegra thermal drivers
+
+# CONFIG_GENERIC_ADC_THERMAL is not set
+CONFIG_KHADAS_MCU_FAN_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT=y
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_BD957XMUF_WATCHDOG=m
+CONFIG_DA9052_WATCHDOG=m
+# CONFIG_GPIO_WATCHDOG is not set
+# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_ZIIRAVE_WATCHDOG is not set
+CONFIG_ARM_SP805_WATCHDOG=m
+# CONFIG_ARMADA_37XX_WATCHDOG is not set
+# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_FTWDT010_WATCHDOG=m
+CONFIG_S3C2410_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_OMAP_WATCHDOG=m
+CONFIG_ORION_WATCHDOG=m
+CONFIG_SUNXI_WATCHDOG=m
+CONFIG_TWL4030_WATCHDOG=m
+# CONFIG_TS4800_WATCHDOG is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+CONFIG_IMX2_WDT=m
+CONFIG_IMX7ULP_WDT=m
+CONFIG_TEGRA_WATCHDOG=m
+CONFIG_ARM_SMC_WATCHDOG=m
+CONFIG_RTD119X_WATCHDOG=y
+CONFIG_MSC313E_WATCHDOG=m
+CONFIG_SUNPLUS_WATCHDOG=m
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+CONFIG_BCM2835_WDT=m
+CONFIG_GXP_WATCHDOG=m
+# CONFIG_MEN_A21_WDT is not set
+CONFIG_XEN_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+# CONFIG_SSB_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
+CONFIG_BCMA_DRIVER_PCI=y
+# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+# CONFIG_MFD_ALTERA_A10SR is not set
+# CONFIG_MFD_ALTERA_SYSMGR is not set
+# CONFIG_MFD_ACT8945A is not set
+# CONFIG_MFD_SUN4I_GPADC is not set
+# CONFIG_MFD_AS3711 is not set
+CONFIG_MFD_SMPRO=m
+CONFIG_MFD_AS3722=y
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ATMEL_FLEXCOM is not set
+# CONFIG_MFD_ATMEL_HLCDC is not set
+# CONFIG_MFD_BCM590XX is not set
+CONFIG_MFD_BD9571MWV=m
+# CONFIG_MFD_AC100 is not set
+CONFIG_MFD_AXP20X=y
+CONFIG_MFD_AXP20X_I2C=y
+# CONFIG_MFD_AXP20X_RSB is not set
+CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_MADERA=m
+CONFIG_MFD_MADERA_I2C=m
+CONFIG_MFD_MADERA_SPI=m
+CONFIG_MFD_MAX597X=m
+# CONFIG_MFD_CS47L15 is not set
+# CONFIG_MFD_CS47L35 is not set
+# CONFIG_MFD_CS47L85 is not set
+# CONFIG_MFD_CS47L90 is not set
+# CONFIG_MFD_CS47L92 is not set
+# CONFIG_PMIC_DA903X is not set
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
+CONFIG_MFD_DA9052_I2C=y
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_DA9062 is not set
+# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_DA9150 is not set
+# CONFIG_MFD_DLN2 is not set
+# CONFIG_MFD_EXYNOS_LPASS is not set
+# CONFIG_MFD_GATEWORKS_GSC is not set
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_MFD_MP2629=m
+# CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_LPC_ICH is not set
+CONFIG_LPC_SCH=m
+CONFIG_MFD_IQS62X=m
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77620 is not set
+# CONFIG_MFD_MAX77650 is not set
+CONFIG_MFD_MAX77686=y
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77714 is not set
+# CONFIG_MFD_MAX77843 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+CONFIG_MFD_MT6360=m
+CONFIG_MFD_MT6370=m
+# CONFIG_MFD_MT6397 is not set
+# CONFIG_MFD_MENF21BMC is not set
+CONFIG_MFD_OCELOT=m
+# CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+# CONFIG_MFD_NTXEC is not set
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_PM8XXX is not set
+CONFIG_MFD_SY7636A=m
+# CONFIG_MFD_RDC321X is not set
+CONFIG_MFD_RT4831=m
+# CONFIG_MFD_RT5033 is not set
+CONFIG_MFD_RT5120=m
+# CONFIG_MFD_RC5T583 is not set
+CONFIG_MFD_RK808=y
+# CONFIG_MFD_RN5T618 is not set
+CONFIG_MFD_SEC_CORE=y
+# CONFIG_MFD_SI476X_CORE is not set
+CONFIG_MFD_SIMPLE_MFD_I2C=m
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SKY81452 is not set
+CONFIG_MFD_STMPE=y
+
+#
+# STMicroelectronics STMPE Interface Drivers
+#
+CONFIG_STMPE_I2C=y
+# CONFIG_STMPE_SPI is not set
+# end of STMicroelectronics STMPE Interface Drivers
+
+CONFIG_MFD_SUN6I_PRCM=y
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_TI_LMU is not set
+CONFIG_MFD_OMAP_USB_HOST=y
+CONFIG_MFD_PALMAS=y
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_MFD_TPS65086 is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TI_LP873X is not set
+# CONFIG_MFD_TI_LP87565 is not set
+# CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_TPS65219 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+CONFIG_TWL4030_CORE=y
+CONFIG_TWL4030_POWER=y
+CONFIG_MFD_TWL4030_AUDIO=y
+CONFIG_TWL6040_CORE=y
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TQMX86 is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_LOCHNAGAR is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+CONFIG_MFD_ROHM_BD718XX=m
+CONFIG_MFD_ROHM_BD71828=m
+CONFIG_MFD_ROHM_BD957XMUF=m
+# CONFIG_MFD_STPMIC1 is not set
+# CONFIG_MFD_STMFX is not set
+# CONFIG_MFD_ATC260X_I2C is not set
+CONFIG_MFD_KHADAS_MCU=m
+CONFIG_MFD_QCOM_PM8008=m
+CONFIG_MFD_VEXPRESS_SYSREG=y
+CONFIG_MFD_INTEL_M10_BMC_CORE=m
+CONFIG_MFD_INTEL_M10_BMC_SPI=m
+CONFIG_MFD_RSMU_I2C=m
+CONFIG_MFD_RSMU_SPI=m
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_88PG86X is not set
+CONFIG_REGULATOR_ACT8865=m
+# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_ARM_SCMI=m
+CONFIG_REGULATOR_AS3722=y
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BD71815=m
+CONFIG_REGULATOR_BD71828=m
+CONFIG_REGULATOR_BD718XX=m
+CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_BD957XMUF=m
+CONFIG_REGULATOR_CROS_EC=m
+CONFIG_REGULATOR_DA9052=m
+CONFIG_REGULATOR_DA9121=m
+# CONFIG_REGULATOR_DA9210 is not set
+# CONFIG_REGULATOR_DA9211 is not set
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_FAN53880=m
+CONFIG_REGULATOR_GPIO=m
+# CONFIG_REGULATOR_ISL9305 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_LTC3676 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+CONFIG_REGULATOR_MAX597X=m
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+CONFIG_REGULATOR_MAX8893=m
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_MAX20086 is not set
+# CONFIG_REGULATOR_MAX20411 is not set
+CONFIG_REGULATOR_MAX77686=m
+# CONFIG_REGULATOR_MAX77802 is not set
+# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+# CONFIG_REGULATOR_MCP16502 is not set
+CONFIG_REGULATOR_MP5416=m
+CONFIG_REGULATOR_MP8859=m
+CONFIG_REGULATOR_MP886X=m
+CONFIG_REGULATOR_MPQ7920=m
+# CONFIG_REGULATOR_MT6311 is not set
+CONFIG_REGULATOR_MT6360=m
+CONFIG_REGULATOR_MT6370=m
+CONFIG_REGULATOR_PALMAS=y
+CONFIG_REGULATOR_PBIAS=m
+CONFIG_REGULATOR_PCA9450=m
+CONFIG_REGULATOR_PF8X00=m
+CONFIG_REGULATOR_PFUZE100=m
+# CONFIG_REGULATOR_PV88060 is not set
+# CONFIG_REGULATOR_PV88080 is not set
+# CONFIG_REGULATOR_PV88090 is not set
+# CONFIG_REGULATOR_PWM is not set
+CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m
+CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_ROHM=m
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RT4803=m
+CONFIG_REGULATOR_RT4831=m
+CONFIG_REGULATOR_RT5120=m
+CONFIG_REGULATOR_RT5190A=m
+CONFIG_REGULATOR_RT5739=m
+CONFIG_REGULATOR_RT5759=m
+CONFIG_REGULATOR_RT6160=m
+CONFIG_REGULATOR_RT6190=m
+CONFIG_REGULATOR_RT6245=m
+CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTMV20=m
+CONFIG_REGULATOR_RTQ6752=m
+CONFIG_REGULATOR_S2MPA01=m
+CONFIG_REGULATOR_S2MPS11=m
+CONFIG_REGULATOR_S5M8767=m
+CONFIG_REGULATOR_SLG51000=m
+CONFIG_REGULATOR_TI_ABB=m
+CONFIG_REGULATOR_SY7636A=m
+CONFIG_REGULATOR_SY8106A=m
+CONFIG_REGULATOR_SY8824X=m
+CONFIG_REGULATOR_SY8827N=m
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+CONFIG_REGULATOR_TPS6286X=m
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+CONFIG_REGULATOR_TWL4030=y
+# CONFIG_REGULATOR_VCTRL is not set
+CONFIG_REGULATOR_VEXPRESS=m
+CONFIG_RC_CORE=y
+# CONFIG_BPF_LIRC_MODE2 is not set
+CONFIG_LIRC=y
+CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_IR_GPIO_CIR=m
+CONFIG_IR_GPIO_TX=m
+# CONFIG_IR_HIX5HD2 is not set
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_PWM_TX=m
+CONFIG_IR_REDRAT3=m
+# CONFIG_IR_RX51 is not set
+# CONFIG_IR_SERIAL is not set
+# CONFIG_IR_SPI is not set
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_SUNXI=m
+CONFIG_IR_TOY=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_RC_XBOX_DVD=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+
+#
+# CEC support
+#
+CONFIG_MEDIA_CEC_RC=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_CEC_CH7322=m
+CONFIG_CEC_CROS_EC=m
+CONFIG_CEC_SAMSUNG_S5P=m
+CONFIG_CEC_TEGRA=m
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+# end of CEC support
+
+CONFIG_MEDIA_SUPPORT=y
+# CONFIG_MEDIA_SUPPORT_FILTER is not set
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+
+#
+# Media device types
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+CONFIG_MEDIA_TEST_SUPPORT=y
+# end of Media device types
+
+#
+# Media core support
+#
+CONFIG_VIDEO_DEV=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_DVB_CORE=y
+# end of Media core support
+
+#
+# Video4Linux options
+#
+CONFIG_VIDEO_V4L2_I2C=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_H264=m
+CONFIG_V4L2_VP9=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_V4L2_ASYNC=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+# end of Video4Linux options
+
+#
+# Media controller options
+#
+CONFIG_MEDIA_CONTROLLER_DVB=y
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
+# end of Media controller options
+
+#
+# Digital TV options
+#
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+# end of Digital TV options
+
+#
+# Media drivers
+#
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_GSPCA=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_AS102=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+# CONFIG_DVB_USB_ZD1301 is not set
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_CXUSB_ANALOG=y
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=m
+# CONFIG_VIDEO_ZORAN is not set
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_DT3155=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_COBALT=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+# CONFIG_VIDEO_CX25821 is not set
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+# CONFIG_VIDEO_SAA7134_GO7007 is not set
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_DM1105=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_SAA7706H is not set
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_RADIO_SI4713=m
+CONFIG_RADIO_TEA575X=m
+# CONFIG_RADIO_TEA5764 is not set
+# CONFIG_RADIO_TEF6862 is not set
+# CONFIG_RADIO_WL1273 is not set
+# CONFIG_USB_DSBR is not set
+CONFIG_USB_KEENE=m
+CONFIG_USB_MA901=m
+CONFIG_USB_MR800=m
+CONFIG_USB_RAREMONO=m
+CONFIG_RADIO_SI470X=y
+CONFIG_USB_SI470X=m
+# CONFIG_I2C_SI470X is not set
+# CONFIG_USB_SI4713 is not set
+# CONFIG_PLATFORM_SI4713 is not set
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_WL128X=m
+CONFIG_MEDIA_PLATFORM_DRIVERS=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+# CONFIG_SDR_PLATFORM_DRIVERS is not set
+# CONFIG_DVB_PLATFORM_DRIVERS is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
+# CONFIG_VIDEO_MUX is not set
+
+#
+# Allegro DVT media platform drivers
+#
+
+#
+# Amlogic media platform drivers
+#
+
+#
+# Amphion drivers
+#
+CONFIG_VIDEO_AMPHION_VPU=m
+
+#
+# Aspeed media platform drivers
+#
+
+#
+# Atmel media platform drivers
+#
+
+#
+# Cadence media platform drivers
+#
+CONFIG_VIDEO_CADENCE_CSI2RX=m
+CONFIG_VIDEO_CADENCE_CSI2TX=m
+
+#
+# Chips&Media media platform drivers
+#
+# CONFIG_VIDEO_CODA is not set
+
+#
+# Intel media platform drivers
+#
+
+#
+# Marvell media platform drivers
+#
+CONFIG_VIDEO_CAFE_CCIC=m
+
+#
+# Mediatek media platform drivers
+#
+
+#
+# Microchip Technology, Inc. media platform drivers
+#
+
+#
+# NVidia media platform drivers
+#
+CONFIG_VIDEO_TEGRA_VDE=m
+
+#
+# NXP media platform drivers
+#
+CONFIG_VIDEO_IMX7_CSI=m
+CONFIG_VIDEO_IMX_MIPI_CSIS=m
+CONFIG_VIDEO_IMX8_ISI=m
+# CONFIG_VIDEO_IMX8_ISI_M2M is not set
+CONFIG_VIDEO_IMX_PXP=m
+CONFIG_VIDEO_DW100=m
+# CONFIG_VIDEO_IMX8_JPEG is not set
+
+#
+# Qualcomm media platform drivers
+#
+
+#
+# Renesas media platform drivers
+#
+
+#
+# Rockchip media platform drivers
+#
+CONFIG_VIDEO_ROCKCHIP_RGA=m
+# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
+
+#
+# Samsung media platform drivers
+#
+# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
+# CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
+# CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
+# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set
+# CONFIG_VIDEO_SAMSUNG_S5P_MFC is not set
+
+#
+# STMicroelectronics media platform drivers
+#
+
+#
+# Sunxi media platform drivers
+#
+CONFIG_VIDEO_SUN4I_CSI=m
+CONFIG_VIDEO_SUN6I_CSI=m
+CONFIG_VIDEO_SUN6I_MIPI_CSI2=m
+CONFIG_VIDEO_SUN8I_A83T_MIPI_CSI2=m
+CONFIG_VIDEO_SUN8I_DEINTERLACE=m
+CONFIG_VIDEO_SUN8I_ROTATE=m
+
+#
+# Texas Instruments drivers
+#
+CONFIG_VIDEO_TI_VPDMA=m
+CONFIG_VIDEO_TI_SC=m
+CONFIG_VIDEO_TI_CSC=m
+# CONFIG_VIDEO_TI_CAL is not set
+CONFIG_VIDEO_TI_VPE=m
+# CONFIG_VIDEO_TI_VPE_DEBUG is not set
+CONFIG_VIDEO_OMAP3=m
+# CONFIG_VIDEO_OMAP3_DEBUG is not set
+
+#
+# Verisilicon media platform drivers
+#
+CONFIG_VIDEO_HANTRO=m
+CONFIG_VIDEO_HANTRO_IMX8M=y
+CONFIG_VIDEO_HANTRO_ROCKCHIP=y
+CONFIG_VIDEO_HANTRO_SUNXI=y
+
+#
+# VIA media platform drivers
+#
+
+#
+# Xilinx media platform drivers
+#
+# CONFIG_VIDEO_XILINX is not set
+
+#
+# MMC/SDIO DVB adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_V4L_TEST_DRIVERS=y
+# CONFIG_VIDEO_VIM2M is not set
+# CONFIG_VIDEO_VICODEC is not set
+# CONFIG_VIDEO_VIMC is not set
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_CEC=y
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+# CONFIG_VIDEO_VISL is not set
+# CONFIG_DVB_TEST_DRIVERS is not set
+
+#
+# FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_TTPCI_EEPROM=m
+CONFIG_UVC_COMMON=m
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_VIDEO_V4L2_TPG=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+# end of Media drivers
+
+#
+# Media ancillary drivers
+#
+CONFIG_MEDIA_ATTACH=y
+
+#
+# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
+#
+CONFIG_VIDEO_IR_I2C=y
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_APTINA_PLL=m
+CONFIG_VIDEO_CCS_PLL=m
+CONFIG_VIDEO_AR0521=m
+CONFIG_VIDEO_HI556=m
+CONFIG_VIDEO_HI846=m
+CONFIG_VIDEO_HI847=m
+CONFIG_VIDEO_IMX208=m
+CONFIG_VIDEO_IMX214=m
+CONFIG_VIDEO_IMX219=m
+CONFIG_VIDEO_IMX258=m
+CONFIG_VIDEO_IMX274=m
+CONFIG_VIDEO_IMX290=m
+CONFIG_VIDEO_IMX296=m
+CONFIG_VIDEO_IMX319=m
+CONFIG_VIDEO_IMX334=m
+CONFIG_VIDEO_IMX335=m
+CONFIG_VIDEO_IMX355=m
+CONFIG_VIDEO_IMX412=m
+CONFIG_VIDEO_IMX415=m
+CONFIG_VIDEO_MAX9271_LIB=m
+CONFIG_VIDEO_MT9M001=m
+CONFIG_VIDEO_MT9M111=m
+CONFIG_VIDEO_MT9P031=m
+CONFIG_VIDEO_MT9T112=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
+CONFIG_VIDEO_MT9V111=m
+CONFIG_VIDEO_OG01A1B=m
+CONFIG_VIDEO_OV02A10=m
+CONFIG_VIDEO_OV08D10=m
+CONFIG_VIDEO_OV08X40=m
+CONFIG_VIDEO_OV13858=m
+CONFIG_VIDEO_OV13B10=m
+CONFIG_VIDEO_OV2640=m
+CONFIG_VIDEO_OV2659=m
+CONFIG_VIDEO_OV2680=m
+CONFIG_VIDEO_OV2685=m
+CONFIG_VIDEO_OV4689=m
+CONFIG_VIDEO_OV5640=m
+CONFIG_VIDEO_OV5645=m
+CONFIG_VIDEO_OV5647=m
+CONFIG_VIDEO_OV5648=m
+CONFIG_VIDEO_OV5670=m
+CONFIG_VIDEO_OV5675=m
+# CONFIG_VIDEO_OV5693 is not set
+CONFIG_VIDEO_OV5695=m
+CONFIG_VIDEO_OV6650=m
+CONFIG_VIDEO_OV7251=m
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_OV772X=m
+CONFIG_VIDEO_OV7740=m
+CONFIG_VIDEO_OV8856=m
+CONFIG_VIDEO_OV8858=m
+CONFIG_VIDEO_OV8865=m
+CONFIG_VIDEO_OV9282=m
+CONFIG_VIDEO_OV9640=m
+CONFIG_VIDEO_OV9650=m
+CONFIG_VIDEO_RDACM20=m
+CONFIG_VIDEO_RDACM21=m
+CONFIG_VIDEO_RJ54N1=m
+CONFIG_VIDEO_S5C73M3=m
+CONFIG_VIDEO_S5K5BAF=m
+CONFIG_VIDEO_S5K6A3=m
+CONFIG_VIDEO_ST_VGXY61=m
+CONFIG_VIDEO_CCS=m
+CONFIG_VIDEO_ET8EK8=m
+# end of Camera sensor devices
+
+#
+# Lens drivers
+#
+CONFIG_VIDEO_AD5820=m
+CONFIG_VIDEO_AK7375=m
+CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9768=m
+CONFIG_VIDEO_DW9807_VCM=m
+# end of Lens drivers
+
+#
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_LM3560=m
+CONFIG_VIDEO_LM3646=m
+# end of Flash devices
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+CONFIG_VIDEO_TDA1997X=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_WM8775=m
+# end of Audio decoders, processors and mixers
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+# end of RDS decoders
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_ADV748X=m
+CONFIG_VIDEO_ADV7604=m
+CONFIG_VIDEO_ADV7604_CEC=y
+CONFIG_VIDEO_ADV7842=m
+CONFIG_VIDEO_ADV7842_CEC=y
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_ISL7998X=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_MAX9286=m
+CONFIG_VIDEO_ML86V7667=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TC358743=m
+CONFIG_VIDEO_TC358743_CEC=y
+CONFIG_VIDEO_TC358746=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_TW9910=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+# end of Video decoders
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_ADV7511_CEC=y
+CONFIG_VIDEO_AK881X=m
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_THS8200=m
+# end of Video encoders
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+# end of Video improvement chips
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+# end of Audio/Video compression chips
+
+#
+# SDR tuner chips
+#
+CONFIG_SDR_MAX2175=m
+# end of SDR tuner chips
+
+#
+# Miscellaneous helper chips
+#
+CONFIG_VIDEO_I2C=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_ST_MIPID02=m
+CONFIG_VIDEO_THS7303=m
+# end of Miscellaneous helper chips
+
+#
+# Media SPI Adapters
+#
+# CONFIG_CXD2880_SPI_DRV is not set
+CONFIG_VIDEO_GS1662=m
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=y
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA18271=y
+CONFIG_MEDIA_TUNER_TDA827X=y
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC5000=y
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_TDA10071=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_GP8PSK_FE=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_RTL2832_SDR=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_CXD2880=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_STV0297=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_VES1820=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_MXL692=m
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+CONFIG_DVB_S921=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_MN88443X=m
+CONFIG_DVB_TC90522=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_A8293=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_HELENE=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBH29=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_DRX39XYJ=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+# end of Customise DVB Frontends
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Media ancillary drivers
+
+#
+# Graphics support
+#
+CONFIG_APERTURE_HELPERS=y
+CONFIG_VIDEO_CMDLINE=y
+CONFIG_VIDEO_NOMODESET=y
+# CONFIG_TEGRA_HOST1X is not set
+CONFIG_IMX_IPUV3_CORE=m
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DBI=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
+# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_DP_AUX_BUS=m
+CONFIG_DRM_DISPLAY_HELPER=m
+CONFIG_DRM_DISPLAY_DP_HELPER=y
+CONFIG_DRM_DISPLAY_HDCP_HELPER=y
+CONFIG_DRM_DISPLAY_HDMI_HELPER=y
+# CONFIG_DRM_DP_AUX_CHARDEV is not set
+# CONFIG_DRM_DP_CEC is not set
+CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_TTM_HELPER=m
+CONFIG_DRM_GEM_DMA_HELPER=m
+CONFIG_DRM_GEM_SHMEM_HELPER=m
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_I2C_NXP_TDA9950=m
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# CONFIG_DRM_HDLCD is not set
+# CONFIG_DRM_MALI_DISPLAY is not set
+# CONFIG_DRM_KOMEDA is not set
+# end of ARM devices
+
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_AMDGPU is not set
+# CONFIG_DRM_NOUVEAU is not set
+CONFIG_DRM_VGEM=m
+# CONFIG_DRM_VKMS is not set
+CONFIG_DRM_EXYNOS=m
+
+#
+# CRTCs
+#
+CONFIG_DRM_EXYNOS_FIMD=y
+# CONFIG_DRM_EXYNOS5433_DECON is not set
+# CONFIG_DRM_EXYNOS7_DECON is not set
+CONFIG_DRM_EXYNOS_MIXER=y
+# CONFIG_DRM_EXYNOS_VIDI is not set
+
+#
+# Encoders and Bridges
+#
+# CONFIG_DRM_EXYNOS_DPI is not set
+CONFIG_DRM_EXYNOS_DSI=y
+CONFIG_DRM_EXYNOS_DP=y
+CONFIG_DRM_EXYNOS_HDMI=y
+
+#
+# Sub-drivers
+#
+# CONFIG_DRM_EXYNOS_G2D is not set
+# CONFIG_DRM_EXYNOS_FIMC is not set
+# CONFIG_DRM_EXYNOS_ROTATOR is not set
+# CONFIG_DRM_EXYNOS_SCALER is not set
+# CONFIG_DRM_EXYNOS_GSC is not set
+CONFIG_DRM_ROCKCHIP=m
+CONFIG_ROCKCHIP_VOP=y
+CONFIG_ROCKCHIP_VOP2=y
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
+# CONFIG_ROCKCHIP_CDN_DP is not set
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+# CONFIG_ROCKCHIP_INNO_HDMI is not set
+# CONFIG_ROCKCHIP_LVDS is not set
+# CONFIG_ROCKCHIP_RGB is not set
+CONFIG_ROCKCHIP_RK3066_HDMI=y
+CONFIG_DRM_UDL=m
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
+# CONFIG_DRM_ARMADA is not set
+# CONFIG_DRM_SUN4I is not set
+CONFIG_DRM_OMAP=m
+# CONFIG_OMAP2_DSS_DEBUG is not set
+# CONFIG_OMAP2_DSS_DEBUGFS is not set
+CONFIG_OMAP2_DSS_DPI=y
+CONFIG_OMAP2_DSS_VENC=y
+CONFIG_OMAP2_DSS_HDMI_COMMON=y
+CONFIG_OMAP4_DSS_HDMI=y
+CONFIG_OMAP4_DSS_HDMI_CEC=y
+CONFIG_OMAP5_DSS_HDMI=y
+CONFIG_OMAP2_DSS_SDI=y
+CONFIG_OMAP2_DSS_DSI=y
+CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
+CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
+CONFIG_DRM_TILCDC=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_VIRTIO_GPU_KMS=y
+CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM_GPU_STATE=y
+# CONFIG_DRM_MSM_GPU_SUDO is not set
+# CONFIG_DRM_MSM_MDP4 is not set
+# CONFIG_DRM_MSM_MDP5 is not set
+# CONFIG_DRM_MSM_DPU is not set
+CONFIG_DRM_MSM_DP=y
+CONFIG_DRM_MSM_DSI=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_10NM_PHY=y
+CONFIG_DRM_MSM_DSI_7NM_PHY=y
+# CONFIG_DRM_MSM_HDMI is not set
+# CONFIG_DRM_FSL_DCU is not set
+# CONFIG_DRM_TEGRA is not set
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+# CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
+CONFIG_DRM_PANEL_ARM_VERSATILE=m
+CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m
+CONFIG_DRM_PANEL_AUO_A030JTN01=m
+# CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set
+CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
+CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
+CONFIG_DRM_PANEL_DSI_CM=m
+# CONFIG_DRM_PANEL_LVDS is not set
+CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_EDP=m
+CONFIG_DRM_PANEL_EBBG_FT8719=m
+CONFIG_DRM_PANEL_ELIDA_KD35T133=m
+CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
+# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
+CONFIG_DRM_PANEL_HIMAX_HX8394=m
+CONFIG_DRM_PANEL_ILITEK_IL9322=m
+CONFIG_DRM_PANEL_ILITEK_ILI9341=m
+CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
+CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
+# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
+CONFIG_DRM_PANEL_JADARD_JD9365DA_H3=m
+# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_JDI_R63452 is not set
+# CONFIG_DRM_PANEL_KHADAS_TS050 is not set
+# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
+CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_LG_LB035Q02 is not set
+# CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966=m
+# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
+# CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
+CONFIG_DRM_PANEL_NEWVISION_NV3052C=m
+CONFIG_DRM_PANEL_NOVATEK_NT35510=m
+CONFIG_DRM_PANEL_NOVATEK_NT35560=m
+# CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
+CONFIG_DRM_PANEL_NOVATEK_NT36523=m
+# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
+CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
+# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
+CONFIG_DRM_PANEL_ORISETECH_OTA5601A=m
+# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
+CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m
+# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
+# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20=m
+CONFIG_DRM_PANEL_SAMSUNG_DB7430=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set
+# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS060T1SX01 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
+CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
+# CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
+# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
+# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
+# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
+# CONFIG_DRM_PANEL_TPO_TPG110 is not set
+# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
+CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
+CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
+CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_CHIPONE_ICN6211=m
+CONFIG_DRM_CHRONTEL_CH7033=m
+CONFIG_DRM_CROS_EC_ANX7688=m
+CONFIG_DRM_DISPLAY_CONNECTOR=m
+CONFIG_DRM_FSL_LDB=m
+CONFIG_DRM_ITE_IT6505=m
+CONFIG_DRM_LONTIUM_LT8912B=m
+CONFIG_DRM_LONTIUM_LT9211=m
+CONFIG_DRM_LONTIUM_LT9611=m
+CONFIG_DRM_LONTIUM_LT9611UXC=m
+CONFIG_DRM_ITE_IT66121=m
+CONFIG_DRM_LVDS_CODEC=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_NWL_MIPI_DSI=m
+# CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PARADE_PS8622 is not set
+CONFIG_DRM_PARADE_PS8640=m
+CONFIG_DRM_SAMSUNG_DSIM=m
+# CONFIG_DRM_SIL_SII8620 is not set
+# CONFIG_DRM_SII902X is not set
+# CONFIG_DRM_SII9234 is not set
+CONFIG_DRM_SIMPLE_BRIDGE=m
+# CONFIG_DRM_THINE_THC63LVD1024 is not set
+CONFIG_DRM_TOSHIBA_TC358762=m
+# CONFIG_DRM_TOSHIBA_TC358764 is not set
+# CONFIG_DRM_TOSHIBA_TC358767 is not set
+CONFIG_DRM_TOSHIBA_TC358768=m
+CONFIG_DRM_TOSHIBA_TC358775=m
+CONFIG_DRM_TI_DLPC3433=m
+# CONFIG_DRM_TI_TFP410 is not set
+CONFIG_DRM_TI_SN65DSI83=m
+# CONFIG_DRM_TI_SN65DSI86 is not set
+CONFIG_DRM_TI_TPD12S015=m
+CONFIG_DRM_ANALOGIX_ANX6345=m
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+CONFIG_DRM_ANALOGIX_DP=m
+# CONFIG_DRM_ANALOGIX_ANX7625 is not set
+# CONFIG_DRM_I2C_ADV7511 is not set
+CONFIG_DRM_CDNS_DSI=m
+CONFIG_DRM_CDNS_DSI_J721E=y
+CONFIG_DRM_CDNS_MHDP8546=m
+# CONFIG_DRM_IMX8QM_LDB is not set
+# CONFIG_DRM_IMX8QXP_LDB is not set
+# CONFIG_DRM_IMX8QXP_PIXEL_COMBINER is not set
+# CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI is not set
+CONFIG_DRM_DW_HDMI=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_GP_AUDIO is not set
+CONFIG_DRM_DW_HDMI_CEC=m
+CONFIG_DRM_DW_MIPI_DSI=m
+# end of Display Interface Bridges
+
+CONFIG_DRM_IMX=m
+# CONFIG_DRM_IMX_PARALLEL_DISPLAY is not set
+# CONFIG_DRM_IMX_TVE is not set
+CONFIG_DRM_IMX_LDB=m
+CONFIG_DRM_IMX_HDMI=m
+CONFIG_DRM_IMX_LCDC=m
+CONFIG_DRM_V3D=m
+CONFIG_DRM_VC4=m
+# CONFIG_DRM_VC4_HDMI_CEC is not set
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
+CONFIG_DRM_LOGICVC=m
+CONFIG_DRM_MXS=y
+# CONFIG_DRM_MXSFB is not set
+CONFIG_DRM_IMX_LCDIF=m
+# CONFIG_DRM_ARCPGU is not set
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_GM12U320=m
+CONFIG_DRM_PANEL_MIPI_DBI=m
+CONFIG_DRM_SIMPLEDRM=m
+# CONFIG_TINYDRM_HX8357D is not set
+# CONFIG_TINYDRM_ILI9163 is not set
+# CONFIG_TINYDRM_ILI9225 is not set
+# CONFIG_TINYDRM_ILI9341 is not set
+CONFIG_TINYDRM_ILI9486=m
+# CONFIG_TINYDRM_MI0283QT is not set
+# CONFIG_TINYDRM_REPAPER is not set
+# CONFIG_TINYDRM_ST7586 is not set
+# CONFIG_TINYDRM_ST7735R is not set
+# CONFIG_DRM_PL111 is not set
+# CONFIG_DRM_TVE200 is not set
+# CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM_LIMA=m
+CONFIG_DRM_PANFROST=m
+CONFIG_DRM_MCDE=m
+CONFIG_DRM_TIDSS=m
+CONFIG_DRM_GUD=m
+CONFIG_DRM_SSD130X=m
+CONFIG_DRM_SSD130X_I2C=m
+CONFIG_DRM_SSD130X_SPI=m
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_SVGALIB=m
+CONFIG_FB_BACKLIGHT=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+CONFIG_FB_ARMCLCD=y
+# CONFIG_FB_IMX is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_EFI=y
+# CONFIG_FB_OPENCORES is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_NVIDIA=m
+# CONFIG_FB_NVIDIA_I2C is not set
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+# CONFIG_FB_VOODOO1 is not set
+CONFIG_FB_VT8623=m
+# CONFIG_FB_TRIDENT is not set
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+# CONFIG_FB_CARMINE is not set
+CONFIG_FB_VT8500=y
+CONFIG_FB_WM8505=y
+# CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_DA8XX is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=y
+# CONFIG_FB_METRONOME is not set
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_MX3=y
+CONFIG_FB_SIMPLE=m
+# CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SM712 is not set
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_KTD253=m
+CONFIG_BACKLIGHT_KTZ8866=m
+CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_DA9052 is not set
+CONFIG_BACKLIGHT_MT6370=m
+CONFIG_BACKLIGHT_QCOM_WLED=m
+CONFIG_BACKLIGHT_RT4831=m
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3630A is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+CONFIG_BACKLIGHT_PANDORA=m
+CONFIG_BACKLIGHT_GPIO=m
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
+# CONFIG_BACKLIGHT_ARCXCNN is not set
+CONFIG_BACKLIGHT_LED=m
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
+# CONFIG_LOGO is not set
+# end of Graphics support
+
+CONFIG_DRM_ACCEL=y
+CONFIG_DRM_ACCEL_QAIC=m
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_CTL_FAST_LOOKUP=y
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_CTL_INPUT_VALIDATION=y
+CONFIG_SND_VMASTER=y
+CONFIG_SND_CTL_LED=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+CONFIG_SND_ALOOP=m
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+CONFIG_SND_MTS64=m
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALI5451=m
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+CONFIG_SND_AZT3328=m
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDSP is not set
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+CONFIG_SND_LOLA=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+CONFIG_SND_VIRTUOSO=m
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_GENERIC_LEDS=y
+# CONFIG_SND_HDA_INTEL is not set
+CONFIG_SND_HDA_TEGRA=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CS8409=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_ALIGNED_MMIO=y
+CONFIG_SND_HDA_EXT_CORE=m
+CONFIG_SND_HDA_PREALLOC_SIZE=2048
+CONFIG_SND_ARM=y
+# CONFIG_SND_ARMAACI is not set
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREFACE is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=m
+# CONFIG_SND_SOC_AMD_ACP is not set
+# CONFIG_SND_AMD_ACP_CONFIG is not set
+# CONFIG_SND_ATMEL_SOC is not set
+CONFIG_SND_BCM2835_SOC_I2S=m
+CONFIG_SND_BCM63XX_I2S_WHISTLER=m
+# CONFIG_SND_DESIGNWARE_I2S is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+CONFIG_SND_SOC_FSL_ASRC=m
+CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_MQS=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_SPDIF=m
+# CONFIG_SND_SOC_FSL_ESAI is not set
+CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_FSL_EASRC=m
+CONFIG_SND_SOC_FSL_XCVR=m
+CONFIG_SND_SOC_FSL_AUD2HTX=m
+CONFIG_SND_SOC_FSL_UTILS=m
+CONFIG_SND_SOC_IMX_PCM_DMA=m
+CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_IMX_PCM_FIQ=m
+
+#
+# SoC Audio support for Freescale i.MX boards:
+#
+CONFIG_SND_SOC_EUKREA_TLV320=m
+CONFIG_SND_SOC_IMX_ES8328=m
+CONFIG_SND_SOC_IMX_SGTL5000=m
+CONFIG_SND_SOC_IMX_SPDIF=m
+# CONFIG_SND_SOC_FSL_ASOC_CARD is not set
+CONFIG_SND_SOC_IMX_AUDMIX=m
+CONFIG_SND_SOC_IMX_HDMI=m
+CONFIG_SND_SOC_IMX_CARD=m
+# end of SoC Audio for Freescale CPUs
+
+# CONFIG_SND_I2S_HI6210_I2S is not set
+# CONFIG_SND_KIRKWOOD_SOC is not set
+# CONFIG_SND_SOC_IMG is not set
+# CONFIG_SND_SOC_MTK_BTCVSD is not set
+CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP_I2S=m
+CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
+# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
+CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
+CONFIG_SND_SOC_ROCKCHIP_RT5645=m
+# CONFIG_SND_SOC_RK3288_HDMI_ANALOG is not set
+# CONFIG_SND_SOC_RK3399_GRU_SOUND is not set
+# CONFIG_SND_SOC_SAMSUNG is not set
+# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+#
+# Allwinner SoC Audio support
+#
+CONFIG_SND_SUN4I_CODEC=m
+# CONFIG_SND_SUN8I_CODEC is not set
+# CONFIG_SND_SUN8I_CODEC_ANALOG is not set
+# CONFIG_SND_SUN4I_I2S is not set
+CONFIG_SND_SUN4I_SPDIF=m
+CONFIG_SND_SUN50I_DMIC=m
+# end of Allwinner SoC Audio support
+
+CONFIG_SND_SOC_TEGRA=m
+CONFIG_SND_SOC_TEGRA20_AC97=m
+CONFIG_SND_SOC_TEGRA20_DAS=m
+CONFIG_SND_SOC_TEGRA20_I2S=m
+CONFIG_SND_SOC_TEGRA20_SPDIF=m
+CONFIG_SND_SOC_TEGRA30_AHUB=m
+CONFIG_SND_SOC_TEGRA30_I2S=m
+# CONFIG_SND_SOC_TEGRA210_AHUB is not set
+# CONFIG_SND_SOC_TEGRA210_DMIC is not set
+# CONFIG_SND_SOC_TEGRA210_I2S is not set
+# CONFIG_SND_SOC_TEGRA210_OPE is not set
+# CONFIG_SND_SOC_TEGRA186_ASRC is not set
+# CONFIG_SND_SOC_TEGRA186_DSPK is not set
+# CONFIG_SND_SOC_TEGRA210_ADMAIF is not set
+# CONFIG_SND_SOC_TEGRA210_MVC is not set
+# CONFIG_SND_SOC_TEGRA210_SFC is not set
+# CONFIG_SND_SOC_TEGRA210_AMX is not set
+# CONFIG_SND_SOC_TEGRA210_ADX is not set
+# CONFIG_SND_SOC_TEGRA210_MIXER is not set
+CONFIG_SND_SOC_TEGRA_MACHINE_DRV=m
+# CONFIG_SND_SOC_TEGRA_RT5631 is not set
+CONFIG_SND_SOC_TEGRA_RT5640=m
+CONFIG_SND_SOC_TEGRA_WM8753=m
+CONFIG_SND_SOC_TEGRA_WM8903=m
+CONFIG_SND_SOC_TEGRA_WM9712=m
+CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
+CONFIG_SND_SOC_TEGRA_ALC5632=m
+CONFIG_SND_SOC_TEGRA_MAX98090=m
+# CONFIG_SND_SOC_TEGRA_MAX98088 is not set
+CONFIG_SND_SOC_TEGRA_RT5677=m
+# CONFIG_SND_SOC_TEGRA_SGTL5000 is not set
+
+#
+# Audio support for Texas Instruments SoCs
+#
+CONFIG_SND_SOC_TI_EDMA_PCM=m
+CONFIG_SND_SOC_TI_SDMA_PCM=m
+CONFIG_SND_SOC_TI_UDMA_PCM=m
+
+#
+# Texas Instruments DAI support for:
+#
+CONFIG_SND_SOC_DAVINCI_MCASP=m
+CONFIG_SND_SOC_OMAP_DMIC=m
+CONFIG_SND_SOC_OMAP_MCBSP=m
+CONFIG_SND_SOC_OMAP_MCPDM=m
+
+#
+# Audio support for boards with Texas Instruments SoCs
+#
+CONFIG_SND_SOC_NOKIA_RX51=m
+CONFIG_SND_SOC_OMAP3_PANDORA=m
+CONFIG_SND_SOC_OMAP3_TWL4030=m
+CONFIG_SND_SOC_OMAP_ABE_TWL6040=m
+CONFIG_SND_SOC_OMAP_HDMI=m
+# end of Audio support for Texas Instruments SoCs
+
+# CONFIG_SND_SOC_XILINX_I2S is not set
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
+# CONFIG_SND_SOC_XTFPGA_I2S is not set
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+# CONFIG_SND_SOC_AC97_CODEC is not set
+# CONFIG_SND_SOC_ADAU1372_I2C is not set
+# CONFIG_SND_SOC_ADAU1372_SPI is not set
+# CONFIG_SND_SOC_ADAU1701 is not set
+# CONFIG_SND_SOC_ADAU1761_I2C is not set
+# CONFIG_SND_SOC_ADAU1761_SPI is not set
+# CONFIG_SND_SOC_ADAU7002 is not set
+CONFIG_SND_SOC_ADAU7118=m
+CONFIG_SND_SOC_ADAU7118_HW=m
+CONFIG_SND_SOC_ADAU7118_I2C=m
+# CONFIG_SND_SOC_AK4104 is not set
+# CONFIG_SND_SOC_AK4118 is not set
+# CONFIG_SND_SOC_AK4375 is not set
+CONFIG_SND_SOC_AK4458=m
+# CONFIG_SND_SOC_AK4554 is not set
+# CONFIG_SND_SOC_AK4613 is not set
+# CONFIG_SND_SOC_AK4642 is not set
+# CONFIG_SND_SOC_AK5386 is not set
+CONFIG_SND_SOC_AK5558=m
+# CONFIG_SND_SOC_ALC5623 is not set
+CONFIG_SND_SOC_ALC5632=m
+# CONFIG_SND_SOC_AW8738 is not set
+CONFIG_SND_SOC_AW88395_LIB=m
+CONFIG_SND_SOC_AW88395=m
+# CONFIG_SND_SOC_BD28623 is not set
+# CONFIG_SND_SOC_BT_SCO is not set
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+# CONFIG_SND_SOC_CS35L32 is not set
+# CONFIG_SND_SOC_CS35L33 is not set
+# CONFIG_SND_SOC_CS35L34 is not set
+# CONFIG_SND_SOC_CS35L35 is not set
+# CONFIG_SND_SOC_CS35L36 is not set
+# CONFIG_SND_SOC_CS35L41_SPI is not set
+# CONFIG_SND_SOC_CS35L41_I2C is not set
+# CONFIG_SND_SOC_CS35L45_SPI is not set
+# CONFIG_SND_SOC_CS35L45_I2C is not set
+# CONFIG_SND_SOC_CS35L56_I2C is not set
+# CONFIG_SND_SOC_CS35L56_SPI is not set
+CONFIG_SND_SOC_CS42L42_CORE=m
+# CONFIG_SND_SOC_CS42L42 is not set
+# CONFIG_SND_SOC_CS42L51_I2C is not set
+# CONFIG_SND_SOC_CS42L52 is not set
+# CONFIG_SND_SOC_CS42L56 is not set
+# CONFIG_SND_SOC_CS42L73 is not set
+CONFIG_SND_SOC_CS42L83=m
+# CONFIG_SND_SOC_CS4234 is not set
+# CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_SOC_CS4270 is not set
+# CONFIG_SND_SOC_CS4271_I2C is not set
+# CONFIG_SND_SOC_CS4271_SPI is not set
+# CONFIG_SND_SOC_CS42XX8_I2C is not set
+# CONFIG_SND_SOC_CS43130 is not set
+# CONFIG_SND_SOC_CS4341 is not set
+# CONFIG_SND_SOC_CS4349 is not set
+# CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_DA7213=m
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+# CONFIG_SND_SOC_ES7134 is not set
+# CONFIG_SND_SOC_ES7241 is not set
+# CONFIG_SND_SOC_ES8316 is not set
+CONFIG_SND_SOC_ES8326=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDA=m
+CONFIG_SND_SOC_ICS43432=m
+CONFIG_SND_SOC_IDT821034=m
+# CONFIG_SND_SOC_INNO_RK3036 is not set
+# CONFIG_SND_SOC_MAX98088 is not set
+CONFIG_SND_SOC_MAX98090=m
+# CONFIG_SND_SOC_MAX98357A is not set
+# CONFIG_SND_SOC_MAX98504 is not set
+# CONFIG_SND_SOC_MAX9867 is not set
+# CONFIG_SND_SOC_MAX98927 is not set
+# CONFIG_SND_SOC_MAX98520 is not set
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX98373_I2C=m
+# CONFIG_SND_SOC_MAX98390 is not set
+# CONFIG_SND_SOC_MAX98396 is not set
+# CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+# CONFIG_SND_SOC_PCM1681 is not set
+# CONFIG_SND_SOC_PCM1789_I2C is not set
+# CONFIG_SND_SOC_PCM179X_I2C is not set
+# CONFIG_SND_SOC_PCM179X_SPI is not set
+# CONFIG_SND_SOC_PCM186X_I2C is not set
+# CONFIG_SND_SOC_PCM186X_SPI is not set
+# CONFIG_SND_SOC_PCM3060_I2C is not set
+# CONFIG_SND_SOC_PCM3060_SPI is not set
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
+# CONFIG_SND_SOC_PCM3168A_SPI is not set
+# CONFIG_SND_SOC_PCM5102A is not set
+# CONFIG_SND_SOC_PCM512x_I2C is not set
+# CONFIG_SND_SOC_PCM512x_SPI is not set
+# CONFIG_SND_SOC_PEB2466 is not set
+CONFIG_SND_SOC_RK3328=m
+CONFIG_SND_SOC_RK817=m
+CONFIG_SND_SOC_RL6231=m
+# CONFIG_SND_SOC_RT5616 is not set
+# CONFIG_SND_SOC_RT5631 is not set
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+# CONFIG_SND_SOC_RT5659 is not set
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
+# CONFIG_SND_SOC_RT9120 is not set
+CONFIG_SND_SOC_SGTL5000=m
+# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+# CONFIG_SND_SOC_SIMPLE_MUX is not set
+# CONFIG_SND_SOC_SMA1303 is not set
+# CONFIG_SND_SOC_SPDIF is not set
+CONFIG_SND_SOC_SRC4XXX_I2C=m
+CONFIG_SND_SOC_SRC4XXX=m
+# CONFIG_SND_SOC_SSM2305 is not set
+# CONFIG_SND_SOC_SSM2518 is not set
+# CONFIG_SND_SOC_SSM2602_SPI is not set
+# CONFIG_SND_SOC_SSM2602_I2C is not set
+# CONFIG_SND_SOC_SSM4567 is not set
+# CONFIG_SND_SOC_STA32X is not set
+# CONFIG_SND_SOC_STA350 is not set
+# CONFIG_SND_SOC_STI_SAS is not set
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TAS2562 is not set
+# CONFIG_SND_SOC_TAS2764 is not set
+# CONFIG_SND_SOC_TAS2770 is not set
+# CONFIG_SND_SOC_TAS2780 is not set
+# CONFIG_SND_SOC_TAS5086 is not set
+# CONFIG_SND_SOC_TAS571X is not set
+# CONFIG_SND_SOC_TAS5720 is not set
+# CONFIG_SND_SOC_TAS5805M is not set
+# CONFIG_SND_SOC_TAS6424 is not set
+# CONFIG_SND_SOC_TDA7419 is not set
+# CONFIG_SND_SOC_TFA9879 is not set
+# CONFIG_SND_SOC_TFA989X is not set
+# CONFIG_SND_SOC_TLV320ADC3XXX is not set
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
+# CONFIG_SND_SOC_TLV320AIC31XX is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
+CONFIG_SND_SOC_TLV320AIC3X=m
+# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TLV320ADCX140 is not set
+CONFIG_SND_SOC_TS3A227E=m
+# CONFIG_SND_SOC_TSCS42XX is not set
+# CONFIG_SND_SOC_TSCS454 is not set
+CONFIG_SND_SOC_TWL4030=m
+CONFIG_SND_SOC_TWL6040=m
+# CONFIG_SND_SOC_UDA1334 is not set
+# CONFIG_SND_SOC_WM8510 is not set
+# CONFIG_SND_SOC_WM8523 is not set
+# CONFIG_SND_SOC_WM8524 is not set
+# CONFIG_SND_SOC_WM8580 is not set
+# CONFIG_SND_SOC_WM8711 is not set
+# CONFIG_SND_SOC_WM8728 is not set
+# CONFIG_SND_SOC_WM8731_I2C is not set
+# CONFIG_SND_SOC_WM8731_SPI is not set
+# CONFIG_SND_SOC_WM8737 is not set
+# CONFIG_SND_SOC_WM8741 is not set
+# CONFIG_SND_SOC_WM8750 is not set
+CONFIG_SND_SOC_WM8753=m
+# CONFIG_SND_SOC_WM8770 is not set
+# CONFIG_SND_SOC_WM8776 is not set
+# CONFIG_SND_SOC_WM8782 is not set
+# CONFIG_SND_SOC_WM8804_I2C is not set
+# CONFIG_SND_SOC_WM8804_SPI is not set
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+# CONFIG_SND_SOC_WM8940 is not set
+# CONFIG_SND_SOC_WM8960 is not set
+# CONFIG_SND_SOC_WM8961 is not set
+# CONFIG_SND_SOC_WM8962 is not set
+# CONFIG_SND_SOC_WM8974 is not set
+# CONFIG_SND_SOC_WM8978 is not set
+# CONFIG_SND_SOC_WM8985 is not set
+CONFIG_SND_SOC_WM9712=m
+# CONFIG_SND_SOC_ZL38060 is not set
+# CONFIG_SND_SOC_MAX9759 is not set
+# CONFIG_SND_SOC_MT6351 is not set
+# CONFIG_SND_SOC_MT6358 is not set
+# CONFIG_SND_SOC_MT6660 is not set
+# CONFIG_SND_SOC_NAU8315 is not set
+# CONFIG_SND_SOC_NAU8540 is not set
+# CONFIG_SND_SOC_NAU8810 is not set
+# CONFIG_SND_SOC_NAU8821 is not set
+# CONFIG_SND_SOC_NAU8822 is not set
+# CONFIG_SND_SOC_NAU8824 is not set
+CONFIG_SND_SOC_TPA6130A2=m
+# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_RX_MACRO is not set
+# CONFIG_SND_SOC_LPASS_TX_MACRO is not set
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+# CONFIG_SND_AUDIO_GRAPH_CARD is not set
+# CONFIG_SND_AUDIO_GRAPH_CARD2 is not set
+# CONFIG_SND_TEST_COMPONENT is not set
+CONFIG_SND_SYNTH_EMUX=m
+# CONFIG_SND_XEN_FRONTEND is not set
+# CONFIG_SND_VIRTIO is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+# CONFIG_HID_ACCUTOUCH is not set
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+# CONFIG_HID_APPLEIR is not set
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+# CONFIG_HID_BIGBEN_FF is not set
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+# CONFIG_HID_ELAN is not set
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EVISION=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_FT260=m
+CONFIG_HID_GEMBIRD=m
+# CONFIG_HID_GFRM is not set
+CONFIG_HID_GLORIOUS=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_VIVALDI is not set
+# CONFIG_HID_GT683R is not set
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+# CONFIG_HID_VIEWSONIC is not set
+CONFIG_HID_VRC2=m
+# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+# CONFIG_HID_ITE is not set
+CONFIG_HID_JABRA=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LETSKETCH=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+# CONFIG_HID_MALTRON is not set
+# CONFIG_HID_MAYFLASH is not set
+CONFIG_HID_MEGAWORLD_FF=m
+# CONFIG_HID_REDRAGON is not set
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+# CONFIG_HID_NINTENDO is not set
+# CONFIG_HID_NTI is not set
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_PLAYSTATION_FF=y
+CONFIG_HID_PXRC=m
+CONFIG_HID_RAZER=m
+CONFIG_HID_PRIMAX=m
+# CONFIG_HID_RETRODE is not set
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SIGMAMICRO=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+# CONFIG_HID_STEAM is not set
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_TOPRE=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+# CONFIG_HID_UDRAW_PS3 is not set
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+CONFIG_HID_MCP2221=m
+# end of Special HID drivers
+
+#
+# HID-BPF support
+#
+# end of HID-BPF support
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+CONFIG_I2C_HID=m
+# CONFIG_I2C_HID_OF is not set
+CONFIG_I2C_HID_OF_ELAN=m
+# CONFIG_I2C_HID_OF_GOODIX is not set
+CONFIG_I2C_HID_CORE=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+CONFIG_USB_CONN_GPIO=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=m
+# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_XHCI_MVEBU=m
+CONFIG_USB_XHCI_TEGRA=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_FSL=m
+CONFIG_USB_EHCI_HCD_OMAP=m
+CONFIG_USB_EHCI_HCD_ORION=m
+CONFIG_USB_EHCI_TEGRA=m
+CONFIG_USB_EHCI_EXYNOS=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_MAX3421_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_OMAP3=m
+CONFIG_USB_OHCI_HCD_PCI=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_EXYNOS=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+# CONFIG_USB_UHCI_HCD is not set
+CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC=y
+CONFIG_USB_UHCI_PLATFORM=y
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+CONFIG_USB_XEN_HCD=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+# CONFIG_USBIP_CORE is not set
+
+#
+# USB dual-mode controller drivers
+#
+CONFIG_USB_CDNS_SUPPORT=m
+CONFIG_USB_CDNS3=m
+# CONFIG_USB_CDNS3_GADGET is not set
+# CONFIG_USB_CDNS3_HOST is not set
+CONFIG_USB_CDNS3_IMX=m
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+
+#
+# Platform Glue Layer
+#
+CONFIG_USB_MUSB_SUNXI=m
+CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_USB_MUSB_OMAP2PLUS=m
+CONFIG_USB_MUSB_DSPS=m
+
+#
+# MUSB DMA mode
+#
+# CONFIG_MUSB_PIO_ONLY is not set
+CONFIG_USB_INVENTRA_DMA=y
+CONFIG_USB_TI_CPPI41_DMA=y
+CONFIG_USB_TUSB_OMAP_DMA=y
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_ULPI is not set
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_OMAP=m
+CONFIG_USB_DWC3_EXYNOS=m
+CONFIG_USB_DWC3_HAPS=m
+CONFIG_USB_DWC3_OF_SIMPLE=m
+CONFIG_USB_DWC2=m
+# CONFIG_USB_DWC2_HOST is not set
+
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+# CONFIG_USB_DWC2_PERIPHERAL is not set
+CONFIG_USB_DWC2_DUAL_ROLE=y
+# CONFIG_USB_DWC2_PCI is not set
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CHIPIDEA_MSM=m
+CONFIG_USB_CHIPIDEA_IMX=m
+CONFIG_USB_CHIPIDEA_GENERIC=m
+CONFIG_USB_CHIPIDEA_TEGRA=m
+# CONFIG_USB_ISP1760 is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+# CONFIG_USB_SERIAL_F8153X is not set
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+# CONFIG_USB_SERIAL_UPD78F0730 is not set
+# CONFIG_USB_SERIAL_XR is not set
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_USS720 is not set
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+# CONFIG_USB_HUB_USB251XB is not set
+CONFIG_USB_HSIC_USB3503=m
+# CONFIG_USB_HSIC_USB4604 is not set
+# CONFIG_USB_LINK_LAYER_TEST is not set
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ONBOARD_HUB=m
+# CONFIG_USB_ATM is not set
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_AM335X_CONTROL_USB=m
+CONFIG_AM335X_PHY_USB=m
+CONFIG_TWL6030_USB=m
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ISP1301 is not set
+CONFIG_USB_MXS_PHY=m
+CONFIG_USB_TEGRA_PHY=m
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
+
+#
+# USB Peripheral Controller
+#
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_SNP_UDC_PLAT is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_BDC_UDC is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_NET2272 is not set
+CONFIG_USB_NET2280=m
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_GADGET_XILINX is not set
+CONFIG_USB_MAX3420_UDC=m
+CONFIG_USB_TEGRA_XUDC=m
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+# CONFIG_USB_CONFIGFS_F_TCM is not set
+
+#
+# USB Gadget precomposed configurations
+#
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_AUDIO is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
+# CONFIG_USB_G_NCM is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_GADGET_TARGET is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+CONFIG_USB_G_NOKIA=m
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_WEBCAM is not set
+CONFIG_USB_RAW_GADGET=m
+# end of USB Gadget precomposed configurations
+
+# CONFIG_TYPEC is not set
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_MMC=y
+CONFIG_PWRSEQ_EMMC=y
+# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SIMPLE=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=256
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+CONFIG_MMC_CRYPTO=y
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_SUNPLUS=m
+CONFIG_MMC_ARMMMCI=m
+CONFIG_MMC_STM32_SDMMC=y
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_PLTFM=m
+# CONFIG_MMC_SDHCI_OF_ARASAN is not set
+# CONFIG_MMC_SDHCI_OF_AT91 is not set
+# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
+# CONFIG_MMC_SDHCI_CADENCE is not set
+CONFIG_MMC_SDHCI_ESDHC_IMX=m
+CONFIG_MMC_SDHCI_TEGRA=m
+CONFIG_MMC_SDHCI_S3C=m
+CONFIG_MMC_SDHCI_PXAV3=m
+# CONFIG_MMC_SDHCI_S3C_DMA is not set
+# CONFIG_MMC_SDHCI_F_SDH30 is not set
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
+CONFIG_MMC_SDHCI_IPROC=m
+CONFIG_MMC_OMAP=m
+CONFIG_MMC_OMAP_HS=m
+CONFIG_MMC_ALCOR=m
+# CONFIG_MMC_MXC is not set
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_MVSDIO=m
+CONFIG_MMC_SPI=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_DW=m
+CONFIG_MMC_DW_PLTFM=m
+# CONFIG_MMC_DW_BLUEFIELD is not set
+CONFIG_MMC_DW_EXYNOS=m
+# CONFIG_MMC_DW_HI3798CV200 is not set
+# CONFIG_MMC_DW_K3 is not set
+# CONFIG_MMC_DW_PCI is not set
+CONFIG_MMC_DW_ROCKCHIP=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_WMT=m
+# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_SUNXI=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_HSQ=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_BCM2835=m
+# CONFIG_MMC_MTK is not set
+# CONFIG_MMC_SDHCI_XENON is not set
+# CONFIG_MMC_SDHCI_OMAP is not set
+CONFIG_MMC_SDHCI_AM654=m
+CONFIG_SCSI_UFSHCD=m
+# CONFIG_SCSI_UFS_BSG is not set
+CONFIG_SCSI_UFS_CRYPTO=y
+CONFIG_SCSI_UFS_HPB=y
+CONFIG_SCSI_UFS_HWMON=y
+CONFIG_SCSI_UFSHCD_PCI=m
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_CLASS_FLASH is not set
+CONFIG_LEDS_CLASS_MULTICOLOR=m
+# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_AN30259A is not set
+# CONFIG_LEDS_AW2013 is not set
+# CONFIG_LEDS_BCM6328 is not set
+# CONFIG_LEDS_BCM6358 is not set
+# CONFIG_LEDS_CR0014114 is not set
+# CONFIG_LEDS_EL15203000 is not set
+# CONFIG_LEDS_TURRIS_OMNIA is not set
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3532 is not set
+# CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_LM3692X is not set
+# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+# CONFIG_LEDS_LP3952 is not set
+CONFIG_LEDS_LP50XX=m
+CONFIG_LEDS_LP55XX_COMMON=m
+# CONFIG_LEDS_LP5521 is not set
+CONFIG_LEDS_LP5523=m
+# CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP8501 is not set
+# CONFIG_LEDS_LP8860 is not set
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
+# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_DA9052=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2606MVV=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_NS2=y
+CONFIG_LEDS_TCA6507=m
+# CONFIG_LEDS_TLC591XX is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_IS31FL319X is not set
+# CONFIG_LEDS_IS31FL32XX is not set
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+# CONFIG_LEDS_BLINKM is not set
+# CONFIG_LEDS_SYSCON is not set
+# CONFIG_LEDS_MLXREG is not set
+# CONFIG_LEDS_USER is not set
+CONFIG_LEDS_SPI_BYTE=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+CONFIG_LEDS_LM3697=m
+
+#
+# Flash and Torch LED drivers
+#
+
+#
+# RGB LED drivers
+#
+CONFIG_LEDS_PWM_MULTICOLOR=m
+CONFIG_LEDS_MT6370_RGB=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+# CONFIG_LEDS_TRIGGER_PATTERN is not set
+CONFIG_LEDS_TRIGGER_AUDIO=m
+CONFIG_LEDS_TRIGGER_TTY=m
+
+#
+# Simple LED drivers
+#
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_RTRS=m
+CONFIG_INFINIBAND_RTRS_CLIENT=m
+CONFIG_INFINIBAND_RTRS_SERVER=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_ABB5ZES3 is not set
+# CONFIG_RTC_DRV_ABEOZ9 is not set
+# CONFIG_RTC_DRV_ABX80X is not set
+CONFIG_RTC_DRV_AS3722=y
+CONFIG_RTC_DRV_DS1307=y
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_HYM8563 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+CONFIG_RTC_DRV_MAX77686=y
+CONFIG_RTC_DRV_NCT3018Y=m
+CONFIG_RTC_DRV_RK808=y
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_ISL12026 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+CONFIG_RTC_DRV_PCF8523=y
+# CONFIG_RTC_DRV_PCF85063 is not set
+# CONFIG_RTC_DRV_PCF85363 is not set
+CONFIG_RTC_DRV_PCF8563=y
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+CONFIG_RTC_DRV_BD70528=m
+# CONFIG_RTC_DRV_BQ32K is not set
+CONFIG_RTC_DRV_TWL4030=y
+CONFIG_RTC_DRV_PALMAS=y
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8010 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3028 is not set
+# CONFIG_RTC_DRV_RV3032 is not set
+# CONFIG_RTC_DRV_RV8803 is not set
+CONFIG_RTC_DRV_S5M=y
+# CONFIG_RTC_DRV_SD3078 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1302 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1343 is not set
+# CONFIG_RTC_DRV_DS1347 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6916 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_MCP795 is not set
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+# CONFIG_RTC_DRV_RX6110 is not set
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1685_FAMILY is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+CONFIG_RTC_DRV_DA9052=y
+CONFIG_RTC_DRV_EFI=y
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_ZYNQMP is not set
+CONFIG_RTC_DRV_CROS_EC=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_IMXDI=y
+CONFIG_RTC_DRV_OMAP=y
+# CONFIG_RTC_DRV_S3C is not set
+CONFIG_RTC_DRV_SUNPLUS=m
+CONFIG_RTC_DRV_PL030=y
+CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_VT8500=y
+CONFIG_RTC_DRV_SUN6I=y
+CONFIG_RTC_DRV_SUNXI=y
+CONFIG_RTC_DRV_MV=y
+CONFIG_RTC_DRV_ARMADA38X=y
+# CONFIG_RTC_DRV_CADENCE is not set
+# CONFIG_RTC_DRV_FTRTC010 is not set
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_TEGRA=y
+CONFIG_RTC_DRV_MXC=y
+CONFIG_RTC_DRV_MXC_V2=m
+CONFIG_RTC_DRV_SNVS=y
+CONFIG_RTC_DRV_BBNSM=m
+# CONFIG_RTC_DRV_R7301 is not set
+CONFIG_RTC_DRV_RTD119X=y
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+# CONFIG_RTC_DRV_GOLDFISH is not set
+# CONFIG_RTC_DRV_MSC313 is not set
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DMA_OF=y
+CONFIG_ALTERA_MSGDMA=m
+CONFIG_AMBA_PL08X=y
+# CONFIG_AXI_DMAC is not set
+CONFIG_DMA_BCM2835=y
+CONFIG_DMA_SUN4I=y
+CONFIG_DMA_SUN6I=m
+# CONFIG_DW_AXI_DMAC is not set
+# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_QDMA is not set
+CONFIG_IMX_DMA=y
+CONFIG_IMX_SDMA=y
+# CONFIG_INTEL_IDMA64 is not set
+CONFIG_MV_XOR=y
+CONFIG_MXS_DMA=y
+CONFIG_MX3_IPU=y
+CONFIG_MX3_IPU_IRQS=4
+# CONFIG_NBPFAXI_DMA is not set
+CONFIG_PL330_DMA=y
+CONFIG_PLX_DMA=m
+# CONFIG_TEGRA186_GPC_DMA is not set
+CONFIG_TEGRA20_APB_DMA=y
+CONFIG_XILINX_XDMA=m
+CONFIG_XILINX_ZYNQMP_DPDMA=m
+# CONFIG_QCOM_HIDMA_MGMT is not set
+# CONFIG_QCOM_HIDMA is not set
+# CONFIG_DW_DMAC is not set
+# CONFIG_DW_DMAC_PCI is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
+CONFIG_SF_PDMA=m
+CONFIG_TI_CPPI41=m
+CONFIG_TI_EDMA=y
+CONFIG_DMA_OMAP=y
+CONFIG_TI_DMA_CROSSBAR=y
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+# CONFIG_UDMABUF is not set
+# CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
+# CONFIG_DMABUF_SELFTESTS is not set
+# CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
+# end of DMABUF options
+
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_PANEL is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
+# CONFIG_UIO_DMEM_GENIRQ is not set
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+# CONFIG_UIO_PRUSS is not set
+CONFIG_UIO_MF624=m
+# CONFIG_VFIO is not set
+CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO_ANCHOR=y
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_PCI_LIB=m
+CONFIG_VIRTIO_PCI_LIB_LEGACY=m
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+CONFIG_VDPA=m
+# CONFIG_VDPA_SIM is not set
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_MLX5_VDPA=y
+CONFIG_MLX5_VDPA_NET=m
+# CONFIG_MLX5_VDPA_STEERING_DEBUG is not set
+# CONFIG_VP_VDPA is not set
+CONFIG_VHOST_IOTLB=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST_TASK=y
+CONFIG_VHOST=m
+CONFIG_VHOST_MENU=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+# end of Microsoft Hyper-V guest support
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+# CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PCI_STUB=y
+CONFIG_XEN_PCIDEV_STUB=m
+CONFIG_XEN_PVCALLS_FRONTEND=m
+# CONFIG_XEN_PVCALLS_BACKEND is not set
+CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_EFI=y
+CONFIG_XEN_AUTO_XLATE=y
+CONFIG_XEN_GRANT_DMA_IOMMU=y
+CONFIG_XEN_GRANT_DMA_OPS=y
+CONFIG_XEN_VIRTIO=y
+# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
+# end of Xen driver support
+
+# CONFIG_GREYBUS is not set
+# CONFIG_COMEDI is not set
+CONFIG_STAGING=y
+# CONFIG_PRISM2_USB is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTLLIB is not set
+# CONFIG_RTL8723BS is not set
+CONFIG_R8712U=m
+# CONFIG_RTS5208 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16240 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7816 is not set
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+# CONFIG_ADT7316 is not set
+# end of Analog digital bi-direction converters
+
+#
+# Direct Digital Synthesis
+#
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+# CONFIG_AD5933 is not set
+# end of Network Analyzer, Impedance Converters
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S1210 is not set
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+# CONFIG_FB_SM750 is not set
+# CONFIG_MFD_NVEC is not set
+# CONFIG_STAGING_MEDIA is not set
+# CONFIG_STAGING_BOARD is not set
+# CONFIG_LTE_GDM724X is not set
+# CONFIG_FB_TFT is not set
+# CONFIG_KS7010 is not set
+CONFIG_BCM_VIDEOCORE=y
+# CONFIG_BCM2835_VCHIQ is not set
+# CONFIG_SND_BCM2835 is not set
+# CONFIG_VIDEO_BCM2835 is not set
+CONFIG_PI433=m
+# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_FIELDBUS_DEV is not set
+CONFIG_QLGE=m
+# CONFIG_VME_BUS is not set
+# CONFIG_GOLDFISH is not set
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CROS_EC=m
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_SPI=m
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_EC_CHARDEV=m
+# CONFIG_CROS_EC_LIGHTBAR is not set
+CONFIG_CROS_EC_VBC=m
+CONFIG_CROS_EC_DEBUGFS=m
+CONFIG_CROS_EC_SENSORHUB=m
+CONFIG_CROS_EC_SYSFS=m
+CONFIG_CROS_HPS_I2C=m
+CONFIG_CROS_USBPD_LOGGER=m
+CONFIG_CROS_USBPD_NOTIFY=m
+# CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Clock driver for ARM Reference designs
+#
+CONFIG_CLK_ICST=y
+CONFIG_CLK_SP810=y
+CONFIG_CLK_VEXPRESS_OSC=y
+# end of Clock driver for ARM Reference designs
+
+CONFIG_LMK04832=m
+CONFIG_COMMON_CLK_MAX77686=m
+CONFIG_COMMON_CLK_MAX9485=m
+CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_SCMI=m
+CONFIG_COMMON_CLK_SI5341=m
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMMON_CLK_SI514 is not set
+# CONFIG_COMMON_CLK_SI544 is not set
+# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_CDCE706 is not set
+# CONFIG_COMMON_CLK_CDCE925 is not set
+# CONFIG_COMMON_CLK_CS2000_CP is not set
+CONFIG_COMMON_CLK_EN7523=y
+CONFIG_COMMON_CLK_S2MPS11=m
+CONFIG_CLK_TWL6040=m
+CONFIG_COMMON_CLK_AXI_CLKGEN=m
+CONFIG_COMMON_CLK_PALMAS=m
+# CONFIG_COMMON_CLK_PWM is not set
+CONFIG_COMMON_CLK_RS9_PCIE=m
+CONFIG_COMMON_CLK_SI521XX=m
+# CONFIG_COMMON_CLK_VC5 is not set
+CONFIG_COMMON_CLK_VC7=m
+# CONFIG_COMMON_CLK_BD718XX is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
+CONFIG_COMMON_CLK_SP7021=m
+CONFIG_CLK_BCM2711_DVP=y
+# CONFIG_CLK_BCM2835 is not set
+CONFIG_CLK_RASPBERRYPI=m
+CONFIG_MXC_CLK=y
+CONFIG_CLK_IMX5=y
+CONFIG_CLK_IMX6Q=y
+# CONFIG_CLK_IMX8MM is not set
+# CONFIG_CLK_IMX8MN is not set
+# CONFIG_CLK_IMX8MP is not set
+# CONFIG_CLK_IMX8MQ is not set
+# CONFIG_CLK_IMX8ULP is not set
+# CONFIG_CLK_IMX93 is not set
+CONFIG_MSTAR_MSC313_CPUPLL=y
+CONFIG_MSTAR_MSC313_MPLL=y
+CONFIG_MVEBU_CLK_COMMON=y
+CONFIG_MVEBU_CLK_CPU=y
+CONFIG_MVEBU_CLK_COREDIV=y
+CONFIG_ARMADA_AP_CP_HELPER=y
+CONFIG_ARMADA_370_CLK=y
+CONFIG_ARMADA_375_CLK=y
+CONFIG_ARMADA_38X_CLK=y
+CONFIG_ARMADA_39X_CLK=y
+CONFIG_ARMADA_XP_CLK=y
+CONFIG_ARMADA_AP_CPU_CLK=y
+CONFIG_COMMON_CLK_ROCKCHIP=y
+CONFIG_CLK_RV110X=y
+CONFIG_CLK_RV1126=y
+CONFIG_CLK_RK3036=y
+CONFIG_CLK_RK312X=y
+CONFIG_CLK_RK3188=y
+CONFIG_CLK_RK322X=y
+CONFIG_CLK_RK3288=y
+CONFIG_COMMON_CLK_SAMSUNG=y
+CONFIG_EXYNOS_4_COMMON_CLK=y
+CONFIG_EXYNOS_5250_COMMON_CLK=y
+CONFIG_EXYNOS_5260_COMMON_CLK=y
+CONFIG_EXYNOS_5410_COMMON_CLK=y
+CONFIG_EXYNOS_5420_COMMON_CLK=y
+CONFIG_EXYNOS_AUDSS_CLK_CON=y
+CONFIG_EXYNOS_CLKOUT=y
+CONFIG_CLK_INTEL_SOCFPGA=y
+CONFIG_CLK_INTEL_SOCFPGA32=y
+CONFIG_CLK_SUNXI=y
+CONFIG_CLK_SUNXI_CLOCKS=y
+CONFIG_CLK_SUNXI_PRCM_SUN6I=y
+CONFIG_CLK_SUNXI_PRCM_SUN8I=y
+CONFIG_CLK_SUNXI_PRCM_SUN9I=y
+CONFIG_SUNXI_CCU=y
+CONFIG_SUN20I_D1_CCU=y
+CONFIG_SUN20I_D1_R_CCU=y
+CONFIG_SUN4I_A10_CCU=y
+CONFIG_SUN5I_CCU=y
+CONFIG_SUN6I_A31_CCU=y
+# CONFIG_SUN6I_RTC_CCU is not set
+CONFIG_SUN8I_A23_CCU=y
+CONFIG_SUN8I_A33_CCU=y
+CONFIG_SUN8I_A83T_CCU=y
+CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_V3S_CCU=y
+# CONFIG_SUN8I_DE2_CCU is not set
+CONFIG_SUN8I_R40_CCU=y
+CONFIG_SUN9I_A80_CCU=y
+CONFIG_SUN8I_R_CCU=y
+CONFIG_TEGRA_CLK_DFLL=y
+CONFIG_TEGRA124_CLK_EMC=y
+CONFIG_COMMON_CLK_TI_ADPLL=y
+# CONFIG_XILINX_VCU is not set
+CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
+# CONFIG_HWSPINLOCK is not set
+
+#
+# Clock Source drivers
+#
+CONFIG_TIMER_OF=y
+CONFIG_TIMER_PROBE=y
+CONFIG_OMAP_DM_SYSTIMER=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_BCM2835_TIMER=y
+CONFIG_OMAP_DM_TIMER=y
+CONFIG_DW_APB_TIMER=y
+CONFIG_DW_APB_TIMER_OF=y
+CONFIG_ROCKCHIP_TIMER=y
+CONFIG_ARMADA_370_XP_TIMER=y
+CONFIG_SUN4I_TIMER=y
+CONFIG_SUN5I_HSTIMER=y
+CONFIG_TEGRA_TIMER=y
+# CONFIG_TEGRA186_TIMER is not set
+CONFIG_VT8500_TIMER=y
+CONFIG_CLKSRC_TI_32K=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_GLOBAL_TIMER=y
+CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=1
+CONFIG_ARM_TIMER_SP804=y
+CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
+CONFIG_CLKSRC_EXYNOS_MCT=y
+CONFIG_CLKSRC_SAMSUNG_PWM=y
+CONFIG_CLKSRC_VERSATILE=y
+CONFIG_CLKSRC_IMX_GPT=y
+CONFIG_GXP_TIMER=y
+# CONFIG_MICROCHIP_PIT64B is not set
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+# CONFIG_ARM_MHU is not set
+# CONFIG_ARM_MHU_V2 is not set
+CONFIG_IMX_MBOX=m
+# CONFIG_PLATFORM_MHU is not set
+CONFIG_PL320_MBOX=y
+# CONFIG_ARMADA_37XX_RWTM_MBOX is not set
+CONFIG_OMAP2PLUS_MBOX=y
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+# CONFIG_ROCKCHIP_MBOX is not set
+# CONFIG_ALTERA_MBOX is not set
+CONFIG_BCM2835_MBOX=y
+# CONFIG_MAILBOX_TEST is not set
+# CONFIG_TEGRA_HSP_MBOX is not set
+CONFIG_SUN6I_MSGBOX=m
+CONFIG_IOMMU_IOVA=m
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+CONFIG_IOMMU_IO_PGTABLE=y
+CONFIG_IOMMU_IO_PGTABLE_LPAE=y
+# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
+# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_OF_IOMMU=y
+# CONFIG_IOMMUFD is not set
+CONFIG_OMAP_IOMMU=y
+# CONFIG_OMAP_IOMMU_DEBUG is not set
+CONFIG_ROCKCHIP_IOMMU=y
+# CONFIG_SUN50I_IOMMU is not set
+CONFIG_TEGRA_IOMMU_SMMU=y
+# CONFIG_EXYNOS_IOMMU is not set
+# CONFIG_ARM_SMMU is not set
+
+#
+# Remoteproc drivers
+#
+# CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+# CONFIG_RPMSG_VIRTIO is not set
+# end of Rpmsg drivers
+
+# CONFIG_SOUNDWIRE is not set
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+CONFIG_BCM2835_POWER=y
+CONFIG_RASPBERRYPI_POWER=y
+# CONFIG_SOC_BRCMSTB is not set
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# CONFIG_QUICC_ENGINE is not set
+CONFIG_FSL_RCPM=y
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# fujitsu SoC drivers
+#
+# end of fujitsu SoC drivers
+
+#
+# i.MX SoC drivers
+#
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
+CONFIG_SOC_IMX8M=y
+# CONFIG_SOC_IMX9 is not set
+CONFIG_IMX8M_BLK_CTRL=y
+# end of i.MX SoC drivers
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# CONFIG_LITEX_SOC_CONTROLLER is not set
+# end of Enable LiteX SoC Builder specific drivers
+
+CONFIG_WPCM450_SOC=m
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_QMI_HELPERS=m
+# end of Qualcomm SoC drivers
+
+CONFIG_ROCKCHIP_GRF=y
+CONFIG_ROCKCHIP_IODOMAIN=m
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_SOC_SAMSUNG=y
+CONFIG_EXYNOS_ASV_ARM=y
+CONFIG_EXYNOS_CHIPID=y
+# CONFIG_EXYNOS_USI is not set
+CONFIG_EXYNOS_PMU=y
+CONFIG_EXYNOS_PMU_ARM_DRIVERS=y
+CONFIG_EXYNOS_PM_DOMAINS=y
+CONFIG_EXYNOS_REGULATOR_COUPLER=y
+CONFIG_SUNXI_MBUS=y
+CONFIG_SUNXI_SRAM=y
+CONFIG_SUN20I_PPU=y
+# CONFIG_ARCH_TEGRA_2x_SOC is not set
+# CONFIG_ARCH_TEGRA_3x_SOC is not set
+# CONFIG_ARCH_TEGRA_114_SOC is not set
+CONFIG_ARCH_TEGRA_124_SOC=y
+CONFIG_SOC_TEGRA_FUSE=y
+CONFIG_SOC_TEGRA_FLOWCTRL=y
+CONFIG_SOC_TEGRA_PMC=y
+# CONFIG_SOC_TI is not set
+
+#
+# Xilinx SoC drivers
+#
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+
+#
+# DEVFREQ Drivers
+#
+# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
+CONFIG_ARM_IMX_BUS_DEVFREQ=m
+CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
+CONFIG_ARM_TEGRA_DEVFREQ=m
+# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
+# CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ is not set
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+# CONFIG_EXTCON_ADC_JACK is not set
+CONFIG_EXTCON_FSA9480=m
+# CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_MAX3355 is not set
+CONFIG_EXTCON_PALMAS=m
+CONFIG_EXTCON_PTN5150=m
+# CONFIG_EXTCON_RT8973A is not set
+# CONFIG_EXTCON_SM5502 is not set
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_EXTCON_USBC_CROS_EC=m
+CONFIG_MEMORY=y
+CONFIG_DDR=y
+# CONFIG_ARM_PL172_MPMC is not set
+CONFIG_TI_EMIF=m
+CONFIG_OMAP_GPMC=y
+# CONFIG_OMAP_GPMC_DEBUG is not set
+CONFIG_TI_EMIF_SRAM=m
+CONFIG_MVEBU_DEVBUS=y
+CONFIG_PL353_SMC=y
+CONFIG_SAMSUNG_MC=y
+CONFIG_EXYNOS_SROM=y
+CONFIG_TEGRA_MC=y
+CONFIG_TEGRA124_EMC=y
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_DMA=m
+CONFIG_IIO_BUFFER_DMAENGINE=m
+# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+# CONFIG_IIO_CONFIGFS is not set
+CONFIG_IIO_GTS_HELPER=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_SW_DEVICE is not set
+# CONFIG_IIO_SW_TRIGGER is not set
+# CONFIG_IIO_TRIGGERED_EVENT is not set
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADXL313_I2C is not set
+# CONFIG_ADXL313_SPI is not set
+# CONFIG_ADXL345_I2C is not set
+# CONFIG_ADXL345_SPI is not set
+# CONFIG_ADXL355_I2C is not set
+# CONFIG_ADXL355_SPI is not set
+# CONFIG_ADXL367_SPI is not set
+# CONFIG_ADXL367_I2C is not set
+# CONFIG_ADXL372_SPI is not set
+# CONFIG_ADXL372_I2C is not set
+# CONFIG_BMA180 is not set
+# CONFIG_BMA220 is not set
+CONFIG_BMA400=m
+CONFIG_BMA400_I2C=m
+CONFIG_BMA400_SPI=m
+# CONFIG_BMC150_ACCEL is not set
+# CONFIG_BMI088_ACCEL is not set
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
+# CONFIG_DMARD06 is not set
+# CONFIG_DMARD09 is not set
+# CONFIG_DMARD10 is not set
+# CONFIG_FXLS8962AF_I2C is not set
+# CONFIG_FXLS8962AF_SPI is not set
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_IIO_KX022A=m
+CONFIG_IIO_KX022A_SPI=m
+CONFIG_IIO_KX022A_I2C=m
+# CONFIG_KXSD9 is not set
+# CONFIG_KXCJK1013 is not set
+# CONFIG_MC3230 is not set
+# CONFIG_MMA7455_I2C is not set
+# CONFIG_MMA7455_SPI is not set
+# CONFIG_MMA7660 is not set
+CONFIG_MMA8452=m
+# CONFIG_MMA9551 is not set
+# CONFIG_MMA9553 is not set
+CONFIG_MSA311=m
+# CONFIG_MXC4005 is not set
+# CONFIG_MXC6255 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_SCA3300 is not set
+# CONFIG_STK8312 is not set
+# CONFIG_STK8BA50 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD4130=m
+CONFIG_AD7091R5=m
+# CONFIG_AD7124 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7280 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7292 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7606_IFACE_PARALLEL is not set
+# CONFIG_AD7606_IFACE_SPI is not set
+# CONFIG_AD7766 is not set
+# CONFIG_AD7768_1 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD7949 is not set
+# CONFIG_AD799X is not set
+# CONFIG_ADI_AXI_ADC is not set
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
+# CONFIG_CC10001_ADC is not set
+# CONFIG_ENVELOPE_DETECTOR is not set
+CONFIG_EXYNOS_ADC=m
+# CONFIG_HI8435 is not set
+# CONFIG_HX711 is not set
+# CONFIG_INA2XX_ADC is not set
+# CONFIG_IMX7D_ADC is not set
+# CONFIG_IMX8QXP_ADC is not set
+CONFIG_IMX93_ADC=m
+CONFIG_LTC2471=m
+# CONFIG_LTC2485 is not set
+# CONFIG_LTC2496 is not set
+# CONFIG_LTC2497 is not set
+# CONFIG_MAX1027 is not set
+# CONFIG_MAX11100 is not set
+# CONFIG_MAX1118 is not set
+CONFIG_MAX11205=m
+CONFIG_MAX11410=m
+# CONFIG_MAX1241 is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX9611 is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+# CONFIG_MCP3911 is not set
+# CONFIG_MEDIATEK_MT6360_ADC is not set
+# CONFIG_MEDIATEK_MT6370_ADC is not set
+# CONFIG_MP2629_ADC is not set
+# CONFIG_NAU7802 is not set
+# CONFIG_PALMAS_GPADC is not set
+CONFIG_ROCKCHIP_SARADC=m
+CONFIG_RICHTEK_RTQ6056=m
+CONFIG_SD_ADC_MODULATOR=m
+# CONFIG_STMPE_ADC is not set
+# CONFIG_SUN4I_GPADC is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADC0832 is not set
+# CONFIG_TI_ADC084S021 is not set
+# CONFIG_TI_ADC12138 is not set
+# CONFIG_TI_ADC108S102 is not set
+# CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADC161S626 is not set
+# CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS7924 is not set
+# CONFIG_TI_ADS1100 is not set
+# CONFIG_TI_ADS7950 is not set
+# CONFIG_TI_ADS8344 is not set
+# CONFIG_TI_ADS8688 is not set
+# CONFIG_TI_ADS124S08 is not set
+# CONFIG_TI_ADS131E08 is not set
+CONFIG_TI_AM335X_ADC=m
+# CONFIG_TI_LMP92064 is not set
+# CONFIG_TI_TLC4541 is not set
+# CONFIG_TI_TSC2046 is not set
+CONFIG_TWL4030_MADC=m
+# CONFIG_TWL6030_GPADC is not set
+# CONFIG_VF610_ADC is not set
+CONFIG_VIPERBOARD_ADC=m
+CONFIG_XILINX_XADC=m
+# end of Analog to digital converters
+
+#
+# Analog to digital and digital to analog converters
+#
+CONFIG_AD74115=m
+# CONFIG_AD74413R is not set
+# end of Analog to digital and digital to analog converters
+
+#
+# Analog Front Ends
+#
+# CONFIG_IIO_RESCALE is not set
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+# CONFIG_AD8366 is not set
+# CONFIG_ADA4250 is not set
+# CONFIG_HMC425 is not set
+# end of Amplifiers
+
+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7150 is not set
+# CONFIG_AD7746 is not set
+# end of Capacitance to digital converters
+
+#
+# Chemical Sensors
+#
+# CONFIG_ATLAS_PH_SENSOR is not set
+# CONFIG_ATLAS_EZO_SENSOR is not set
+# CONFIG_BME680 is not set
+CONFIG_CCS811=m
+# CONFIG_IAQCORE is not set
+CONFIG_SCD30_CORE=m
+CONFIG_SCD30_I2C=m
+CONFIG_SCD4X=m
+# CONFIG_SENSIRION_SGP30 is not set
+CONFIG_SENSIRION_SGP40=m
+# CONFIG_SPS30_I2C is not set
+CONFIG_SENSEAIR_SUNRISE_CO2=m
+# CONFIG_VZ89X is not set
+# end of Chemical Sensors
+
+# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+#
+# IIO SCMI Sensors
+#
+CONFIG_IIO_SCMI=m
+# end of IIO SCMI Sensors
+
+#
+# SSP Sensor Common
+#
+# CONFIG_IIO_SSP_SENSORHUB is not set
+# end of SSP Sensor Common
+
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+# CONFIG_AD3552R is not set
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+# CONFIG_AD5592R is not set
+# CONFIG_AD5593R is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_LTC2688 is not set
+# CONFIG_AD5686_SPI is not set
+# CONFIG_AD5696_I2C is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5758 is not set
+# CONFIG_AD5761 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5766 is not set
+# CONFIG_AD5770R is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD7293 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD8801 is not set
+# CONFIG_DPOT_DAC is not set
+# CONFIG_DS4424 is not set
+# CONFIG_LTC1660 is not set
+# CONFIG_LTC2632 is not set
+# CONFIG_M62332 is not set
+# CONFIG_MAX517 is not set
+CONFIG_MAX5522=m
+# CONFIG_MAX5821 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4922 is not set
+# CONFIG_TI_DAC082S085 is not set
+# CONFIG_TI_DAC5571 is not set
+# CONFIG_TI_DAC7311 is not set
+# CONFIG_TI_DAC7612 is not set
+# CONFIG_VF610_DAC is not set
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+# end of IIO dummy driver
+
+#
+# Filters
+#
+# end of Filters
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+# CONFIG_AD9523 is not set
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+# CONFIG_ADF4350 is not set
+CONFIG_ADF4371=m
+CONFIG_ADF4377=m
+CONFIG_ADMV1013=m
+CONFIG_ADMV4420=m
+# CONFIG_ADRF6780 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADXRS290 is not set
+# CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
+# CONFIG_FXAS21002C is not set
+CONFIG_HID_SENSOR_GYRO_3D=m
+# CONFIG_MPU3050_I2C is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_ITG3200 is not set
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+# CONFIG_AFE4403 is not set
+# CONFIG_AFE4404 is not set
+# CONFIG_MAX30100 is not set
+# CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+# CONFIG_AM2315 is not set
+# CONFIG_DHT11 is not set
+# CONFIG_HDC100X is not set
+# CONFIG_HDC2010 is not set
+# CONFIG_HID_SENSOR_HUMIDITY is not set
+# CONFIG_HTS221 is not set
+# CONFIG_HTU21 is not set
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16460 is not set
+# CONFIG_ADIS16475 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_BMI160_I2C is not set
+# CONFIG_BMI160_SPI is not set
+CONFIG_BOSCH_BNO055=m
+CONFIG_BOSCH_BNO055_I2C=m
+# CONFIG_FXOS8700_I2C is not set
+# CONFIG_FXOS8700_SPI is not set
+# CONFIG_KMX61 is not set
+CONFIG_INV_ICM42600=m
+CONFIG_INV_ICM42600_I2C=m
+CONFIG_INV_ICM42600_SPI=m
+# CONFIG_INV_MPU6050_I2C is not set
+# CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_IIO_ST_LSM6DSX is not set
+# CONFIG_IIO_ST_LSM9DS0 is not set
+# end of Inertial measurement units
+
+#
+# Light sensors
+#
+# CONFIG_ADJD_S311 is not set
+# CONFIG_ADUX1020 is not set
+# CONFIG_AL3010 is not set
+# CONFIG_AL3320A is not set
+# CONFIG_APDS9300 is not set
+# CONFIG_APDS9960 is not set
+# CONFIG_AS73211 is not set
+# CONFIG_BH1750 is not set
+CONFIG_BH1780=m
+# CONFIG_CM32181 is not set
+# CONFIG_CM3232 is not set
+# CONFIG_CM3323 is not set
+# CONFIG_CM3605 is not set
+# CONFIG_CM36651 is not set
+# CONFIG_GP2AP002 is not set
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_IQS621_ALS is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_ISL29125 is not set
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+# CONFIG_JSA1212 is not set
+CONFIG_ROHM_BU27034=m
+# CONFIG_RPR0521 is not set
+# CONFIG_LTR501 is not set
+CONFIG_LTRF216A=m
+# CONFIG_LV0104CS is not set
+# CONFIG_MAX44000 is not set
+# CONFIG_MAX44009 is not set
+# CONFIG_NOA1305 is not set
+# CONFIG_OPT3001 is not set
+# CONFIG_PA12203001 is not set
+# CONFIG_SI1133 is not set
+# CONFIG_SI1145 is not set
+# CONFIG_STK3310 is not set
+# CONFIG_ST_UVIS25 is not set
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+CONFIG_SENSORS_TSL2563=m
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2591 is not set
+# CONFIG_TSL2772 is not set
+# CONFIG_TSL4531 is not set
+# CONFIG_US5182D is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VCNL4035 is not set
+# CONFIG_VEML6030 is not set
+# CONFIG_VEML6070 is not set
+# CONFIG_VL6180 is not set
+# CONFIG_ZOPT2201 is not set
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+# CONFIG_AK8974 is not set
+# CONFIG_AK8975 is not set
+# CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_MAG3110 is not set
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+# CONFIG_MMC35240 is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+# CONFIG_SENSORS_RM3100_I2C is not set
+# CONFIG_SENSORS_RM3100_SPI is not set
+CONFIG_TI_TMAG5273=m
+# CONFIG_YAMAHA_YAS530 is not set
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+# CONFIG_IIO_MUX is not set
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+# CONFIG_IIO_INTERRUPT_TRIGGER is not set
+# CONFIG_IIO_SYSFS_TRIGGER is not set
+# end of Triggers - standalone
+
+#
+# Linear and angular position sensors
+#
+# CONFIG_IQS624_POS is not set
+# CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
+# end of Linear and angular position sensors
+
+#
+# Digital potentiometers
+#
+CONFIG_AD5110=m
+# CONFIG_AD5272 is not set
+# CONFIG_DS1803 is not set
+# CONFIG_MAX5432 is not set
+# CONFIG_MAX5481 is not set
+# CONFIG_MAX5487 is not set
+# CONFIG_MCP4018 is not set
+# CONFIG_MCP4131 is not set
+# CONFIG_MCP4531 is not set
+# CONFIG_MCP41010 is not set
+# CONFIG_TPL0102 is not set
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+# CONFIG_LMP91000 is not set
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+# CONFIG_ABP060MG is not set
+# CONFIG_BMP280 is not set
+# CONFIG_DLHL60D is not set
+CONFIG_DPS310=m
+CONFIG_HID_SENSOR_PRESS=m
+# CONFIG_HP03 is not set
+# CONFIG_ICP10100 is not set
+# CONFIG_MPL115_I2C is not set
+# CONFIG_MPL115_SPI is not set
+# CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
+# CONFIG_MS5637 is not set
+# CONFIG_IIO_ST_PRESS is not set
+# CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
+# CONFIG_ZPA2326 is not set
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+CONFIG_CROS_EC_MKBP_PROXIMITY=m
+# CONFIG_ISL29501 is not set
+# CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_MB1232 is not set
+# CONFIG_PING is not set
+# CONFIG_RFD77402 is not set
+# CONFIG_SRF04 is not set
+# CONFIG_SX9310 is not set
+# CONFIG_SX9324 is not set
+# CONFIG_SX9360 is not set
+# CONFIG_SX9500 is not set
+# CONFIG_SRF08 is not set
+# CONFIG_VCNL3020 is not set
+# CONFIG_VL53L0X_I2C is not set
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+# CONFIG_IQS620AT_TEMP is not set
+# CONFIG_LTC2983 is not set
+# CONFIG_MAXIM_THERMOCOUPLE is not set
+# CONFIG_HID_SENSOR_TEMP is not set
+# CONFIG_MLX90614 is not set
+# CONFIG_MLX90632 is not set
+# CONFIG_TMP006 is not set
+# CONFIG_TMP007 is not set
+# CONFIG_TMP117 is not set
+# CONFIG_TSYS01 is not set
+# CONFIG_TSYS02D is not set
+CONFIG_MAX30208=m
+# CONFIG_MAX31856 is not set
+# CONFIG_MAX31865 is not set
+# end of Temperature sensors
+
+# CONFIG_NTB is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_DEBUG is not set
+CONFIG_PWM_ATMEL_TCB=m
+CONFIG_PWM_BCM2835=m
+CONFIG_PWM_CLK=m
+# CONFIG_PWM_CROS_EC is not set
+CONFIG_PWM_DWC=m
+# CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_IMX1 is not set
+# CONFIG_PWM_IMX27 is not set
+CONFIG_PWM_IMX_TPM=m
+# CONFIG_PWM_IQS620A is not set
+CONFIG_PWM_OMAP_DMTIMER=m
+# CONFIG_PWM_PCA9685 is not set
+# CONFIG_PWM_RASPBERRYPI_POE is not set
+CONFIG_PWM_ROCKCHIP=m
+CONFIG_PWM_SAMSUNG=m
+# CONFIG_PWM_STMPE is not set
+CONFIG_PWM_SUN4I=m
+CONFIG_PWM_SUNPLUS=m
+CONFIG_PWM_TEGRA=m
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
+CONFIG_PWM_TWL=m
+CONFIG_PWM_TWL_LED=m
+CONFIG_PWM_VT8500=m
+# CONFIG_PWM_XILINX is not set
+
+#
+# IRQ chip support
+#
+CONFIG_IRQCHIP=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_MAX_NR=1
+CONFIG_ARM_GIC_V2M=y
+CONFIG_GIC_NON_BANKED=y
+CONFIG_ARM_GIC_V3=y
+CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_ARM_GIC_V3_ITS_PCI=y
+CONFIG_ARM_VIC=y
+CONFIG_ARM_VIC_NR=2
+CONFIG_ARMADA_370_XP_IRQ=y
+# CONFIG_AL_FIC is not set
+CONFIG_BRCMSTB_L2_IRQ=y
+CONFIG_MADERA_IRQ=m
+CONFIG_OMAP_IRQCHIP=y
+CONFIG_SUN4I_INTC=y
+CONFIG_SUN6I_R_INTC=y
+CONFIG_SUNXI_NMI_INTC=y
+# CONFIG_TS4800_IRQ is not set
+# CONFIG_XILINX_INTC is not set
+CONFIG_IRQ_CROSSBAR=y
+CONFIG_PARTITION_PERCPU=y
+CONFIG_IMX_IRQSTEER=y
+CONFIG_IMX_INTMUX=y
+CONFIG_IMX_MU_MSI=m
+CONFIG_EXYNOS_IRQ_COMBINER=y
+CONFIG_MST_IRQ=y
+CONFIG_SUNPLUS_SP7021_INTC=y
+# end of IRQ chip support
+
+# CONFIG_IPACK_BUS is not set
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_RASPBERRYPI is not set
+CONFIG_RESET_SCMI=y
+CONFIG_RESET_SIMPLE=y
+CONFIG_RESET_SOCFPGA=y
+CONFIG_RESET_SUNPLUS=y
+CONFIG_RESET_SUNXI=y
+# CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESET_TI_TPS380X is not set
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PHY_MIPI_DPHY=y
+CONFIG_PHY_CAN_TRANSCEIVER=m
+CONFIG_PHY_SUN4I_USB=m
+CONFIG_PHY_SUN6I_MIPI_DPHY=m
+CONFIG_PHY_SUN9I_USB=m
+CONFIG_PHY_SUN50I_USB3=m
+
+#
+# PHY drivers for Broadcom platforms
+#
+# CONFIG_BCM_KONA_USB2_PHY is not set
+# end of PHY drivers for Broadcom platforms
+
+CONFIG_PHY_CADENCE_TORRENT=m
+# CONFIG_PHY_CADENCE_DPHY is not set
+# CONFIG_PHY_CADENCE_DPHY_RX is not set
+# CONFIG_PHY_CADENCE_SIERRA is not set
+# CONFIG_PHY_CADENCE_SALVO is not set
+CONFIG_ARMADA375_USBCLUSTER_PHY=y
+CONFIG_PHY_MVEBU_A3700_COMPHY=m
+CONFIG_PHY_MVEBU_A3700_UTMI=m
+CONFIG_PHY_MVEBU_A38X_COMPHY=m
+CONFIG_PHY_MVEBU_CP110_COMPHY=m
+CONFIG_PHY_MVEBU_CP110_UTMI=m
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_LAN966X_SERDES is not set
+# CONFIG_PHY_CPCAP_USB is not set
+# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_OCELOT_SERDES is not set
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_ROCKCHIP_DP=m
+# CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set
+CONFIG_PHY_ROCKCHIP_EMMC=m
+# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set
+# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set
+CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=m
+# CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set
+CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
+CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
+# CONFIG_PHY_ROCKCHIP_TYPEC is not set
+CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+# CONFIG_PHY_EXYNOS_PCIE is not set
+CONFIG_PHY_SAMSUNG_UFS=m
+CONFIG_PHY_SAMSUNG_USB2=m
+CONFIG_PHY_EXYNOS4210_USB2=y
+CONFIG_PHY_EXYNOS4X12_USB2=y
+CONFIG_PHY_EXYNOS5250_USB2=y
+CONFIG_PHY_EXYNOS5_USBDRD=m
+CONFIG_PHY_EXYNOS5250_SATA=m
+CONFIG_PHY_SUNPLUS_USB=m
+CONFIG_PHY_TEGRA_XUSB=m
+# CONFIG_PHY_DM816X_USB is not set
+CONFIG_OMAP_CONTROL_PHY=m
+CONFIG_OMAP_USB2=m
+CONFIG_TI_PIPE3=m
+CONFIG_PHY_TUSB1210=m
+CONFIG_TWL4030_USB=m
+CONFIG_PHY_TI_GMII_SEL=m
+# end of PHY Subsystem
+
+# CONFIG_POWERCAP is not set
+# CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
+# CONFIG_ARM_CCI_PMU is not set
+# CONFIG_ARM_CCN is not set
+CONFIG_ARM_PMU=y
+CONFIG_ARM_PMUV3=y
+CONFIG_FSL_IMX8_DDR_PMU=m
+# end of Performance monitor support
+
+CONFIG_RAS=y
+CONFIG_USB4=m
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# Android
+#
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
+# end of Android
+
+CONFIG_DAX=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+
+#
+# Layout Types
+#
+CONFIG_NVMEM_LAYOUT_SL28_VPD=m
+# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
+# end of Layout Types
+
+# CONFIG_NVMEM_IMX_IIM is not set
+CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_RMEM=m
+CONFIG_NVMEM_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_ROCKCHIP_OTP=m
+CONFIG_NVMEM_SNVS_LPGPR=m
+CONFIG_NVMEM_SUNPLUS_OCOTP=m
+CONFIG_NVMEM_SUNXI_SID=m
+CONFIG_NVMEM_U_BOOT_ENV=m
+
+#
+# HW tracing support
+#
+# CONFIG_STM is not set
+# CONFIG_INTEL_TH is not set
+# end of HW tracing support
+
+# CONFIG_FPGA is not set
+# CONFIG_FSI is not set
+# CONFIG_TEE is not set
+CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
+# CONFIG_MUX_ADG792A is not set
+# CONFIG_MUX_ADGS1408 is not set
+# CONFIG_MUX_GPIO is not set
+# CONFIG_MUX_MMIO is not set
+# end of Multiplexer drivers
+
+CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+CONFIG_INTERCONNECT=y
+CONFIG_INTERCONNECT_IMX=m
+# CONFIG_INTERCONNECT_IMX8MM is not set
+# CONFIG_INTERCONNECT_IMX8MN is not set
+# CONFIG_INTERCONNECT_IMX8MQ is not set
+# CONFIG_INTERCONNECT_IMX8MP is not set
+CONFIG_INTERCONNECT_SAMSUNG=y
+CONFIG_INTERCONNECT_EXYNOS=m
+CONFIG_COUNTER=m
+CONFIG_INTERRUPT_CNT=m
+CONFIG_TI_ECAP_CAPTURE=m
+CONFIG_TI_EQEP=m
+# CONFIG_MOST is not set
+# CONFIG_PECI is not set
+CONFIG_HTE=y
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+CONFIG_LEGACY_DIRECT_IO=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+# CONFIG_XFS_SUPPORT_ASCII_CI is not set
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
+# CONFIG_F2FS_FS_COMPRESSION is not set
+# CONFIG_F2FS_IOSTAT is not set
+CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_EXPORTFS_BLOCK_OPS=y
+CONFIG_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_NETFS_SUPPORT=m
+CONFIG_NETFS_STATS=y
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_DEBUG is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_ERROR_INJECTION is not set
+# CONFIG_CACHEFILES_ONDEMAND is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/EXFAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_DEFAULT_UTF8 is not set
+CONFIG_EXFAT_FS=m
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+# CONFIG_NTFS3_FS_POSIX_ACL is not set
+# end of DOS/FAT/EXFAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_EFIVAR_FS=m
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ORANGEFS_FS is not set
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
+# CONFIG_UBIFS_ATIME_SUPPORT is not set
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_SECURITY=y
+CONFIG_UBIFS_FS_AUTHENTICATION=y
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+# CONFIG_SQUASHFS_LZ4 is not set
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_ZSTD is not set
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=m
+# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+CONFIG_ROMFS_BACKED_BY_BOTH=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_ROMFS_ON_MTD=y
+# CONFIG_PSTORE is not set
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EROFS_FS=m
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+# CONFIG_EROFS_FS_ZIP is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFSD=m
+# CONFIG_NFSD_V2 is not set
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+# CONFIG_NFSD_SCSILAYOUT is not set
+# CONFIG_NFSD_FLEXFILELAYOUT is not set
+# CONFIG_NFSD_V4_2_INTER_SSC is not set
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y
+# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CEPH_FS_SECURITY_LABEL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS=m
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+CONFIG_DLM_DEBUG=y
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+CONFIG_IO_WQ=y
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_REQUEST_CACHE=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_TRUSTED_KEYS is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_KEY_DH_OPERATIONS is not set
+CONFIG_KEY_NOTIFICATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_INFINIBAND is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_SECURITY_PATH=y
+CONFIG_LSM_MMAP_MIN_ADDR=32768
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
+CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
+# CONFIG_SECURITY_SMACK is not set
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+# CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set
+CONFIG_SECURITY_APPARMOR=y
+# CONFIG_SECURITY_APPARMOR_DEBUG is not set
+CONFIG_SECURITY_APPARMOR_INTROSPECT_POLICY=y
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+CONFIG_SECURITY_APPARMOR_EXPORT_BINARY=y
+CONFIG_SECURITY_APPARMOR_PARANOID_LOAD=y
+# CONFIG_SECURITY_LOADPIN is not set
+CONFIG_SECURITY_YAMA=y
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_INTEGRITY=y
+CONFIG_INTEGRITY_SIGNATURE=y
+CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
+CONFIG_INTEGRITY_TRUSTED_KEYRING=y
+CONFIG_INTEGRITY_AUDIT=y
+CONFIG_IMA=y
+CONFIG_IMA_MEASURE_PCR_IDX=10
+CONFIG_IMA_LSM_RULES=y
+CONFIG_IMA_NG_TEMPLATE=y
+# CONFIG_IMA_SIG_TEMPLATE is not set
+CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
+# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
+CONFIG_IMA_DEFAULT_HASH_SHA256=y
+CONFIG_IMA_DEFAULT_HASH="sha256"
+# CONFIG_IMA_WRITE_POLICY is not set
+# CONFIG_IMA_READ_POLICY is not set
+CONFIG_IMA_APPRAISE=y
+# CONFIG_IMA_ARCH_POLICY is not set
+# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
+CONFIG_IMA_APPRAISE_BOOTPARAM=y
+# CONFIG_IMA_APPRAISE_MODSIG is not set
+CONFIG_IMA_TRUSTED_KEYRING=y
+# CONFIG_IMA_BLACKLIST_KEYRING is not set
+# CONFIG_IMA_LOAD_X509 is not set
+CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y
+CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y
+CONFIG_IMA_DISABLE_HTABLE=y
+# CONFIG_EVM is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
+
+#
+# Kernel hardening options
+#
+CONFIG_GCC_PLUGIN_STRUCTLEAK=y
+
+#
+# Memory initialization
+#
+# CONFIG_INIT_STACK_NONE is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
+CONFIG_ZERO_CALL_USED_REGS=y
+# end of Memory initialization
+
+CONFIG_RANDSTRUCT_NONE=y
+# CONFIG_RANDSTRUCT_FULL is not set
+# CONFIG_RANDSTRUCT_PERFORMANCE is not set
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SKCIPHER=y
+CONFIG_CRYPTO_SKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=m
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=m
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ENGINE=m
+# end of Crypto core or helper
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=m
+# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+# end of Public-key cryptography
+
+#
+# Block ciphers
+#
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_TI is not set
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARIA=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_SM4_GENERIC=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+# end of Block ciphers
+
+#
+# Length-preserving ciphers and modes
+#
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_HCTR2=m
+# CONFIG_CRYPTO_KEYWRAP is not set
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XCTR=m
+CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_NHPOLY1305=m
+# end of Length-preserving ciphers and modes
+
+#
+# AEAD (authenticated encryption with associated data) ciphers
+#
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ESSIV=m
+# end of AEAD (authenticated encryption with associated data) ciphers
+
+#
+# Hashes, digests, and MACs
+#
+CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_POLYVAL=m
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_SM3_GENERIC=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_XXHASH=m
+# end of Hashes, digests, and MACs
+
+#
+# CRCs (cyclic redundancy checks)
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRC64_ROCKSOFT=y
+# end of CRCs (cyclic redundancy checks)
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_842 is not set
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=m
+# end of Compression
+
+#
+# Random number generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=m
+CONFIG_CRYPTO_DRBG_HMAC=y
+# CONFIG_CRYPTO_DRBG_HASH is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+CONFIG_CRYPTO_DRBG=m
+CONFIG_CRYPTO_JITTERENTROPY=m
+# end of Random number generation
+
+#
+# Userspace interface
+#
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
+# CONFIG_CRYPTO_STATS is not set
+# end of Userspace interface
+
+CONFIG_CRYPTO_HASH_INFO=y
+
+#
+# Accelerated Cryptographic Algorithms for CPU (arm)
+#
+CONFIG_CRYPTO_POLY1305_ARM=m
+CONFIG_CRYPTO_BLAKE2S_ARM=y
+CONFIG_CRYPTO_SHA1_ARM=m
+CONFIG_CRYPTO_SHA256_ARM=m
+CONFIG_CRYPTO_SHA512_ARM=m
+CONFIG_CRYPTO_AES_ARM=m
+CONFIG_CRYPTO_CHACHA20_NEON=m
+# end of Accelerated Cryptographic Algorithms for CPU (arm)
+
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_ALLWINNER=y
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
+# CONFIG_CRYPTO_DEV_SUN4I_SS_DEBUG is not set
+CONFIG_CRYPTO_DEV_SUN8I_CE=m
+# CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG is not set
+CONFIG_CRYPTO_DEV_SUN8I_CE_HASH=y
+CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG=y
+CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG=y
+CONFIG_CRYPTO_DEV_SUN8I_SS=m
+# CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG is not set
+CONFIG_CRYPTO_DEV_SUN8I_SS_PRNG=y
+CONFIG_CRYPTO_DEV_SUN8I_SS_HASH=y
+# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
+# CONFIG_CRYPTO_DEV_OMAP is not set
+# CONFIG_CRYPTO_DEV_SAHARA is not set
+# CONFIG_CRYPTO_DEV_EXYNOS_RNG is not set
+# CONFIG_CRYPTO_DEV_S5P is not set
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
+# CONFIG_CRYPTO_DEV_MXS_DCP is not set
+CONFIG_CRYPTO_DEV_MARVELL=m
+CONFIG_CRYPTO_DEV_MARVELL_CESA=m
+# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
+# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set
+# CONFIG_CRYPTO_DEV_QAT_C62X is not set
+# CONFIG_CRYPTO_DEV_QAT_4XXX is not set
+# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
+# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
+# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
+# CONFIG_CRYPTO_DEV_ROCKCHIP is not set
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
+# CONFIG_CRYPTO_DEV_CCREE is not set
+CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
+# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+# CONFIG_FIPS_SIGNATURE_SELFTEST is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_LINEAR_RANGES=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_HAVE_ARCH_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_PRIME_NUMBERS=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_STMP_DEVICE=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_UTILS=y
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_GF128MUL=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA1=y
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC64_ROCKSOFT=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=y
+# CONFIG_CRC4 is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+CONFIG_AUDIT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMMON=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_IA64 is not set
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+# CONFIG_XZ_DEC_SPARC is not set
+CONFIG_XZ_DEC_MICROLZMA=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_ZSTD=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_DMA_OPS=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_DECLARE_COHERENT=y
+CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
+CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
+CONFIG_SWIOTLB=y
+CONFIG_DMA_RESTRICTED_POOL=y
+CONFIG_DMA_NONCOHERENT_MMAP=y
+CONFIG_DMA_CMA=y
+CONFIG_DMA_PERNUMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_CHECK_SIGNATURE=y
+# CONFIG_FORCE_NR_CPUS is not set
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_SIGNATURE=y
+CONFIG_DIMLIB=y
+CONFIG_LIBFDT=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_32=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+CONFIG_FONT_6x10=y
+# CONFIG_FONT_10x18 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+CONFIG_FONT_TER16x32=y
+CONFIG_FONT_6x8=y
+CONFIG_SG_SPLIT=y
+CONFIG_SG_POOL=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_SBITMAP=y
+# end of Library routines
+
+CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_POLYNOMIAL=m
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+CONFIG_STACKTRACE_BUILD_ID=y
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
+CONFIG_SYMBOLIC_ERRNAME=y
+CONFIG_DEBUG_BUGVERBOSE=y
+# end of printk and dmesg options
+
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+CONFIG_AS_HAS_NON_CONST_LEB128=y
+# CONFIG_DEBUG_INFO_NONE is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF5 is not set
+# CONFIG_DEBUG_INFO_REDUCED is not set
+CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
+# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+# CONFIG_DEBUG_INFO_BTF is not set
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_FRAME_WARN=1024
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_VMLINUX_MAP is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+#
+# Generic Kernel Debugging Instruments
+#
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+CONFIG_HAVE_KCSAN_COMPILER=y
+# end of Generic Kernel Debugging Instruments
+
+#
+# Networking Debugging
+#
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
+# CONFIG_DEBUG_NET is not set
+# end of Networking Debugging
+
+#
+# Memory Debugging
+#
+CONFIG_PAGE_EXTENSION=y
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_PAGE_OWNER is not set
+CONFIG_PAGE_POISONING=y
+# CONFIG_DEBUG_PAGE_REF is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
+CONFIG_DEBUG_WX=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SHRINKER_DEBUG is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_SCHED_STACK_END_CHECK=y
+# CONFIG_DEBUG_VM is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_KMAP_LOCAL is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
+# CONFIG_KASAN is not set
+CONFIG_HAVE_ARCH_KFENCE=y
+CONFIG_KFENCE=y
+CONFIG_KFENCE_SAMPLE_INTERVAL=0
+CONFIG_KFENCE_NUM_OBJECTS=255
+# CONFIG_KFENCE_DEFERRABLE is not set
+# CONFIG_KFENCE_STATIC_KEYS is not set
+CONFIG_KFENCE_STRESS_TEST_FAULTS=0
+# end of Memory Debugging
+
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Oops, Lockups and Hangs
+#
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+# CONFIG_WQ_WATCHDOG is not set
+# CONFIG_TEST_LOCKUP is not set
+# end of Debug Oops, Lockups and Hangs
+
+#
+# Scheduler Debugging
+#
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+# end of Scheduler Debugging
+
+# CONFIG_DEBUG_TIMEKEEPING is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WW_MUTEX_SELFTEST is not set
+# CONFIG_SCF_TORTURE_TEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+
+#
+# Debug kernel data structures
+#
+CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+CONFIG_BUG_ON_DATA_CORRUPTION=y
+# CONFIG_DEBUG_MAPLE_TREE is not set
+# end of Debug kernel data structures
+
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_RCU_SCALE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_REF_SCALE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
+CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
+# CONFIG_RCU_CPU_STALL_CPUTIME is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_DEBUG_CGROUP_REF is not set
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
+CONFIG_BUILDTIME_MCOUNT_SORT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_BOOTTIME_TRACING is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_STACK_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_HWLAT_TRACER is not set
+# CONFIG_OSNOISE_TRACER is not set
+# CONFIG_TIMERLAT_TRACER is not set
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+# CONFIG_BPF_KPROBE_OVERRIDE is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
+CONFIG_SYNTH_EVENTS=y
+# CONFIG_USER_EVENTS is not set
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_TRACE_EVENT_INJECT is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_SYNTH_EVENT_GEN_TEST is not set
+# CONFIG_KPROBE_EVENT_GEN_TEST is not set
+# CONFIG_RV is not set
+# CONFIG_SAMPLES is not set
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+
+#
+# arm Debugging
+#
+CONFIG_ARM_PTDUMP_CORE=y
+# CONFIG_ARM_PTDUMP_DEBUGFS is not set
+CONFIG_UNWINDER_FRAME_POINTER=y
+# CONFIG_UNWINDER_ARM is not set
+# CONFIG_BACKTRACE_VERBOSE is not set
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_LL is not set
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
+# CONFIG_ARM_KPROBES_TEST is not set
+# CONFIG_PID_IN_CONTEXTIDR is not set
+# CONFIG_CORESIGHT is not set
+# end of arm Debugging
+
+#
+# Kernel Testing and Coverage
+#
+# CONFIG_KUNIT is not set
+CONFIG_NOTIFIER_ERROR_INJECTION=m
+CONFIG_PM_NOTIFIER_ERROR_INJECT=m
+# CONFIG_OF_RECONFIG_NOTIFIER_ERROR_INJECT is not set
+# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_TEST_DHRY is not set
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_MIN_HEAP is not set
+# CONFIG_TEST_DIV64 is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_TEST_REF_TRACKER is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_STRING_SELFTEST is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+CONFIG_TEST_SCANF=m
+# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_UUID is not set
+CONFIG_TEST_XARRAY=m
+# CONFIG_TEST_MAPLE_TREE is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_IDA is not set
+# CONFIG_TEST_LKM is not set
+CONFIG_TEST_BITOPS=m
+CONFIG_TEST_VMALLOC=m
+CONFIG_TEST_USER_COPY=m
+CONFIG_TEST_BPF=m
+CONFIG_TEST_BLACKHOLE_DEV=m
+CONFIG_FIND_BIT_BENCHMARK=m
+CONFIG_TEST_FIRMWARE=m
+# CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UDELAY is not set
+CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_TEST_DYNAMIC_DEBUG is not set
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_FREE_PAGES is not set
+CONFIG_ARCH_USE_MEMTEST=y
+# CONFIG_MEMTEST is not set
+# end of Kernel Testing and Coverage
+
+#
+# Rust hacking
+#
+# end of Rust hacking
+# end of Kernel hacking
diff --git a/gnu/packages/aux-files/linux-libre/6.4-arm64.conf b/gnu/packages/aux-files/linux-libre/6.4-arm64.conf
new file mode 100644
index 0000000000..bfa1d2d664
--- /dev/null
+++ b/gnu/packages/aux-files/linux-libre/6.4-arm64.conf
@@ -0,0 +1,11406 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm64 6.4.2 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=110300
+CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23800
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23800
+CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
+CONFIG_PAHOLE_VERSION=0
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_TABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_WERROR is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_HAVE_KERNEL_ZSTD=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+# CONFIG_KERNEL_ZSTD is not set
+CONFIG_DEFAULT_INIT=""
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_WATCH_QUEUE=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_INJECTION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
+CONFIG_GENERIC_IRQ_IPI=y
+CONFIG_GENERIC_IRQ_IPI_MUX=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_IRQ_MSI_IOMMU=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
+CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
+CONFIG_CONTEXT_TRACKING=y
+CONFIG_CONTEXT_TRACKING_IDLE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+CONFIG_BPF=y
+CONFIG_HAVE_EBPF_JIT=y
+CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
+
+#
+# BPF subsystem
+#
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+CONFIG_BPF_JIT_DEFAULT_ON=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
+# CONFIG_BPF_PRELOAD is not set
+CONFIG_BPF_LSM=y
+# end of BPF subsystem
+
+CONFIG_PREEMPT_BUILD=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPTION=y
+CONFIG_PREEMPT_DYNAMIC=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_SCHED_THERMAL_PRESSURE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+# CONFIG_PSI_DEFAULT_DISABLED is not set
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+CONFIG_PREEMPT_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_TASKS_RCU=y
+CONFIG_TASKS_RUDE_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKHEADERS is not set
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+# CONFIG_PRINTK_INDEX is not set
+CONFIG_GENERIC_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_CC_HAS_INT128=y
+CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
+CONFIG_CC_NO_ARRAY_BOUNDS=y
+CONFIG_ARCH_SUPPORTS_INT128=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+# CONFIG_CGROUP_FAVOR_DYNMODS is not set
+CONFIG_MEMCG=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_SCHED_MM_CID=y
+CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_FREEZER=y
+# CONFIG_CGROUP_HUGETLB is not set
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_CGROUP_MISC=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_TIME_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
+CONFIG_BOOT_CONFIG=y
+# CONFIG_BOOT_CONFIG_FORCE is not set
+# CONFIG_BOOT_CONFIG_EMBED is not set
+CONFIG_INITRAMFS_PRESERVE_MTIME=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_LD_ORPHAN_WARN=y
+CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+# CONFIG_SGETMASK_SYSCALL is not set
+# CONFIG_SYSFS_SYSCALL is not set
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_SELFTEST is not set
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_GUEST_PERF_EVENTS=y
+# CONFIG_PC104 is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_ARM64=y
+CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_64BIT=y
+CONFIG_MMU=y
+CONFIG_ARM64_PAGE_SHIFT=12
+CONFIG_ARM64_CONT_PTE_SHIFT=4
+CONFIG_ARM64_CONT_PMD_SHIFT=4
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CSUM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
+CONFIG_SMP=y
+CONFIG_KERNEL_MODE_NEON=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_BROKEN_GAS_INST=y
+CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y
+
+#
+# Platform selection
+#
+# CONFIG_ARCH_ACTIONS is not set
+CONFIG_ARCH_SUNXI=y
+# CONFIG_ARCH_ALPINE is not set
+CONFIG_ARCH_APPLE=y
+CONFIG_ARCH_BCM=y
+CONFIG_ARCH_BCM2835=y
+# CONFIG_ARCH_BCM_IPROC is not set
+CONFIG_ARCH_BCMBCA=y
+# CONFIG_ARCH_BRCMSTB is not set
+# CONFIG_ARCH_BERLIN is not set
+CONFIG_ARCH_BITMAIN=y
+# CONFIG_ARCH_EXYNOS is not set
+# CONFIG_ARCH_SPARX5 is not set
+# CONFIG_ARCH_K3 is not set
+# CONFIG_ARCH_LG1K is not set
+CONFIG_ARCH_HISI=y
+CONFIG_ARCH_KEEMBAY=y
+# CONFIG_ARCH_MEDIATEK is not set
+CONFIG_ARCH_MESON=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_ARCH_NXP=y
+# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_MXC=y
+# CONFIG_ARCH_S32 is not set
+CONFIG_ARCH_NPCM=y
+CONFIG_ARCH_QCOM=y
+# CONFIG_ARCH_REALTEK is not set
+# CONFIG_ARCH_RENESAS is not set
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_ARCH_SEATTLE=y
+CONFIG_ARCH_INTEL_SOCFPGA=y
+CONFIG_ARCH_SYNQUACER=y
+CONFIG_ARCH_TEGRA=y
+# CONFIG_ARCH_SPRD is not set
+CONFIG_ARCH_THUNDER=y
+CONFIG_ARCH_THUNDER2=y
+# CONFIG_ARCH_UNIPHIER is not set
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_VISCONTI=y
+CONFIG_ARCH_XGENE=y
+# CONFIG_ARCH_ZYNQMP is not set
+# end of Platform selection
+
+#
+# Kernel Features
+#
+
+#
+# ARM errata workarounds via the alternatives framework
+#
+CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
+CONFIG_ARM64_ERRATUM_826319=y
+CONFIG_ARM64_ERRATUM_827319=y
+CONFIG_ARM64_ERRATUM_824069=y
+CONFIG_ARM64_ERRATUM_819472=y
+CONFIG_ARM64_ERRATUM_832075=y
+CONFIG_ARM64_ERRATUM_834220=y
+CONFIG_ARM64_ERRATUM_1742098=y
+CONFIG_ARM64_ERRATUM_845719=y
+CONFIG_ARM64_ERRATUM_843419=y
+CONFIG_ARM64_ERRATUM_1024718=y
+CONFIG_ARM64_ERRATUM_1418040=y
+CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
+CONFIG_ARM64_ERRATUM_1165522=y
+CONFIG_ARM64_ERRATUM_1319367=y
+CONFIG_ARM64_ERRATUM_1530923=y
+CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
+CONFIG_ARM64_ERRATUM_2441007=y
+CONFIG_ARM64_ERRATUM_1286807=y
+CONFIG_ARM64_ERRATUM_1463225=y
+CONFIG_ARM64_ERRATUM_1542419=y
+CONFIG_ARM64_ERRATUM_1508412=y
+CONFIG_ARM64_ERRATUM_2051678=y
+CONFIG_ARM64_ERRATUM_2077057=y
+CONFIG_ARM64_ERRATUM_2658417=y
+CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
+CONFIG_ARM64_ERRATUM_2054223=y
+CONFIG_ARM64_ERRATUM_2067961=y
+CONFIG_ARM64_ERRATUM_2441009=y
+CONFIG_ARM64_ERRATUM_2457168=y
+CONFIG_ARM64_ERRATUM_2645198=y
+CONFIG_CAVIUM_ERRATUM_22375=y
+CONFIG_CAVIUM_ERRATUM_23144=y
+CONFIG_CAVIUM_ERRATUM_23154=y
+CONFIG_CAVIUM_ERRATUM_27456=y
+CONFIG_CAVIUM_ERRATUM_30115=y
+CONFIG_CAVIUM_TX2_ERRATUM_219=y
+CONFIG_FUJITSU_ERRATUM_010001=y
+CONFIG_HISILICON_ERRATUM_161600802=y
+CONFIG_QCOM_FALKOR_ERRATUM_1003=y
+CONFIG_QCOM_FALKOR_ERRATUM_1009=y
+CONFIG_QCOM_QDF2400_ERRATUM_0065=y
+CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
+CONFIG_ROCKCHIP_ERRATUM_3588001=y
+CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
+# end of ARM errata workarounds via the alternatives framework
+
+CONFIG_ARM64_4K_PAGES=y
+# CONFIG_ARM64_16K_PAGES is not set
+# CONFIG_ARM64_64K_PAGES is not set
+# CONFIG_ARM64_VA_BITS_39 is not set
+CONFIG_ARM64_VA_BITS_48=y
+CONFIG_ARM64_VA_BITS=48
+CONFIG_ARM64_PA_BITS_48=y
+CONFIG_ARM64_PA_BITS=48
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_CLUSTER=y
+# CONFIG_SCHED_SMT is not set
+CONFIG_NR_CPUS=256
+CONFIG_HOTPLUG_CPU=y
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=2
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_HW_PERF_EVENTS=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_KEXEC=y
+CONFIG_KEXEC_FILE=y
+# CONFIG_KEXEC_SIG is not set
+CONFIG_CRASH_DUMP=y
+CONFIG_TRANS_TABLE=y
+CONFIG_XEN_DOM0=y
+CONFIG_XEN=y
+CONFIG_ARCH_FORCE_MAX_ORDER=10
+CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
+CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
+# CONFIG_ARM64_SW_TTBR0_PAN is not set
+CONFIG_ARM64_TAGGED_ADDR_ABI=y
+CONFIG_COMPAT=y
+CONFIG_KUSER_HELPERS=y
+CONFIG_COMPAT_ALIGNMENT_FIXUPS=y
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
+
+#
+# ARMv8.1 architectural features
+#
+CONFIG_ARM64_HW_AFDBM=y
+CONFIG_ARM64_PAN=y
+CONFIG_ARM64_USE_LSE_ATOMICS=y
+# end of ARMv8.1 architectural features
+
+#
+# ARMv8.2 architectural features
+#
+CONFIG_ARM64_PMEM=y
+CONFIG_ARM64_RAS_EXTN=y
+CONFIG_ARM64_CNP=y
+# end of ARMv8.2 architectural features
+
+#
+# ARMv8.3 architectural features
+#
+CONFIG_ARM64_PTR_AUTH=y
+CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y
+# end of ARMv8.3 architectural features
+
+#
+# ARMv8.4 architectural features
+#
+CONFIG_ARM64_AMU_EXTN=y
+# end of ARMv8.4 architectural features
+
+#
+# ARMv8.5 architectural features
+#
+CONFIG_ARM64_BTI=y
+CONFIG_ARM64_E0PD=y
+# end of ARMv8.5 architectural features
+
+#
+# ARMv8.7 architectural features
+#
+CONFIG_ARM64_EPAN=y
+# end of ARMv8.7 architectural features
+
+CONFIG_ARM64_SVE=y
+CONFIG_ARM64_SME=y
+CONFIG_ARM64_MODULE_PLTS=y
+# CONFIG_ARM64_PSEUDO_NMI is not set
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# end of Kernel Features
+
+#
+# Boot options
+#
+CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
+CONFIG_CMDLINE=""
+CONFIG_EFI_STUB=y
+CONFIG_EFI=y
+CONFIG_DMI=y
+# end of Boot options
+
+#
+# Power management options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_USERSPACE_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_CPU_PM=y
+CONFIG_ENERGY_MODEL=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# end of Power management options
+
+#
+# CPU Power Management
+#
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE_GOV_TEO=y
+
+#
+# ARM CPU Idle Drivers
+#
+# CONFIG_ARM_PSCI_CPUIDLE is not set
+# end of ARM CPU Idle Drivers
+# end of CPU Idle
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_CPUFREQ_DT=m
+CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_ACPI_CPPC_CPUFREQ=m
+CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
+CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m
+CONFIG_ARM_APPLE_SOC_CPUFREQ=y
+# CONFIG_ARM_ARMADA_37XX_CPUFREQ is not set
+# CONFIG_ARM_ARMADA_8K_CPUFREQ is not set
+CONFIG_ARM_IMX_CPUFREQ_DT=m
+# CONFIG_ARM_QCOM_CPUFREQ_HW is not set
+CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
+CONFIG_ARM_SCMI_CPUFREQ=m
+CONFIG_ARM_TEGRA20_CPUFREQ=m
+CONFIG_ARM_TEGRA124_CPUFREQ=y
+# CONFIG_ARM_TEGRA186_CPUFREQ is not set
+CONFIG_ARM_TEGRA194_CPUFREQ=m
+# end of CPU Frequency scaling
+# end of CPU Power Management
+
+CONFIG_ARCH_SUPPORTS_ACPI=y
+CONFIG_ACPI=y
+CONFIG_ACPI_GENERIC_GSI=y
+CONFIG_ACPI_CCA_REQUIRED=y
+CONFIG_ACPI_TABLE_LIB=y
+# CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_SPCR_TABLE=y
+CONFIG_ACPI_FPDT=y
+# CONFIG_ACPI_EC_DEBUGFS is not set
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_TAD=m
+# CONFIG_ACPI_DOCK is not set
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_MCFG=y
+CONFIG_ACPI_CPPC_LIB=y
+CONFIG_ACPI_PROCESSOR=y
+# CONFIG_ACPI_IPMI is not set
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_THERMAL=y
+CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_DEBUG is not set
+# CONFIG_ACPI_PCI_SLOT is not set
+CONFIG_ACPI_CONTAINER=y
+# CONFIG_ACPI_HED is not set
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+# CONFIG_ACPI_BGRT is not set
+CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
+CONFIG_ACPI_NFIT=y
+# CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_HMAT=y
+CONFIG_HAVE_ACPI_APEI=y
+# CONFIG_ACPI_APEI is not set
+# CONFIG_ACPI_CONFIGFS is not set
+CONFIG_ACPI_PFRUT=m
+CONFIG_ACPI_IORT=y
+CONFIG_ACPI_GTDT=y
+CONFIG_ACPI_APMT=y
+CONFIG_ACPI_PPTT=y
+CONFIG_ACPI_PCC=y
+CONFIG_ACPI_FFH=y
+# CONFIG_PMIC_OPREGION is not set
+CONFIG_ACPI_VIOT=y
+CONFIG_ACPI_PRMT=y
+CONFIG_IRQ_BYPASS_MANAGER=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_DIRTY_RING=y
+CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y
+CONFIG_NEED_KVM_DIRTY_RING_WITH_BITMAP=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
+CONFIG_KVM_XFER_TO_GUEST_WORK=y
+CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=y
+# CONFIG_NVHE_EL2_DEBUG is not set
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_KEEPINITRD=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_NO_INSTR=y
+CONFIG_HAVE_ASM_MODVERSIONS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_MMU_GATHER_TABLE_FREE=y
+CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
+CONFIG_MMU_LAZY_TLB_REFCOUNT=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_HAS_NMI_SAFE_THIS_CPU_OPS=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+CONFIG_HAVE_ARCH_STACKLEAK=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
+CONFIG_LTO_NONE=y
+CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
+CONFIG_HAVE_CONTEXT_TRACKING_USER=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PUD=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_HAVE_ARCH_HUGE_VMALLOC=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_ARCH_MMAP_RND_BITS=18
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
+CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
+CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_HAVE_ARCH_COMPILER_H=y
+CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_HAS_RELR=y
+CONFIG_RELR=y
+CONFIG_HAVE_PREEMPT_DYNAMIC=y
+CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
+CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_HAVE_GCC_PLUGINS=y
+CONFIG_GCC_PLUGINS=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_FUNCTION_ALIGNMENT_4B=y
+CONFIG_FUNCTION_ALIGNMENT_8B=y
+CONFIG_FUNCTION_ALIGNMENT=8
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_DEBUG is not set
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODULE_UNLOAD_TAINT_TRACKING is not set
+CONFIG_MODVERSIONS=y
+CONFIG_ASM_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS_NONE is not set
+CONFIG_MODULE_COMPRESS_GZIP=y
+# CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
+CONFIG_MODULE_DECOMPRESS=y
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+CONFIG_MODPROBE_PATH="/run/current-system/profile/bin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLOCK_LEGACY_AUTOLOAD=y
+CONFIG_BLK_RQ_ALLOC_TIME=y
+CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_CGROUP_PUNT_BIO=y
+CONFIG_BLK_DEV_BSG_COMMON=y
+CONFIG_BLK_ICQ=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_INTEGRITY_T10=m
+# CONFIG_BLK_DEV_ZONED is not set
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
+CONFIG_BLK_WBT=y
+CONFIG_BLK_WBT_MQ=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+CONFIG_BLK_CGROUP_FC_APPID=y
+CONFIG_BLK_CGROUP_IOCOST=y
+CONFIG_BLK_CGROUP_IOPRIO=y
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_SED_OPAL=y
+CONFIG_BLK_INLINE_ENCRYPTION=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
+# end of Partition Types
+
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
+CONFIG_BLK_MQ_STACKING=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_IOSCHED_BFQ=m
+CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
+CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_STATE=y
+CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y
+CONFIG_ARCH_HAVE_ELF_PROT=y
+CONFIG_ARCH_USE_GNU_PROPERTY=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_ZPOOL=y
+CONFIG_SWAP=y
+CONFIG_ZSWAP=y
+# CONFIG_ZSWAP_DEFAULT_ON is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+CONFIG_ZBUD=y
+# CONFIG_Z3FOLD is not set
+CONFIG_ZSMALLOC=m
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_ZSMALLOC_CHAIN_SIZE=8
+
+#
+# SLAB allocator options
+#
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLUB_TINY is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+# CONFIG_SLUB_STATS is not set
+CONFIG_SLUB_CPU_PARTIAL=y
+# end of SLAB allocator options
+
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SPARSEMEM=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_EXCLUSIVE_SYSTEM_RAM=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
+CONFIG_PAGE_REPORTING=y
+CONFIG_MIGRATION=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_ARCH_WANTS_THP_SWAP=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_THP_SWAP=y
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_SYSFS=y
+CONFIG_CMA_AREAS=7
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+CONFIG_PAGE_IDLE_FLAG=y
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_ARCH_HAS_ZONE_DMA_SET=y
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA32=y
+CONFIG_HMM_MIRROR=y
+CONFIG_GET_FREE_REGION=y
+CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_TEST is not set
+# CONFIG_DMAPOOL_TEST is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_MAPPING_DIRTY_HELPERS=y
+CONFIG_SECRETMEM=y
+CONFIG_ANON_VMA_NAME=y
+CONFIG_USERFAULTFD=y
+CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
+CONFIG_LRU_GEN=y
+# CONFIG_LRU_GEN_ENABLED is not set
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
+CONFIG_PER_VMA_LOCK=y
+CONFIG_LOCK_MM_AND_FIND_VMA=y
+
+#
+# Data Access Monitoring
+#
+CONFIG_DAMON=y
+CONFIG_DAMON_VADDR=y
+CONFIG_DAMON_PADDR=y
+CONFIG_DAMON_SYSFS=y
+# CONFIG_DAMON_DBGFS is not set
+CONFIG_DAMON_RECLAIM=y
+CONFIG_DAMON_LRU_SORT=y
+# end of Data Access Monitoring
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_AF_UNIX_OOB=y
+CONFIG_UNIX_DIAG=m
+# CONFIG_TLS is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_AH=m
+CONFIG_XFRM_ESP=m
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+# CONFIG_SMC is not set
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
+CONFIG_NET_HANDSHAKE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_ESP_OFFLOAD=m
+# CONFIG_INET_ESPINTCP is not set
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_TABLE_PERTURB_ORDER=16
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+# CONFIG_INET_RAW_DIAG is not set
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_ESP_OFFLOAD=m
+# CONFIG_INET6_ESPINTCP is not set
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_BPF=y
+# CONFIG_IPV6_RPL_LWTUNNEL is not set
+# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
+# CONFIG_NETLABEL is not set
+CONFIG_MPTCP=y
+CONFIG_INET_MPTCP_DIAG=m
+CONFIG_MPTCP_IPV6=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_EGRESS=y
+CONFIG_NETFILTER_SKIP_EGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_BPF_LINK=y
+CONFIG_NETFILTER_NETLINK_HOOK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_NETLINK_OSF=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_SYSLOG=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CONNTRACK_OVS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NF_NAT_OVS=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+# CONFIG_NFT_FLOW_OFFLOAD is not set
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XTABLES_COMPAT=y
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_TWOS=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_CRYPTO=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_BRIDGE_MRP=y
+CONFIG_BRIDGE_CFM=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_NONE=m
+CONFIG_NET_DSA_TAG_AR9331=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_LEGACY=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_HELLCREEK=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_OCELOT=m
+CONFIG_NET_DSA_TAG_OCELOT_8021Q=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_RTL4_A=m
+CONFIG_NET_DSA_TAG_RTL8_4=m
+CONFIG_NET_DSA_TAG_RZN1_A5PSW=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
+CONFIG_NET_DSA_TAG_XRS700X=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+# CONFIG_NET_SCH_CBS is not set
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_MQPRIO_LIB=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_SCH_ETS=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_SAMPLE=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_MPLS=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_ACT_CT=m
+CONFIG_NET_ACT_GATE=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+# CONFIG_NET_TC_SKB_EXT is not set
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=m
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_BATMAN_V is not set
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VSOCKETS_LOOPBACK=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=y
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+# CONFIG_HSR is not set
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_QRTR=m
+CONFIG_QRTR_SMD=m
+CONFIG_QRTR_TUN=m
+CONFIG_QRTR_MHI=m
+# CONFIG_NET_NCSI is not set
+CONFIG_PCPU_DEV_REFCNT=y
+CONFIG_MAX_SKB_FRAGS=17
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+# CONFIG_BPF_STREAM_PARSER is not set
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_DROP_MONITOR=m
+# end of Network testing
+# end of Networking options
+
+# CONFIG_HAMRADIO is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+CONFIG_CAN_J1939=m
+CONFIG_CAN_ISOTP=m
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_LE_L2CAP_ECRED=y
+CONFIG_BT_6LOWPAN=m
+CONFIG_BT_LEDS=y
+CONFIG_BT_MSFTEXT=y
+CONFIG_BT_AOSPEXT=y
+CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_SELFTEST is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_MTK=m
+CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
+CONFIG_BT_HCIBTUSB_POLL_SYNC=y
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_MTK=y
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_NOKIA is not set
+# CONFIG_BT_HCIUART_BCSP is not set
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_RTL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIUART_MRVL=y
+# CONFIG_BT_HCIBCM203X is not set
+CONFIG_BT_HCIBCM4377=m
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIVHCI is not set
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
+CONFIG_BT_QCOMSMD=m
+CONFIG_BT_HCIRSI=m
+CONFIG_BT_VIRTIO=m
+CONFIG_BT_NXPUART=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_INJECT_RX_DELAY is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=y
+# CONFIG_RXPERF is not set
+# CONFIG_AF_KCM is not set
+CONFIG_MCTP=y
+CONFIG_MCTP_FLOWS=y
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+# CONFIG_RFKILL_GPIO is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_FD=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_XEN is not set
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+# CONFIG_NFC_NCI is not set
+# CONFIG_NFC_HCI is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+# CONFIG_NFC_TRF7970A is not set
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+# CONFIG_NFC_PN533_I2C is not set
+# CONFIG_NFC_PN532_UART is not set
+# CONFIG_NFC_ST95HF is not set
+# end of Near Field Communication (NFC) devices
+
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_NET_SELFTESTS=m
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_PAGE_POOL_STATS=y
+CONFIG_FAILOVER=m
+CONFIG_ETHTOOL_NETLINK=y
+
+#
+# Device Drivers
+#
+CONFIG_ARM_AMBA=y
+CONFIG_TEGRA_AHB=y
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_DOMAINS_GENERIC=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_PCIE_DPC=y
+CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_EDR is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+# CONFIG_PCI_PF_STUB is not set
+CONFIG_PCI_ATS=y
+CONFIG_PCI_DOE=y
+CONFIG_PCI_ECAM=y
+CONFIG_PCI_BRIDGE_EMUL=y
+CONFIG_PCI_IOV=y
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
+CONFIG_PCI_LABEL=y
+CONFIG_PCI_HYPERV=m
+# CONFIG_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_SHPC=y
+
+#
+# PCI controller drivers
+#
+CONFIG_PCI_AARDVARK=y
+# CONFIG_PCIE_ALTERA is not set
+CONFIG_PCIE_APPLE_MSI_DOORBELL_ADDR=0xfffff000
+CONFIG_PCIE_APPLE=m
+CONFIG_PCIE_BRCMSTB=m
+CONFIG_PCI_HOST_THUNDER_PEM=y
+CONFIG_PCI_HOST_THUNDER_ECAM=y
+# CONFIG_PCI_FTPCI100 is not set
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCIE_MICROCHIP_HOST=y
+CONFIG_PCI_HYPERV_INTERFACE=m
+CONFIG_PCI_TEGRA=y
+CONFIG_PCIE_ROCKCHIP=y
+CONFIG_PCIE_ROCKCHIP_HOST=m
+CONFIG_PCI_XGENE=y
+CONFIG_PCI_XGENE_MSI=y
+# CONFIG_PCIE_XILINX is not set
+
+#
+# Cadence-based PCIe controllers
+#
+# CONFIG_PCIE_CADENCE_PLAT_HOST is not set
+# CONFIG_PCI_J721E_HOST is not set
+# end of Cadence-based PCIe controllers
+
+#
+# DesignWare-based PCIe controllers
+#
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+# CONFIG_PCIE_AL is not set
+# CONFIG_PCI_MESON is not set
+CONFIG_PCI_IMX6=y
+CONFIG_PCI_IMX6_HOST=y
+CONFIG_PCI_HISI=y
+CONFIG_PCIE_KIRIN=y
+# CONFIG_PCIE_HISI_STB is not set
+CONFIG_PCIE_KEEMBAY=y
+CONFIG_PCIE_KEEMBAY_HOST=y
+CONFIG_PCIE_ARMADA_8K=y
+CONFIG_PCIE_TEGRA194=m
+CONFIG_PCIE_TEGRA194_HOST=m
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+CONFIG_PCIE_QCOM=y
+CONFIG_PCIE_ROCKCHIP_DW_HOST=y
+CONFIG_PCIE_VISCONTI_HOST=y
+# end of DesignWare-based PCIe controllers
+
+#
+# Mobiveil-based PCIe controllers
+#
+# end of Mobiveil-based PCIe controllers
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+# CONFIG_PCI_SW_SWITCHTEC is not set
+# end of PCI switch controller drivers
+
+CONFIG_CXL_BUS=y
+CONFIG_CXL_PCI=m
+# CONFIG_CXL_MEM_RAW_COMMANDS is not set
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_PMEM=m
+CONFIG_CXL_MEM=m
+CONFIG_CXL_PORT=y
+CONFIG_CXL_SUSPEND=y
+CONFIG_CXL_REGION=y
+# CONFIG_CXL_REGION_INVALIDATION_TEST is not set
+# CONFIG_PCCARD is not set
+# CONFIG_RAPIDIO is not set
+
+#
+# Generic Driver Options
+#
+CONFIG_AUXILIARY_BUS=y
+# CONFIG_UEVENT_HELPER is not set
+CONFIG_DEVTMPFS=y
+# CONFIG_DEVTMPFS_MOUNT is not set
+CONFIG_DEVTMPFS_SAFE=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_DEBUG=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_FW_LOADER_SYSFS=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_LOADER_COMPRESS_XZ=y
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+CONFIG_FW_CACHE=y
+CONFIG_FW_UPLOAD=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_HMEM_REPORTING=y
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_SYS_HYPERVISOR=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_SOC_BUS=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=m
+CONFIG_REGMAP_SPMI=y
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SCCB=m
+CONFIG_REGMAP_SPI_AVMM=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+CONFIG_GENERIC_ARCH_TOPOLOGY=y
+CONFIG_GENERIC_ARCH_NUMA=y
+# CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+# CONFIG_BRCMSTB_GISB_ARB is not set
+CONFIG_MOXTET=m
+# CONFIG_HISILICON_LPC is not set
+# CONFIG_IMX_WEIM is not set
+CONFIG_QCOM_EBI2=y
+CONFIG_QCOM_SSC_BLOCK_BUS=y
+CONFIG_SUN50I_DE2_BUS=y
+CONFIG_SUNXI_RSB=y
+CONFIG_TEGRA_ACONNECT=y
+# CONFIG_TEGRA_GMI is not set
+CONFIG_VEXPRESS_CONFIG=y
+# CONFIG_FSL_MC_BUS is not set
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=m
+CONFIG_MHI_BUS_EP=m
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+CONFIG_ARM_SCMI_PROTOCOL=y
+# CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set
+CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
+CONFIG_ARM_SCMI_HAVE_SHMEM=y
+CONFIG_ARM_SCMI_HAVE_MSG=y
+CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y
+CONFIG_ARM_SCMI_TRANSPORT_SMC=y
+# CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set
+CONFIG_ARM_SCMI_TRANSPORT_VIRTIO=y
+# CONFIG_ARM_SCMI_TRANSPORT_VIRTIO_VERSION1_COMPLIANCE is not set
+# CONFIG_ARM_SCMI_TRANSPORT_VIRTIO_ATOMIC_ENABLE is not set
+CONFIG_ARM_SCMI_POWER_DOMAIN=m
+CONFIG_ARM_SCMI_POWER_CONTROL=m
+# end of ARM System Control and Management Interface Protocol
+
+# CONFIG_ARM_SCPI_PROTOCOL is not set
+# CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y
+CONFIG_ISCSI_IBFT=m
+CONFIG_RASPBERRYPI_FIRMWARE=y
+# CONFIG_FW_CFG_SYSFS is not set
+CONFIG_INTEL_STRATIX10_SERVICE=m
+CONFIG_INTEL_STRATIX10_RSU=m
+CONFIG_QCOM_SCM=y
+# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+CONFIG_SYSFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
+# CONFIG_TURRIS_MOX_RWTM is not set
+CONFIG_ARM_FFA_TRANSPORT=m
+CONFIG_ARM_FFA_SMCCC=y
+CONFIG_FW_CS_DSP=m
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=m
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
+CONFIG_EFI_SOFT_RESERVE=y
+CONFIG_EFI_PARAMS_FROM_FDT=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_GENERIC_STUB=y
+CONFIG_EFI_ZBOOT=y
+CONFIG_EFI_ARMSTUB_DTB_LOADER=y
+# CONFIG_EFI_BOOTLOADER_CONTROL is not set
+# CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+# CONFIG_RESET_ATTACK_MITIGATION is not set
+# CONFIG_EFI_DISABLE_PCI_DMA is not set
+CONFIG_EFI_EARLYCON=y
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
+# CONFIG_EFI_DISABLE_RUNTIME is not set
+CONFIG_EFI_COCO_SECRET=y
+# end of EFI (Extensible Firmware Interface) Support
+
+# CONFIG_IMX_DSP is not set
+CONFIG_IMX_SCU=y
+CONFIG_IMX_SCU_PD=y
+CONFIG_MESON_SM=y
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_ARM_PSCI_CHECKER is not set
+CONFIG_HAVE_ARM_SMCCC=y
+CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
+CONFIG_ARM_SMCCC_SOC_ID=y
+
+#
+# Tegra firmware driver
+#
+CONFIG_TEGRA_IVC=y
+CONFIG_TEGRA_BPMP=y
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_GNSS=m
+CONFIG_GNSS_SERIAL=m
+CONFIG_GNSS_MTK_SERIAL=m
+CONFIG_GNSS_SIRF_SERIAL=m
+CONFIG_GNSS_UBX_SERIAL=m
+CONFIG_GNSS_USB=m
+CONFIG_MTD=m
+# CONFIG_MTD_TESTS is not set
+
+#
+# Partition parsers
+#
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_BRCM_U_BOOT=m
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_OF_PARTS_BCM4908=y
+CONFIG_MTD_OF_PARTS_LINKSYS_NS=y
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+
+#
+# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK.
+#
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+# CONFIG_SM_FTL is not set
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PCI=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
+# CONFIG_MTD_MCHP23K256 is not set
+CONFIG_MTD_MCHP48L640=m
+CONFIG_MTD_SST25L=m
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
+#
+# NAND
+#
+CONFIG_MTD_NAND_CORE=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+# CONFIG_MTD_ONENAND_GENERIC is not set
+# CONFIG_MTD_ONENAND_OTP is not set
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_RAW_NAND=m
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+# CONFIG_MTD_NAND_DENALI_PCI is not set
+CONFIG_MTD_NAND_DENALI_DT=m
+# CONFIG_MTD_NAND_CAFE is not set
+CONFIG_MTD_NAND_MARVELL=m
+CONFIG_MTD_NAND_BRCMNAND=m
+CONFIG_MTD_NAND_BRCMNAND_BCM63XX=m
+CONFIG_MTD_NAND_BRCMNAND_BCMBCA=m
+CONFIG_MTD_NAND_BRCMNAND_BRCMSTB=m
+CONFIG_MTD_NAND_BRCMNAND_IPROC=m
+CONFIG_MTD_NAND_MXC=m
+CONFIG_MTD_NAND_SUNXI=m
+CONFIG_MTD_NAND_HISI504=m
+CONFIG_MTD_NAND_QCOM=m
+CONFIG_MTD_NAND_MXIC=m
+CONFIG_MTD_NAND_TEGRA=m
+CONFIG_MTD_NAND_MESON=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_NAND_CADENCE=m
+CONFIG_MTD_NAND_ARASAN=m
+# CONFIG_MTD_NAND_INTEL_LGM is not set
+CONFIG_MTD_NAND_ROCKCHIP=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_SPI_NAND=m
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
+CONFIG_MTD_NAND_ECC_MXIC=y
+# end of ECC engine support
+# end of NAND
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set
+CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
+CONFIG_SPI_HISI_SFC=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_HYPERBUS=m
+CONFIG_DTC=y
+CONFIG_OF=y
+# CONFIG_OF_UNITTEST is not set
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_KOBJ=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_RESERVED_MEM=y
+# CONFIG_OF_OVERLAY is not set
+CONFIG_OF_NUMA=y
+CONFIG_PARPORT=m
+# CONFIG_PARPORT_PC is not set
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_CDROM=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+# CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_ZRAM_MULTI_COMP=y
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLK_DEV_RNBD=y
+CONFIG_BLK_DEV_RNBD_CLIENT=m
+CONFIG_BLK_DEV_RNBD_SERVER=m
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+# CONFIG_NVME_VERBOSE_ERRORS is not set
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+# CONFIG_NVME_AUTH is not set
+CONFIG_NVME_APPLE=m
+CONFIG_NVME_TARGET=m
+# CONFIG_NVME_TARGET_PASSTHRU is not set
+# CONFIG_NVME_TARGET_LOOP is not set
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+# CONFIG_NVME_TARGET_FCLOOP is not set
+CONFIG_NVME_TARGET_TCP=m
+# CONFIG_NVME_TARGET_AUTH is not set
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_PHANTOM is not set
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_SMPRO_ERRMON=m
+CONFIG_SMPRO_MISC=m
+CONFIG_HI6421V600_IRQ=m
+# CONFIG_HP_ILO is not set
+CONFIG_QCOM_COINCELL=m
+# CONFIG_QCOM_FASTRPC is not set
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+CONFIG_SRAM=y
+CONFIG_DW_XDATA_PCIE=m
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_XILINX_SDFEC=m
+CONFIG_MISC_RTSX=m
+CONFIG_HISI_HIKEY_USB=m
+# CONFIG_OPEN_DICE is not set
+CONFIG_VCPU_STALL_DETECTOR=m
+CONFIG_C2PORT=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_IDT_89HPESX is not set
+# CONFIG_EEPROM_EE1004 is not set
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+CONFIG_VMWARE_VMCI=m
+# CONFIG_GENWQE is not set
+# CONFIG_ECHO is not set
+CONFIG_BCM_VK=m
+CONFIG_BCM_VK_TTY=y
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_UACCE=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+CONFIG_GP_PCI1XXXX=m
+# end of Misc devices
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_COMMON=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_PROC_FS is not set
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_BLK_DEV_BSG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+CONFIG_AIC7XXX_DEBUG_ENABLE=y
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+CONFIG_AIC79XX_DEBUG_ENABLE=y
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_HISI_SAS=m
+CONFIG_SCSI_HISI_SAS_PCI=m
+# CONFIG_SCSI_HISI_SAS_DEBUGFS_DEFAULT_ENABLE is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_ADVANSYS=m
+# CONFIG_SCSI_ARCMSR is not set
+CONFIG_SCSI_ESAS2R=m
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
+# CONFIG_SCSI_MYRB is not set
+# CONFIG_SCSI_MYRS is not set
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_FDOMAIN=m
+CONFIG_SCSI_FDOMAIN_PCI=m
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+# CONFIG_TCM_QLA2XXX_DEBUG is not set
+CONFIG_SCSI_QLA_ISCSI=m
+# CONFIG_QEDI is not set
+# CONFIG_QEDF is not set
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_EFCT=m
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_AM53C974 is not set
+CONFIG_SCSI_WD719X=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_ATA=m
+CONFIG_SATA_HOST=y
+CONFIG_PATA_TIMINGS=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_FORCE=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_BRCM=m
+CONFIG_AHCI_DWC=m
+CONFIG_AHCI_IMX=m
+# CONFIG_AHCI_CEVA is not set
+CONFIG_AHCI_MVEBU=m
+# CONFIG_AHCI_SUNXI is not set
+CONFIG_AHCI_TEGRA=m
+CONFIG_AHCI_XGENE=m
+CONFIG_SATA_AHCI_SEATTLE=m
+# CONFIG_SATA_INIC162X is not set
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+# CONFIG_SATA_DWC is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+CONFIG_PATA_ARTOP=m
+# CONFIG_PATA_ATIIXP is not set
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IMX is not set
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+# CONFIG_PATA_NETCELL is not set
+CONFIG_PATA_NINJA32=m
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_OF_PLATFORM=m
+# CONFIG_PATA_RZ1000 is not set
+
+#
+# Generic fallback / legacy drivers
+#
+# CONFIG_PATA_ACPI is not set
+CONFIG_ATA_GENERIC=m
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+# CONFIG_MD_CLUSTER is not set
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+# CONFIG_DM_UNSTRIPED is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_WRITECACHE=m
+# CONFIG_DM_EBS is not set
+CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_HST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+# CONFIG_DM_INTEGRITY is not set
+CONFIG_DM_AUDIT=y
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_REMOTE_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
+CONFIG_EQUALIZER=m
+# CONFIG_NET_FC is not set
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_GTP=m
+CONFIG_AMT=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_TUN=m
+CONFIG_TAP=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+# CONFIG_VSOCKMON is not set
+CONFIG_MHI_NET=m
+# CONFIG_ARCNET is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_ENI is not set
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+# CONFIG_ATM_IDT77252 is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+# CONFIG_ATM_HE is not set
+CONFIG_ATM_SOLOS=m
+
+#
+# Distributed Switch Architecture drivers
+#
+# CONFIG_B53 is not set
+# CONFIG_NET_DSA_BCM_SF2 is not set
+# CONFIG_NET_DSA_LOOP is not set
+CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m
+# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
+# CONFIG_NET_DSA_MT7530 is not set
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_PTP=y
+CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI=m
+CONFIG_NET_DSA_MV88E6XXX=m
+# CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_MSCC_FELIX_DSA_LIB=m
+CONFIG_NET_DSA_MSCC_OCELOT_EXT=m
+CONFIG_NET_DSA_MSCC_FELIX=m
+CONFIG_NET_DSA_MSCC_SEVILLE=m
+CONFIG_NET_DSA_AR9331=m
+# CONFIG_NET_DSA_QCA8K is not set
+CONFIG_NET_DSA_SJA1105=m
+CONFIG_NET_DSA_SJA1105_PTP=y
+# CONFIG_NET_DSA_SJA1105_TAS is not set
+CONFIG_NET_DSA_XRS700X=m
+CONFIG_NET_DSA_XRS700X_I2C=m
+CONFIG_NET_DSA_XRS700X_MDIO=m
+CONFIG_NET_DSA_REALTEK=m
+CONFIG_NET_DSA_REALTEK_MDIO=m
+CONFIG_NET_DSA_REALTEK_SMI=m
+CONFIG_NET_DSA_REALTEK_RTL8365MB=m
+CONFIG_NET_DSA_REALTEK_RTL8366RB=m
+# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
+CONFIG_NET_DSA_VITESSE_VSC73XX=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+# CONFIG_SLICOSS is not set
+CONFIG_NET_VENDOR_ALLWINNER=y
+# CONFIG_SUN4I_EMAC is not set
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+# CONFIG_ALTERA_TSE is not set
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
+CONFIG_NET_VENDOR_AMD=y
+# CONFIG_AMD8111_ETH is not set
+CONFIG_PCNET32=m
+CONFIG_AMD_XGBE=m
+# CONFIG_AMD_XGBE_DCB is not set
+CONFIG_PDS_CORE=m
+CONFIG_NET_XGENE=m
+CONFIG_NET_XGENE_V2=m
+CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
+# CONFIG_NET_VENDOR_ARC is not set
+CONFIG_NET_VENDOR_ASIX=y
+CONFIG_SPI_AX88796C=m
+CONFIG_SPI_AX88796C_COMPRESSION=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_VENDOR_BROADCOM=y
+# CONFIG_B44 is not set
+# CONFIG_BCM4908_ENET is not set
+# CONFIG_BCMGENET is not set
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+# CONFIG_SYSTEMPORT is not set
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+# CONFIG_BNXT_DCB is not set
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_CADENCE=y
+# CONFIG_MACB is not set
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=y
+CONFIG_LIQUIDIO=m
+# CONFIG_LIQUIDIO_VF is not set
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_CHELSIO_INLINE_CRYPTO=y
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_NET_VENDOR_CORTINA=y
+# CONFIG_GEMINI_ETHERNET is not set
+CONFIG_NET_VENDOR_DAVICOM=y
+CONFIG_DM9051=m
+# CONFIG_DNET is not set
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_ENGLEDER=y
+CONFIG_TSNEP=m
+# CONFIG_TSNEP_SELFTESTS is not set
+CONFIG_NET_VENDOR_EZCHIP=y
+# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_FEC=m
+CONFIG_FSL_PQ_MDIO=m
+CONFIG_FSL_XGMAC_MDIO=m
+CONFIG_GIANFAR=m
+CONFIG_FSL_DPAA2_SWITCH=m
+CONFIG_FSL_ENETC_CORE=m
+CONFIG_FSL_ENETC=m
+CONFIG_FSL_ENETC_VF=m
+CONFIG_FSL_ENETC_IERB=m
+CONFIG_FSL_ENETC_MDIO=m
+CONFIG_FSL_ENETC_PTP_CLOCK=m
+CONFIG_FSL_ENETC_QOS=y
+CONFIG_NET_VENDOR_FUNGIBLE=y
+CONFIG_FUN_CORE=m
+CONFIG_FUN_ETH=m
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_GVE=m
+CONFIG_NET_VENDOR_HISILICON=y
+CONFIG_HIX5HD2_GMAC=m
+CONFIG_HISI_FEMAC=m
+CONFIG_HIP04_ETH=m
+CONFIG_HI13X1_GMAC=y
+CONFIG_HNS_MDIO=m
+CONFIG_HNS=m
+CONFIG_HNS_DSAF=m
+CONFIG_HNS_ENET=m
+# CONFIG_HNS3 is not set
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_HINIC=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGBVF=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCB=y
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+# CONFIG_I40EVF is not set
+# CONFIG_ICE is not set
+# CONFIG_FM10K is not set
+# CONFIG_IGC is not set
+CONFIG_JME=m
+CONFIG_NET_VENDOR_ADI=y
+CONFIG_ADIN1110=m
+CONFIG_NET_VENDOR_LITEX=y
+CONFIG_LITEX_LITEETH=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_MVNETA=m
+CONFIG_MVPP2=m
+CONFIG_MVPP2_PTP=y
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_OCTEONTX2_MBOX=m
+# CONFIG_OCTEONTX2_AF is not set
+CONFIG_OCTEONTX2_PF=m
+CONFIG_OCTEONTX2_VF=m
+CONFIG_OCTEON_EP=m
+CONFIG_PRESTERA=m
+CONFIG_PRESTERA_PCI=m
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+# CONFIG_MLX5_FPGA is not set
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_BRIDGE=y
+CONFIG_MLX5_CORE_EN_DCB=y
+# CONFIG_MLX5_CORE_IPOIB is not set
+CONFIG_MLX5_EN_MACSEC=y
+CONFIG_MLX5_EN_IPSEC=y
+CONFIG_MLX5_SW_STEERING=y
+CONFIG_MLX5_SF=y
+CONFIG_MLX5_SF_MANAGER=y
+# CONFIG_MLXSW_CORE is not set
+# CONFIG_MLXFW is not set
+CONFIG_MLXBF_GIGE=m
+CONFIG_NET_VENDOR_MICREL=y
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ENCX24J600 is not set
+# CONFIG_LAN743X is not set
+# CONFIG_LAN966X_SWITCH is not set
+# CONFIG_VCAP is not set
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_MSCC_OCELOT_SWITCH_LIB=m
+CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_NET_VENDOR_MICROSOFT=y
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+CONFIG_NFP_APP_FLOWER=y
+CONFIG_NFP_APP_ABM_NIC=y
+CONFIG_NFP_NET_IPSEC=y
+# CONFIG_NFP_DEBUG is not set
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NE2K_PCI=m
+CONFIG_NET_VENDOR_NVIDIA=y
+# CONFIG_FORCEDETH is not set
+CONFIG_NET_VENDOR_OKI=y
+# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_PENSANDO=y
+CONFIG_IONIC=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_RDMA=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_QUALCOMM=y
+# CONFIG_QCA7000_SPI is not set
+# CONFIG_QCA7000_UART is not set
+CONFIG_QCOM_EMAC=m
+# CONFIG_RMNET is not set
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+# CONFIG_ROCKER is not set
+CONFIG_NET_VENDOR_SAMSUNG=y
+# CONFIG_SXGBE_ETH is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+# CONFIG_SIS900 is not set
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_SFC_SIENA=m
+CONFIG_SFC_SIENA_MTD=y
+CONFIG_SFC_SIENA_MCDI_MON=y
+CONFIG_SFC_SIENA_SRIOV=y
+CONFIG_SFC_SIENA_MCDI_LOGGING=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC91X=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_SOCIONEXT=y
+CONFIG_SNI_NETSEC=m
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+# CONFIG_DWMAC_DWC_QOS_ETH is not set
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_IPQ806X=m
+CONFIG_DWMAC_MESON=m
+CONFIG_DWMAC_QCOM_ETHQOS=m
+CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_SOCFPGA=m
+CONFIG_DWMAC_SUNXI=m
+CONFIG_DWMAC_SUN8I=m
+CONFIG_DWMAC_IMX8=m
+# CONFIG_DWMAC_INTEL_PLAT is not set
+CONFIG_DWMAC_TEGRA=m
+CONFIG_DWMAC_VISCONTI=m
+CONFIG_DWMAC_LOONGSON=m
+# CONFIG_STMMAC_PCI is not set
+CONFIG_NET_VENDOR_SUN=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VERTEXCOM=y
+CONFIG_MSE102X=m
+CONFIG_NET_VENDOR_VIA=y
+# CONFIG_VIA_RHINE is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WANGXUN=y
+CONFIG_LIBWX=m
+CONFIG_NGBE=m
+CONFIG_TXGBE=m
+CONFIG_NET_VENDOR_WIZNET=y
+# CONFIG_WIZNET_W5100 is not set
+# CONFIG_WIZNET_W5300 is not set
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_EMACLITE=m
+CONFIG_XILINX_AXI_EMAC=m
+CONFIG_XILINX_LL_TEMAC=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+CONFIG_SKFP=m
+# CONFIG_HIPPI is not set
+# CONFIG_NET_SB1000 is not set
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=m
+CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
+CONFIG_PHYLIB_LEDS=y
+CONFIG_FIXED_PHY=m
+# CONFIG_SFP is not set
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+CONFIG_MESON_GXL_PHY=m
+CONFIG_ADIN_PHY=m
+CONFIG_ADIN1100_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+# CONFIG_BCM7XXX_PHY is not set
+CONFIG_BCM84881_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+# CONFIG_CORTINA_PHY is not set
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+# CONFIG_INTEL_XWAY_PHY is not set
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
+CONFIG_MEDIATEK_GE_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_T1S_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MOTORCOMM_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_CBTX_PHY=m
+CONFIG_NXP_C45_TJA11XX_PHY=m
+CONFIG_NXP_TJA11XX_PHY=m
+CONFIG_NCN26000_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+# CONFIG_RENESAS_PHY is not set
+# CONFIG_ROCKCHIP_PHY is not set
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+# CONFIG_DP83822_PHY is not set
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_DP83TD510_PHY=m
+CONFIG_VITESSE_PHY=m
+# CONFIG_XILINX_GMII2RGMII is not set
+# CONFIG_MICREL_KS8995MA is not set
+CONFIG_PSE_CONTROLLER=y
+CONFIG_PSE_REGULATOR=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_VCAN=m
+# CONFIG_CAN_VXCAN is not set
+CONFIG_CAN_NETLINK=y
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_RX_OFFLOAD=y
+CONFIG_CAN_CAN327=m
+CONFIG_CAN_FLEXCAN=m
+# CONFIG_CAN_GRCAN is not set
+CONFIG_CAN_KVASER_PCIEFD=m
+CONFIG_CAN_SLCAN=m
+# CONFIG_CAN_XILINXCAN is not set
+# CONFIG_CAN_C_CAN is not set
+# CONFIG_CAN_CC770 is not set
+CONFIG_CAN_CTUCANFD=m
+CONFIG_CAN_CTUCANFD_PCI=m
+CONFIG_CAN_CTUCANFD_PLATFORM=m
+# CONFIG_CAN_IFI_CANFD is not set
+# CONFIG_CAN_M_CAN is not set
+# CONFIG_CAN_PEAK_PCIEFD is not set
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_F81601=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_SJA1000_ISA=m
+# CONFIG_CAN_SJA1000_PLATFORM is not set
+CONFIG_CAN_SOFTING=m
+
+#
+# CAN SPI interfaces
+#
+# CONFIG_CAN_HI311X is not set
+# CONFIG_CAN_MCP251X is not set
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY is not set
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB=m
+CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+# CONFIG_CAN_MCBA_USB is not set
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+# CONFIG_CAN_DEBUG_DEVICES is not set
+
+#
+# MCTP Device Drivers
+#
+CONFIG_MCTP_SERIAL=m
+CONFIG_MCTP_TRANSPORT_I2C=m
+# end of MCTP Device Drivers
+
+CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_BUS=m
+CONFIG_FWNODE_MDIO=m
+CONFIG_OF_MDIO=m
+CONFIG_ACPI_MDIO=m
+CONFIG_MDIO_DEVRES=m
+# CONFIG_MDIO_SUN4I is not set
+CONFIG_MDIO_XGENE=m
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_BCM_UNIMAC is not set
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_MVUSB=m
+CONFIG_MDIO_MSCC_MIIM=m
+# CONFIG_MDIO_OCTEON is not set
+# CONFIG_MDIO_IPQ4019 is not set
+CONFIG_MDIO_IPQ8064=m
+CONFIG_MDIO_THUNDER=m
+
+#
+# MDIO Multiplexers
+#
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_MESON_G12A=m
+CONFIG_MDIO_BUS_MUX_MESON_GXL=m
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+CONFIG_PCS_LYNX=m
+# end of PCS device drivers
+
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+
+#
+# Host-side USB support is needed for USB Network Adapter support
+#
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8153_ECM=m
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+# CONFIG_ATH9K_WOW is not set
+CONFIG_ATH9K_RFKILL=y
+# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_PCI_NO_EEPROM=m
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+# CONFIG_ATH9K_HWRNG is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_TRACING=y
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_AHB is not set
+# CONFIG_ATH10K_SDIO is not set
+# CONFIG_ATH10K_USB is not set
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_DEBUGFS is not set
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_ATH11K=m
+CONFIG_ATH11K_AHB=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_TRACING is not set
+CONFIG_ATH12K=m
+# CONFIG_ATH12K_DEBUG is not set
+# CONFIG_ATH12K_TRACING is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+# CONFIG_ATMEL is not set
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_WLAN_VENDOR_INTEL=y
+# CONFIG_IPW2100 is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+# CONFIG_HERMES is not set
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+# CONFIG_MWIFIEX is not set
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+# CONFIG_MT76x0U is not set
+# CONFIG_MT76x0E is not set
+# CONFIG_MT76x2E is not set
+# CONFIG_MT76x2U is not set
+# CONFIG_MT7603E is not set
+# CONFIG_MT7615E is not set
+# CONFIG_MT7663U is not set
+# CONFIG_MT7663S is not set
+# CONFIG_MT7915E is not set
+# CONFIG_MT7921E is not set
+# CONFIG_MT7921S is not set
+# CONFIG_MT7921U is not set
+# CONFIG_MT7996E is not set
+CONFIG_WLAN_VENDOR_MICROCHIP=y
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set
+CONFIG_WLAN_VENDOR_PURELIFI=y
+CONFIG_PLFXLC=m
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+# CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_SDIO=m
+CONFIG_RTW88_USB=m
+CONFIG_RTW88_8822B=m
+CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723D=m
+CONFIG_RTW88_8821C=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822BS=m
+CONFIG_RTW88_8822BU=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8822CS=m
+CONFIG_RTW88_8822CU=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8723DU=m
+CONFIG_RTW88_8821CE=m
+CONFIG_RTW88_8821CS=m
+CONFIG_RTW88_8821CU=m
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
+CONFIG_RTW89=m
+CONFIG_RTW89_CORE=m
+CONFIG_RTW89_PCI=m
+CONFIG_RTW89_8852A=m
+CONFIG_RTW89_8852B=m
+CONFIG_RTW89_8852C=m
+CONFIG_RTW89_8852AE=m
+CONFIG_RTW89_8852BE=m
+CONFIG_RTW89_8852CE=m
+# CONFIG_RTW89_DEBUGMSG is not set
+# CONFIG_RTW89_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+# CONFIG_RSI_SDIO is not set
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_SILABS=y
+CONFIG_WFX=m
+CONFIG_WLAN_VENDOR_ST=y
+# CONFIG_CW1200 is not set
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WLAN_VENDOR_ZYDAS=y
+# CONFIG_USB_ZD1201 is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_VIRT_WIFI=m
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+CONFIG_IEEE802154_MRF24J40=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+# CONFIG_IEEE802154_CA8210 is not set
+CONFIG_IEEE802154_MCR20A=m
+# CONFIG_IEEE802154_HWSIM is not set
+
+#
+# Wireless WAN
+#
+CONFIG_WWAN=y
+# CONFIG_WWAN_DEBUGFS is not set
+# CONFIG_WWAN_HWSIM is not set
+CONFIG_MHI_WWAN_CTRL=m
+CONFIG_MHI_WWAN_MBIM=m
+CONFIG_RPMSG_WWAN_CTRL=m
+CONFIG_IOSM=m
+CONFIG_MTK_T7XX=m
+# end of Wireless WAN
+
+CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
+# CONFIG_VMXNET3 is not set
+# CONFIG_FUJITSU_ES is not set
+CONFIG_USB4_NET=m
+CONFIG_HYPERV_NET=m
+# CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=m
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+CONFIG_INPUT_VIVALDIFMAP=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
+CONFIG_KEYBOARD_ADP5588=m
+# CONFIG_KEYBOARD_ADP5589 is not set
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+# CONFIG_KEYBOARD_QT1070 is not set
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_DLINK_DIR685 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+CONFIG_KEYBOARD_LM8323=m
+# CONFIG_KEYBOARD_LM8333 is not set
+CONFIG_KEYBOARD_MAX7359=m
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+CONFIG_KEYBOARD_SNVS_PWRKEY=m
+CONFIG_KEYBOARD_IMX=m
+CONFIG_KEYBOARD_IMX_SC_KEY=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_TEGRA=m
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_PINEPHONE=m
+# CONFIG_KEYBOARD_SAMSUNG is not set
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_SUN4I_LRADC is not set
+CONFIG_KEYBOARD_IQS62X=m
+# CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_CROS_EC is not set
+# CONFIG_KEYBOARD_CAP11XX is not set
+# CONFIG_KEYBOARD_BCM is not set
+CONFIG_KEYBOARD_CYPRESS_SF=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_SMBUS=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_CYAPA is not set
+# CONFIG_MOUSE_ELAN_I2C is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_GPIO is not set
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_AD714X is not set
+CONFIG_INPUT_ATC260X_ONKEY=m
+# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_E3X0_BUTTON is not set
+CONFIG_INPUT_PM8941_PWRKEY=m
+# CONFIG_INPUT_PM8XXX_VIBRATOR is not set
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
+# CONFIG_INPUT_GPIO_DECODER is not set
+# CONFIG_INPUT_GPIO_VIBRA is not set
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+# CONFIG_INPUT_KXTJ9 is not set
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+# CONFIG_INPUT_REGULATOR_HAPTIC is not set
+CONFIG_INPUT_TPS65219_PWRBUTTON=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_UINPUT=m
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PWM_BEEPER is not set
+# CONFIG_INPUT_PWM_VIBRA is not set
+# CONFIG_INPUT_RK805_PWRKEY is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+CONFIG_INPUT_DA7280_HAPTICS=m
+# CONFIG_INPUT_ADXL34X is not set
+CONFIG_INPUT_IBM_PANEL=m
+# CONFIG_INPUT_IMS_PCU is not set
+CONFIG_INPUT_IQS269A=m
+CONFIG_INPUT_IQS626A=m
+CONFIG_INPUT_IQS7222=m
+# CONFIG_INPUT_CMA3000 is not set
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
+# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2665_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
+CONFIG_INPUT_HISI_POWERKEY=m
+CONFIG_INPUT_RT5120_PWRKEY=m
+CONFIG_RMI4_CORE=m
+# CONFIG_RMI4_I2C is not set
+# CONFIG_RMI4_SPI is not set
+# CONFIG_RMI4_SMB is not set
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+# CONFIG_RMI4_F34 is not set
+CONFIG_RMI4_F3A=y
+# CONFIG_RMI4_F54 is not set
+# CONFIG_RMI4_F55 is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_AMBAKMI is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+CONFIG_SERIO_ALTERA_PS2=m
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_SERIO_APBPS2 is not set
+CONFIG_HYPERV_KEYBOARD=m
+# CONFIG_SERIO_SUN4I_PS2 is not set
+# CONFIG_SERIO_GPIO_PS2 is not set
+# CONFIG_USERIO is not set
+# CONFIG_GAMEPORT is not set
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LEGACY_TIOCSTI is not set
+CONFIG_LDISC_AUTOLOAD=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_16550A_VARIANTS=y
+# CONFIG_SERIAL_8250_FINTEK is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCILIB=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+CONFIG_SERIAL_8250_PCI1XXXX=m
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+# CONFIG_SERIAL_8250_RSA is not set
+CONFIG_SERIAL_8250_DWLIB=y
+CONFIG_SERIAL_8250_BCM2835AUX=y
+CONFIG_SERIAL_8250_FSL=y
+CONFIG_SERIAL_8250_DW=y
+# CONFIG_SERIAL_8250_RT288X is not set
+CONFIG_SERIAL_8250_PERICOM=y
+CONFIG_SERIAL_8250_TEGRA=y
+CONFIG_SERIAL_OF_PLATFORM=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_EARLYCON_SEMIHOST=y
+CONFIG_SERIAL_MESON=y
+CONFIG_SERIAL_MESON_CONSOLE=y
+CONFIG_SERIAL_SAMSUNG=m
+CONFIG_SERIAL_SAMSUNG_UARTS=4
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_TEGRA=y
+CONFIG_SERIAL_TEGRA_TCU=m
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_IMX=m
+CONFIG_SERIAL_IMX_CONSOLE=m
+CONFIG_SERIAL_IMX_EARLYCON=y
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_MSM=y
+CONFIG_SERIAL_MSM_CONSOLE=y
+CONFIG_SERIAL_QCOM_GENI=m
+# CONFIG_SERIAL_QCOM_GENI_CONSOLE is not set
+# CONFIG_SERIAL_SIFIVE is not set
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_BCM63XX is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_SERIAL_ARC is not set
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_FSL_LINFLEXUART is not set
+# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
+# CONFIG_SERIAL_SPRD is not set
+CONFIG_SERIAL_MVEBU_UART=y
+CONFIG_SERIAL_MVEBU_CONSOLE=y
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_N_GSM=m
+CONFIG_NOZOMI=m
+CONFIG_NULL_TTY=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+# CONFIG_HVC_DCC is not set
+CONFIG_RPMSG_TTY=m
+CONFIG_SERIAL_DEV_BUS=m
+CONFIG_TTY_PRINTK=m
+CONFIG_TTY_PRINTK_LEVEL=6
+# CONFIG_PRINTER is not set
+# CONFIG_PPDEV is not set
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DMI_DECODE=y
+CONFIG_IPMI_PLAT_DATA=y
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_IPMB=m
+# CONFIG_IPMI_WATCHDOG is not set
+# CONFIG_IPMI_POWEROFF is not set
+CONFIG_IPMI_KCS_BMC=m
+CONFIG_NPCM7XX_KCS_IPMI_BMC=m
+CONFIG_IPMI_KCS_BMC_CDEV_IPMI=m
+CONFIG_IPMI_KCS_BMC_SERIO=m
+CONFIG_SSIF_IPMI_BMC=m
+CONFIG_IPMB_DEVICE_INTERFACE=m
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+CONFIG_HW_RANDOM_BA431=m
+CONFIG_HW_RANDOM_BCM2835=m
+CONFIG_HW_RANDOM_IPROC_RNG200=m
+# CONFIG_HW_RANDOM_OMAP is not set
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_HISI=m
+CONFIG_HW_RANDOM_XGENE=m
+CONFIG_HW_RANDOM_MESON=m
+CONFIG_HW_RANDOM_CAVIUM=m
+CONFIG_HW_RANDOM_OPTEE=m
+CONFIG_HW_RANDOM_NPCM=m
+CONFIG_HW_RANDOM_CCTRNG=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
+CONFIG_HW_RANDOM_CN10K=m
+# CONFIG_APPLICOM is not set
+CONFIG_DEVMEM=y
+CONFIG_DEVPORT=y
+# CONFIG_TCG_TPM is not set
+CONFIG_XILLYBUS_CLASS=m
+# CONFIG_XILLYBUS is not set
+CONFIG_XILLYUSB=m
+# end of Character devices
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_GPMUX is not set
+# CONFIG_I2C_MUX_LTC4306 is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+# CONFIG_I2C_MUX_PCA954x is not set
+# CONFIG_I2C_MUX_PINCTRL is not set
+# CONFIG_I2C_MUX_REG is not set
+# CONFIG_I2C_DEMUX_PINCTRL is not set
+# CONFIG_I2C_MUX_MLXCPLD is not set
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_AMD_MP2 is not set
+# CONFIG_I2C_HIX5HD2 is not set
+# CONFIG_I2C_I801 is not set
+CONFIG_I2C_ISCH=m
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_NVIDIA_GPU is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# ACPI drivers
+#
+# CONFIG_I2C_SCMI is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_ALTERA=m
+CONFIG_I2C_BCM2835=m
+CONFIG_I2C_BRCMSTB=m
+# CONFIG_I2C_CADENCE is not set
+# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_EMEV2 is not set
+# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_HISI=m
+CONFIG_I2C_IMX=m
+CONFIG_I2C_IMX_LPI2C=m
+CONFIG_I2C_MESON=m
+CONFIG_I2C_MV64XXX=m
+# CONFIG_I2C_NOMADIK is not set
+CONFIG_I2C_NPCM=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_APPLE=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_PXA=m
+# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_QCOM_CCI is not set
+CONFIG_I2C_QCOM_GENI=m
+CONFIG_I2C_QUP=m
+CONFIG_I2C_RK3X=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_SYNQUACER=m
+CONFIG_I2C_TEGRA=m
+CONFIG_I2C_TEGRA_BPMP=y
+# CONFIG_I2C_VERSATILE is not set
+CONFIG_I2C_THUNDERX=m
+# CONFIG_I2C_XILINX is not set
+CONFIG_I2C_XLP9XX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_CP2615=m
+# CONFIG_I2C_PARPORT is not set
+CONFIG_I2C_PCI1XXXX=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_CROS_EC_TUNNEL=m
+CONFIG_I2C_XGENE_SLIMPRO=m
+CONFIG_I2C_VIRTIO=m
+# end of I2C Hardware Bus support
+
+# CONFIG_I2C_STUB is not set
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+# CONFIG_I2C_SLAVE_TESTUNIT is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+CONFIG_I3C=m
+CONFIG_CDNS_I3C_MASTER=m
+CONFIG_DW_I3C_MASTER=m
+CONFIG_SVC_I3C_MASTER=m
+# CONFIG_MIPI_I3C_HCI is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+CONFIG_SPI_AMLOGIC_SPIFC_A1=m
+CONFIG_SPI_ARMADA_3700=m
+# CONFIG_SPI_AXI_SPI_ENGINE is not set
+CONFIG_SPI_BCM2835=m
+CONFIG_SPI_BCM2835AUX=m
+CONFIG_SPI_BCM63XX_HSSPI=m
+CONFIG_SPI_BCM_QSPI=m
+CONFIG_SPI_BCMBCA_HSSPI=m
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+# CONFIG_SPI_CADENCE is not set
+# CONFIG_SPI_CADENCE_QUADSPI is not set
+CONFIG_SPI_CADENCE_XSPI=m
+# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_FSL_LPSPI=m
+CONFIG_SPI_FSL_QUADSPI=m
+CONFIG_SPI_HISI_KUNPENG=m
+CONFIG_SPI_HISI_SFC_V3XX=m
+CONFIG_SPI_NXP_FLEXSPI=m
+# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_IMX=m
+CONFIG_SPI_LM70_LLP=m
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_MESON_SPICC is not set
+CONFIG_SPI_MESON_SPIFC=m
+CONFIG_SPI_MICROCHIP_CORE=m
+CONFIG_SPI_MICROCHIP_CORE_QSPI=m
+CONFIG_SPI_WPCM_FIU=m
+CONFIG_SPI_NPCM_FIU=m
+CONFIG_SPI_NPCM_PSPI=m
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_ORION is not set
+CONFIG_SPI_PCI1XXXX=m
+# CONFIG_SPI_PL022 is not set
+# CONFIG_SPI_PXA2XX is not set
+CONFIG_SPI_ROCKCHIP=m
+CONFIG_SPI_ROCKCHIP_SFC=m
+# CONFIG_SPI_QCOM_QSPI is not set
+CONFIG_SPI_QUP=m
+# CONFIG_SPI_QCOM_GENI is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
+CONFIG_SPI_SN_F_OSPI=m
+# CONFIG_SPI_SUN4I is not set
+# CONFIG_SPI_SUN6I is not set
+CONFIG_SPI_SYNQUACER=m
+# CONFIG_SPI_MXIC is not set
+CONFIG_SPI_TEGRA210_QUAD=m
+CONFIG_SPI_TEGRA114=m
+CONFIG_SPI_TEGRA20_SFLASH=m
+CONFIG_SPI_TEGRA20_SLINK=m
+CONFIG_SPI_THUNDERX=m
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+CONFIG_SPI_XLP=m
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
+CONFIG_SPI_AMD=m
+
+#
+# SPI Multiplexer support
+#
+CONFIG_SPI_MUX=m
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
+CONFIG_SPMI=y
+CONFIG_SPMI_HISI3670=m
+CONFIG_SPMI_MSM_PMIC_ARB=y
+# CONFIG_HSI is not set
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+# CONFIG_PPS_CLIENT_GPIO is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+CONFIG_PTP_1588_CLOCK_QORIQ=m
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_IDT82P33=m
+CONFIG_PTP_1588_CLOCK_IDTCM=m
+CONFIG_PTP_1588_CLOCK_OCP=m
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
+CONFIG_PINMUX=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_APPLE_GPIO=m
+CONFIG_PINCTRL_AXP209=m
+CONFIG_PINCTRL_BM1880=y
+CONFIG_PINCTRL_CY8C95X0=m
+CONFIG_PINCTRL_KEEMBAY=m
+CONFIG_PINCTRL_MAX77620=y
+# CONFIG_PINCTRL_MCP23S08 is not set
+# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
+# CONFIG_PINCTRL_OCELOT is not set
+# CONFIG_PINCTRL_RK805 is not set
+CONFIG_PINCTRL_ROCKCHIP=y
+CONFIG_PINCTRL_SINGLE=y
+# CONFIG_PINCTRL_STMFX is not set
+# CONFIG_PINCTRL_SX150X is not set
+CONFIG_PINCTRL_BCM2835=y
+CONFIG_PINCTRL_BCM4908=m
+CONFIG_PINCTRL_MADERA=m
+CONFIG_PINCTRL_IMX=y
+CONFIG_PINCTRL_IMX_SCU=y
+CONFIG_PINCTRL_IMX8MM=y
+CONFIG_PINCTRL_IMX8MN=y
+CONFIG_PINCTRL_IMX8MP=y
+CONFIG_PINCTRL_IMX8MQ=y
+CONFIG_PINCTRL_IMX8QM=y
+CONFIG_PINCTRL_IMX8QXP=y
+CONFIG_PINCTRL_IMX8DXL=y
+CONFIG_PINCTRL_IMX8ULP=y
+# CONFIG_PINCTRL_IMXRT1050 is not set
+CONFIG_PINCTRL_IMX93=m
+CONFIG_PINCTRL_IMXRT1170=y
+CONFIG_PINCTRL_MESON=y
+CONFIG_PINCTRL_MESON_GXBB=y
+CONFIG_PINCTRL_MESON_GXL=y
+CONFIG_PINCTRL_MESON8_PMX=y
+CONFIG_PINCTRL_MESON_AXG=y
+CONFIG_PINCTRL_MESON_AXG_PMX=y
+CONFIG_PINCTRL_MESON_G12A=y
+CONFIG_PINCTRL_MESON_A1=y
+CONFIG_PINCTRL_MESON_S4=y
+CONFIG_PINCTRL_MVEBU=y
+CONFIG_PINCTRL_ARMADA_AP806=y
+CONFIG_PINCTRL_ARMADA_CP110=y
+CONFIG_PINCTRL_AC5=y
+CONFIG_PINCTRL_ARMADA_37XX=y
+CONFIG_PINCTRL_MSM=y
+CONFIG_PINCTRL_IPQ5332=m
+# CONFIG_PINCTRL_IPQ8074 is not set
+# CONFIG_PINCTRL_IPQ6018 is not set
+# CONFIG_PINCTRL_IPQ9574 is not set
+# CONFIG_PINCTRL_MDM9607 is not set
+CONFIG_PINCTRL_MSM8916=y
+# CONFIG_PINCTRL_MSM8953 is not set
+# CONFIG_PINCTRL_MSM8976 is not set
+# CONFIG_PINCTRL_MSM8994 is not set
+CONFIG_PINCTRL_MSM8996=y
+# CONFIG_PINCTRL_MSM8998 is not set
+# CONFIG_PINCTRL_QCM2290 is not set
+# CONFIG_PINCTRL_QCS404 is not set
+# CONFIG_PINCTRL_QDF2XXX is not set
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
+CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
+CONFIG_PINCTRL_QDU1000=m
+CONFIG_PINCTRL_SA8775P=m
+# CONFIG_PINCTRL_SC7180 is not set
+# CONFIG_PINCTRL_SC7280 is not set
+# CONFIG_PINCTRL_SC8180X is not set
+# CONFIG_PINCTRL_SC8280XP is not set
+# CONFIG_PINCTRL_SDM660 is not set
+# CONFIG_PINCTRL_SDM670 is not set
+# CONFIG_PINCTRL_SDM845 is not set
+# CONFIG_PINCTRL_SM6115 is not set
+# CONFIG_PINCTRL_SM6125 is not set
+# CONFIG_PINCTRL_SM6350 is not set
+# CONFIG_PINCTRL_SM6375 is not set
+# CONFIG_PINCTRL_SM7150 is not set
+CONFIG_PINCTRL_SM8150=m
+CONFIG_PINCTRL_SM8250=m
+# CONFIG_PINCTRL_SM8350 is not set
+# CONFIG_PINCTRL_SM8450 is not set
+CONFIG_PINCTRL_SM8550=m
+# CONFIG_PINCTRL_LPASS_LPI is not set
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+CONFIG_PINCTRL_SUNXI=y
+# CONFIG_PINCTRL_SUN4I_A10 is not set
+# CONFIG_PINCTRL_SUN5I is not set
+# CONFIG_PINCTRL_SUN6I_A31 is not set
+# CONFIG_PINCTRL_SUN6I_A31_R is not set
+# CONFIG_PINCTRL_SUN8I_A23 is not set
+# CONFIG_PINCTRL_SUN8I_A33 is not set
+# CONFIG_PINCTRL_SUN8I_A83T is not set
+# CONFIG_PINCTRL_SUN8I_A83T_R is not set
+# CONFIG_PINCTRL_SUN8I_A23_R is not set
+# CONFIG_PINCTRL_SUN8I_H3 is not set
+CONFIG_PINCTRL_SUN8I_H3_R=y
+# CONFIG_PINCTRL_SUN8I_V3S is not set
+# CONFIG_PINCTRL_SUN9I_A80 is not set
+# CONFIG_PINCTRL_SUN9I_A80_R is not set
+# CONFIG_PINCTRL_SUN20I_D1 is not set
+CONFIG_PINCTRL_SUN50I_A64=y
+CONFIG_PINCTRL_SUN50I_A64_R=y
+CONFIG_PINCTRL_SUN50I_A100=y
+CONFIG_PINCTRL_SUN50I_A100_R=y
+CONFIG_PINCTRL_SUN50I_H5=y
+CONFIG_PINCTRL_SUN50I_H6=y
+CONFIG_PINCTRL_SUN50I_H6_R=y
+CONFIG_PINCTRL_SUN50I_H616=y
+CONFIG_PINCTRL_SUN50I_H616_R=y
+CONFIG_PINCTRL_TEGRA=y
+CONFIG_PINCTRL_TEGRA124=y
+CONFIG_PINCTRL_TEGRA210=y
+CONFIG_PINCTRL_TEGRA194=y
+CONFIG_PINCTRL_TEGRA_XUSB=y
+CONFIG_PINCTRL_VISCONTI=y
+CONFIG_PINCTRL_TMPV7700=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_OF_GPIO=y
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_GENERIC=y
+CONFIG_GPIO_REGMAP=m
+
+#
+# Memory mapped GPIO drivers
+#
+# CONFIG_GPIO_74XX_MMIO is not set
+# CONFIG_GPIO_ALTERA is not set
+# CONFIG_GPIO_AMDPT is not set
+CONFIG_GPIO_RASPBERRYPI_EXP=m
+CONFIG_GPIO_CADENCE=m
+# CONFIG_GPIO_DWAPB is not set
+# CONFIG_GPIO_EXAR is not set
+# CONFIG_GPIO_FTGPIO010 is not set
+CONFIG_GPIO_GENERIC_PLATFORM=y
+# CONFIG_GPIO_GRGPIO is not set
+CONFIG_GPIO_HISI=m
+# CONFIG_GPIO_HLWD is not set
+CONFIG_GPIO_IMX_SCU=y
+CONFIG_GPIO_LOGICVC=m
+CONFIG_GPIO_MB86S7X=m
+CONFIG_GPIO_MVEBU=y
+CONFIG_GPIO_MXC=y
+CONFIG_GPIO_PL061=y
+CONFIG_GPIO_ROCKCHIP=y
+CONFIG_GPIO_SIFIVE=y
+# CONFIG_GPIO_SYSCON is not set
+CONFIG_GPIO_TEGRA=y
+CONFIG_GPIO_TEGRA186=y
+# CONFIG_GPIO_THUNDERX is not set
+CONFIG_GPIO_VF610=y
+CONFIG_GPIO_VISCONTI=m
+CONFIG_GPIO_XGENE=y
+CONFIG_GPIO_XGENE_SB=m
+CONFIG_GPIO_XILINX=m
+CONFIG_GPIO_XLP=y
+# CONFIG_GPIO_AMD_FCH is not set
+# end of Memory mapped GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+# CONFIG_GPIO_ADNP is not set
+CONFIG_GPIO_FXL6408=m
+# CONFIG_GPIO_GW_PLD is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCA9570=m
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_TPIC2810 is not set
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_BD71815=m
+CONFIG_GPIO_BD71828=m
+CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_MAX77620=y
+CONFIG_GPIO_WM8994=m
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+# CONFIG_GPIO_PCI_IDIO_16 is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
+# CONFIG_GPIO_RDC321X is not set
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+# CONFIG_GPIO_74X164 is not set
+# CONFIG_GPIO_MAX3191X is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_PISOSR is not set
+# CONFIG_GPIO_XRA1403 is not set
+CONFIG_GPIO_MOXTET=m
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_LATCH=m
+# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_VIRTIO=m
+# CONFIG_GPIO_SIM is not set
+# end of Virtual GPIO drivers
+
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+# CONFIG_W1_MASTER_MATROX is not set
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_MXC=m
+CONFIG_W1_MASTER_GPIO=m
+# CONFIG_W1_MASTER_SGI is not set
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2405=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2408_READBACK=y
+CONFIG_W1_SLAVE_DS2413=m
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2430=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2438=m
+# CONFIG_W1_SLAVE_DS250X is not set
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_ATC260X=m
+# CONFIG_POWER_RESET_BRCMSTB is not set
+# CONFIG_POWER_RESET_GPIO is not set
+# CONFIG_POWER_RESET_GPIO_RESTART is not set
+CONFIG_POWER_RESET_HISI=y
+# CONFIG_POWER_RESET_LINKSTATION is not set
+CONFIG_POWER_RESET_MSM=y
+CONFIG_POWER_RESET_QCOM_PON=m
+CONFIG_POWER_RESET_ODROID_GO_ULTRA_POWEROFF=y
+# CONFIG_POWER_RESET_LTC2952 is not set
+CONFIG_POWER_RESET_REGULATOR=y
+# CONFIG_POWER_RESET_RESTART is not set
+CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_POWER_RESET_XGENE=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+CONFIG_REBOOT_MODE=m
+# CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_NVMEM_REBOOT_MODE=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+# CONFIG_GENERIC_ADC_BATTERY is not set
+CONFIG_IP5XXX_POWER=m
+# CONFIG_TEST_POWER is not set
+CONFIG_CHARGER_ADP5061=m
+CONFIG_BATTERY_CW2015=m
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+CONFIG_BATTERY_QCOM_BATTMGR=m
+# CONFIG_BATTERY_SAMSUNG_SDI is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_CHARGER_SBS is not set
+# CONFIG_MANAGER_SBS is not set
+CONFIG_BATTERY_BQ27XXX=m
+# CONFIG_BATTERY_BQ27XXX_I2C is not set
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_MAX1721X is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+CONFIG_CHARGER_GPIO=m
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_LT3651 is not set
+# CONFIG_CHARGER_LTC4162L is not set
+# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+# CONFIG_CHARGER_MAX77976 is not set
+# CONFIG_CHARGER_MT6360 is not set
+CONFIG_CHARGER_MT6370=m
+CONFIG_CHARGER_QCOM_SMBB=m
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_BQ24257 is not set
+# CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_BQ2515X is not set
+# CONFIG_CHARGER_BQ25890 is not set
+# CONFIG_CHARGER_BQ25980 is not set
+# CONFIG_CHARGER_BQ256XX is not set
+CONFIG_CHARGER_RK817=m
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_BATTERY_GAUGE_LTC2941 is not set
+CONFIG_BATTERY_GOLDFISH=m
+CONFIG_BATTERY_RT5033=m
+# CONFIG_CHARGER_RT9455 is not set
+# CONFIG_CHARGER_RT9467 is not set
+CONFIG_CHARGER_RT9471=m
+CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_CROS_PCHG=m
+# CONFIG_CHARGER_UCS1002 is not set
+CONFIG_CHARGER_BD99954=m
+CONFIG_BATTERY_UG3105=m
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_SMPRO=m
+# CONFIG_SENSORS_AD7314 is not set
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+CONFIG_SENSORS_ADM1029=m
+# CONFIG_SENSORS_ADM1031 is not set
+CONFIG_SENSORS_ADM1177=m
+CONFIG_SENSORS_ADM9240=m
+# CONFIG_SENSORS_ADT7310 is not set
+# CONFIG_SENSORS_ADT7410 is not set
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_AHT10=m
+CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
+# CONFIG_SENSORS_AS370 is not set
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_AXI_FAN_CONTROL=m
+CONFIG_SENSORS_ARM_SCMI=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORSAIR_CPRO=m
+CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_DRIVETEMP=m
+CONFIG_SENSORS_DS620=m
+# CONFIG_SENSORS_DS1621 is not set
+CONFIG_SENSORS_I5K_AMB=m
+# CONFIG_SENSORS_F71805F is not set
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FTSTEUTATES=m
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+CONFIG_SENSORS_G760A=m
+# CONFIG_SENSORS_G762 is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_HIH6130 is not set
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+# CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_IT87 is not set
+CONFIG_SENSORS_JC42=m
+# CONFIG_SENSORS_POWR1220 is not set
+CONFIG_SENSORS_LINEAGE=m
+# CONFIG_SENSORS_LTC2945 is not set
+CONFIG_SENSORS_LTC2947=m
+CONFIG_SENSORS_LTC2947_I2C=m
+CONFIG_SENSORS_LTC2947_SPI=m
+# CONFIG_SENSORS_LTC2990 is not set
+# CONFIG_SENSORS_LTC2992 is not set
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+# CONFIG_SENSORS_LTC4222 is not set
+CONFIG_SENSORS_LTC4245=m
+# CONFIG_SENSORS_LTC4260 is not set
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX127=m
+CONFIG_SENSORS_MAX16065=m
+# CONFIG_SENSORS_MAX1619 is not set
+CONFIG_SENSORS_MAX1668=m
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX31722 is not set
+CONFIG_SENSORS_MAX31730=m
+CONFIG_SENSORS_MAX31760=m
+CONFIG_SENSORS_MAX6620=m
+# CONFIG_SENSORS_MAX6621 is not set
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+# CONFIG_SENSORS_MAX6697 is not set
+# CONFIG_SENSORS_MAX31790 is not set
+CONFIG_SENSORS_MC34VR500=m
+# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_TC654 is not set
+CONFIG_SENSORS_TPS23861=m
+# CONFIG_SENSORS_MR75203 is not set
+CONFIG_SENSORS_ADCXX=m
+# CONFIG_SENSORS_LM63 is not set
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+CONFIG_SENSORS_LM93=m
+# CONFIG_SENSORS_LM95234 is not set
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_PC87360 is not set
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775_CORE=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT6775_I2C=m
+# CONFIG_SENSORS_NCT7802 is not set
+# CONFIG_SENSORS_NCT7904 is not set
+# CONFIG_SENSORS_NPCM7XX is not set
+CONFIG_SENSORS_NZXT_KRAKEN2=m
+CONFIG_SENSORS_NZXT_SMART2=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
+# CONFIG_SENSORS_PWM_FAN is not set
+CONFIG_SENSORS_RASPBERRYPI_HWMON=m
+CONFIG_SENSORS_SBTSI=m
+CONFIG_SENSORS_SBRMI=m
+# CONFIG_SENSORS_SHT15 is not set
+CONFIG_SENSORS_SHT21=m
+# CONFIG_SENSORS_SHT3x is not set
+CONFIG_SENSORS_SHT4x=m
+# CONFIG_SENSORS_SHTC1 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+CONFIG_SENSORS_SY7636A=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC2305=m
+CONFIG_SENSORS_EMC6W201=m
+# CONFIG_SENSORS_SMSC47M1 is not set
+CONFIG_SENSORS_SMSC47M192=m
+# CONFIG_SENSORS_SMSC47B397 is not set
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_STTS751 is not set
+CONFIG_SENSORS_SMM665=m
+# CONFIG_SENSORS_ADC128D818 is not set
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+# CONFIG_SENSORS_INA209 is not set
+# CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_INA238 is not set
+# CONFIG_SENSORS_INA3221 is not set
+# CONFIG_SENSORS_TC74 is not set
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+# CONFIG_SENSORS_TMP103 is not set
+# CONFIG_SENSORS_TMP108 is not set
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_TMP464=m
+CONFIG_SENSORS_TMP513=m
+# CONFIG_SENSORS_VEXPRESS is not set
+# CONFIG_SENSORS_VIA686A is not set
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+# CONFIG_SENSORS_W83773G is not set
+# CONFIG_SENSORS_W83781D is not set
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+# CONFIG_SENSORS_W83L785TS is not set
+CONFIG_SENSORS_W83L786NG=m
+# CONFIG_SENSORS_W83627HF is not set
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_XGENE=m
+CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
+
+#
+# ACPI drivers
+#
+# CONFIG_SENSORS_ACPI_POWER is not set
+CONFIG_THERMAL=y
+CONFIG_THERMAL_NETLINK=y
+# CONFIG_THERMAL_STATISTICS is not set
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_OF=y
+# CONFIG_THERMAL_WRITABLE_TRIPS is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_BANG_BANG is not set
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
+CONFIG_CPU_THERMAL=y
+CONFIG_CPU_FREQ_THERMAL=y
+# CONFIG_DEVFREQ_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+# CONFIG_THERMAL_MMIO is not set
+CONFIG_HISI_THERMAL=m
+CONFIG_IMX_THERMAL=m
+CONFIG_IMX_SC_THERMAL=m
+CONFIG_IMX8MM_THERMAL=m
+# CONFIG_MAX77620_THERMAL is not set
+# CONFIG_QORIQ_THERMAL is not set
+CONFIG_SUN8I_THERMAL=m
+CONFIG_ROCKCHIP_THERMAL=m
+CONFIG_ARMADA_THERMAL=m
+CONFIG_AMLOGIC_THERMAL=y
+
+#
+# Broadcom thermal drivers
+#
+CONFIG_BCM2711_THERMAL=m
+CONFIG_BCM2835_THERMAL=m
+# end of Broadcom thermal drivers
+
+#
+# NVIDIA Tegra thermal drivers
+#
+CONFIG_TEGRA_SOCTHERM=y
+# CONFIG_TEGRA_BPMP_THERMAL is not set
+# end of NVIDIA Tegra thermal drivers
+
+# CONFIG_GENERIC_ADC_THERMAL is not set
+
+#
+# Qualcomm thermal drivers
+#
+CONFIG_QCOM_TSENS=m
+CONFIG_QCOM_SPMI_ADC_TM5=m
+CONFIG_QCOM_SPMI_TEMP_ALARM=m
+CONFIG_QCOM_LMH=m
+# end of Qualcomm thermal drivers
+
+CONFIG_KHADAS_MCU_FAN_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT=y
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_BD957XMUF_WATCHDOG=m
+CONFIG_GPIO_WATCHDOG=m
+# CONFIG_WDAT_WDT is not set
+# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_ZIIRAVE_WATCHDOG is not set
+CONFIG_ARM_SP805_WATCHDOG=m
+CONFIG_ARM_SBSA_WATCHDOG=m
+# CONFIG_ARMADA_37XX_WATCHDOG is not set
+# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_DW_WATCHDOG=m
+CONFIG_SUNXI_WATCHDOG=m
+CONFIG_NPCM7XX_WATCHDOG=m
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_MAX77620_WATCHDOG is not set
+CONFIG_IMX2_WDT=m
+CONFIG_IMX_SC_WDT=m
+CONFIG_IMX7ULP_WDT=m
+CONFIG_TEGRA_WATCHDOG=m
+CONFIG_QCOM_WDT=m
+CONFIG_MESON_GXBB_WATCHDOG=m
+CONFIG_MESON_WATCHDOG=m
+CONFIG_ARM_SMC_WATCHDOG=m
+CONFIG_PM8916_WATCHDOG=m
+CONFIG_VISCONTI_WATCHDOG=m
+CONFIG_APPLE_WATCHDOG=m
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+CONFIG_HP_WATCHDOG=m
+CONFIG_BCM2835_WDT=m
+CONFIG_BCM7038_WDT=m
+# CONFIG_MEN_A21_WDT is not set
+CONFIG_XEN_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_KEEMBAY_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+# CONFIG_SSB_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
+CONFIG_BCMA_DRIVER_PCI=y
+# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+# CONFIG_MFD_ALTERA_A10SR is not set
+CONFIG_MFD_ALTERA_SYSMGR=y
+# CONFIG_MFD_ACT8945A is not set
+# CONFIG_MFD_SUN4I_GPADC is not set
+# CONFIG_MFD_AS3711 is not set
+CONFIG_MFD_SMPRO=m
+# CONFIG_MFD_AS3722 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ATMEL_FLEXCOM is not set
+# CONFIG_MFD_ATMEL_HLCDC is not set
+# CONFIG_MFD_BCM590XX is not set
+# CONFIG_MFD_BD9571MWV is not set
+# CONFIG_MFD_AC100 is not set
+CONFIG_MFD_AXP20X=m
+# CONFIG_MFD_AXP20X_I2C is not set
+CONFIG_MFD_AXP20X_RSB=m
+CONFIG_MFD_CROS_EC_DEV=y
+CONFIG_MFD_MADERA=m
+CONFIG_MFD_MADERA_I2C=m
+CONFIG_MFD_MADERA_SPI=m
+CONFIG_MFD_MAX597X=m
+# CONFIG_MFD_CS47L15 is not set
+# CONFIG_MFD_CS47L35 is not set
+# CONFIG_MFD_CS47L85 is not set
+# CONFIG_MFD_CS47L90 is not set
+# CONFIG_MFD_CS47L92 is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_DA9062 is not set
+# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_DA9150 is not set
+# CONFIG_MFD_DLN2 is not set
+# CONFIG_MFD_GATEWORKS_GSC is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+CONFIG_MFD_MP2629=m
+# CONFIG_MFD_HI6421_PMIC is not set
+CONFIG_MFD_HI6421_SPMI=m
+CONFIG_MFD_HI655X_PMIC=m
+# CONFIG_LPC_ICH is not set
+CONFIG_LPC_SCH=m
+CONFIG_MFD_IQS62X=m
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_MAX14577 is not set
+CONFIG_MFD_MAX77620=y
+# CONFIG_MFD_MAX77650 is not set
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77714 is not set
+# CONFIG_MFD_MAX77843 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+CONFIG_MFD_MT6360=m
+CONFIG_MFD_MT6370=m
+# CONFIG_MFD_MT6397 is not set
+# CONFIG_MFD_MENF21BMC is not set
+CONFIG_MFD_OCELOT=m
+# CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_NTXEC=m
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_PCF50633 is not set
+CONFIG_MFD_QCOM_RPM=m
+CONFIG_MFD_SPMI_PMIC=m
+CONFIG_MFD_SY7636A=m
+# CONFIG_MFD_RDC321X is not set
+CONFIG_MFD_RT4831=m
+# CONFIG_MFD_RT5033 is not set
+CONFIG_MFD_RT5120=m
+# CONFIG_MFD_RC5T583 is not set
+CONFIG_MFD_RK808=m
+# CONFIG_MFD_RN5T618 is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_SI476X_CORE is not set
+CONFIG_MFD_SIMPLE_MFD_I2C=m
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SKY81452 is not set
+# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN6I_PRCM=y
+CONFIG_MFD_SYSCON=y
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_TI_LMU is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_MFD_TPS65086 is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TI_LP873X is not set
+# CONFIG_MFD_TI_LP87565 is not set
+# CONFIG_MFD_TPS65218 is not set
+CONFIG_MFD_TPS65219=m
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TQMX86 is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_LOCHNAGAR is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+CONFIG_MFD_WM8994=m
+CONFIG_MFD_ROHM_BD718XX=m
+CONFIG_MFD_ROHM_BD71828=m
+CONFIG_MFD_ROHM_BD957XMUF=m
+# CONFIG_MFD_STPMIC1 is not set
+# CONFIG_MFD_STMFX is not set
+CONFIG_MFD_ATC260X=m
+CONFIG_MFD_ATC260X_I2C=m
+CONFIG_MFD_KHADAS_MCU=m
+CONFIG_MFD_QCOM_PM8008=m
+CONFIG_MFD_VEXPRESS_SYSREG=y
+# CONFIG_RAVE_SP_CORE is not set
+CONFIG_MFD_INTEL_M10_BMC_CORE=m
+CONFIG_MFD_INTEL_M10_BMC_SPI=m
+CONFIG_MFD_RSMU_I2C=m
+CONFIG_MFD_RSMU_SPI=m
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_88PG86X is not set
+# CONFIG_REGULATOR_ACT8865 is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_ANATOP is not set
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_ARM_SCMI=m
+CONFIG_REGULATOR_ATC260X=m
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BD71815=m
+CONFIG_REGULATOR_BD71828=m
+CONFIG_REGULATOR_BD718XX=m
+CONFIG_REGULATOR_BD957XMUF=m
+CONFIG_REGULATOR_CROS_EC=m
+CONFIG_REGULATOR_DA9121=m
+# CONFIG_REGULATOR_DA9210 is not set
+# CONFIG_REGULATOR_DA9211 is not set
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_FAN53880=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_HI655X=m
+CONFIG_REGULATOR_HI6421V600=m
+# CONFIG_REGULATOR_ISL9305 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_LTC3676 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+CONFIG_REGULATOR_MAX597X=m
+CONFIG_REGULATOR_MAX77620=m
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8893 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_MAX20086 is not set
+CONFIG_REGULATOR_MAX20411=m
+# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MCP16502 is not set
+CONFIG_REGULATOR_MP5416=m
+CONFIG_REGULATOR_MP8859=m
+CONFIG_REGULATOR_MP886X=m
+CONFIG_REGULATOR_MPQ7920=m
+# CONFIG_REGULATOR_MT6311 is not set
+# CONFIG_REGULATOR_MT6315 is not set
+CONFIG_REGULATOR_MT6360=m
+CONFIG_REGULATOR_MT6370=m
+CONFIG_REGULATOR_PCA9450=m
+CONFIG_REGULATOR_PF8X00=m
+# CONFIG_REGULATOR_PFUZE100 is not set
+# CONFIG_REGULATOR_PV88060 is not set
+# CONFIG_REGULATOR_PV88080 is not set
+# CONFIG_REGULATOR_PV88090 is not set
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_RPM=m
+CONFIG_REGULATOR_QCOM_SMD_RPM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_QCOM_USB_VBUS=m
+CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m
+CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_ROHM=m
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RT4803=m
+CONFIG_REGULATOR_RT4831=m
+CONFIG_REGULATOR_RT5120=m
+CONFIG_REGULATOR_RT5190A=m
+CONFIG_REGULATOR_RT5739=m
+CONFIG_REGULATOR_RT5759=m
+CONFIG_REGULATOR_RT6160=m
+CONFIG_REGULATOR_RT6190=m
+CONFIG_REGULATOR_RT6245=m
+CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTMV20=m
+CONFIG_REGULATOR_RTQ6752=m
+CONFIG_REGULATOR_SLG51000=m
+CONFIG_REGULATOR_SY7636A=m
+CONFIG_REGULATOR_SY8106A=m
+CONFIG_REGULATOR_SY8824X=m
+CONFIG_REGULATOR_SY8827N=m
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS6286X is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+# CONFIG_REGULATOR_TPS65219 is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_VCTRL is not set
+# CONFIG_REGULATOR_VEXPRESS is not set
+# CONFIG_REGULATOR_VQMMC_IPQ4019 is not set
+CONFIG_REGULATOR_WM8994=m
+CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_RC_CORE=m
+CONFIG_LIRC=y
+CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_IR_ENE=m
+# CONFIG_IR_FINTEK is not set
+# CONFIG_IR_GPIO_CIR is not set
+# CONFIG_IR_GPIO_TX is not set
+# CONFIG_IR_HIX5HD2 is not set
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+# CONFIG_IR_ITE_CIR is not set
+CONFIG_IR_MCEUSB=m
+# CONFIG_IR_MESON is not set
+# CONFIG_IR_MESON_TX is not set
+# CONFIG_IR_NUVOTON is not set
+# CONFIG_IR_PWM_TX is not set
+CONFIG_IR_REDRAT3=m
+# CONFIG_IR_SERIAL is not set
+# CONFIG_IR_SPI is not set
+CONFIG_IR_STREAMZAP=m
+# CONFIG_IR_SUNXI is not set
+CONFIG_IR_TOY=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_RC_XBOX_DVD=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_CEC_PIN=y
+
+#
+# CEC support
+#
+CONFIG_MEDIA_CEC_RC=y
+# CONFIG_CEC_PIN_ERROR_INJ is not set
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_CEC_CH7322=m
+CONFIG_CEC_CROS_EC=m
+CONFIG_CEC_MESON_AO=m
+CONFIG_CEC_MESON_G12A_AO=m
+CONFIG_CEC_GPIO=m
+CONFIG_CEC_TEGRA=m
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+# end of CEC support
+
+CONFIG_MEDIA_SUPPORT=m
+# CONFIG_MEDIA_SUPPORT_FILTER is not set
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+
+#
+# Media device types
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+CONFIG_MEDIA_TEST_SUPPORT=y
+# end of Media device types
+
+#
+# Media core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_DVB_CORE=m
+# end of Media core support
+
+#
+# Video4Linux options
+#
+CONFIG_VIDEO_V4L2_I2C=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_JPEG_HELPER=m
+CONFIG_V4L2_H264=m
+CONFIG_V4L2_VP9=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_V4L2_ASYNC=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+# end of Video4Linux options
+
+#
+# Media controller options
+#
+CONFIG_MEDIA_CONTROLLER_DVB=y
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
+# end of Media controller options
+
+#
+# Digital TV options
+#
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=16
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+# end of Digital TV options
+
+#
+# Media drivers
+#
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_GSPCA=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_AS102=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+# CONFIG_DVB_USB_ZD1301 is not set
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_CXUSB_ANALOG=y
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=m
+# CONFIG_VIDEO_ZORAN is not set
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_DT3155=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+# CONFIG_VIDEO_CX25821 is not set
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+# CONFIG_VIDEO_SAA7134_GO7007 is not set
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_DM1105=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_RADIO_ADAPTERS=m
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_SAA7706H is not set
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+# CONFIG_RADIO_SI4713 is not set
+CONFIG_RADIO_TEA575X=m
+# CONFIG_RADIO_TEA5764 is not set
+# CONFIG_RADIO_TEF6862 is not set
+# CONFIG_RADIO_WL1273 is not set
+# CONFIG_USB_DSBR is not set
+CONFIG_USB_KEENE=m
+CONFIG_USB_MA901=m
+CONFIG_USB_MR800=m
+CONFIG_USB_RAREMONO=m
+CONFIG_RADIO_SI470X=m
+CONFIG_USB_SI470X=m
+# CONFIG_I2C_SI470X is not set
+# CONFIG_RADIO_WL128X is not set
+CONFIG_MEDIA_PLATFORM_DRIVERS=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+# CONFIG_SDR_PLATFORM_DRIVERS is not set
+# CONFIG_DVB_PLATFORM_DRIVERS is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_MUX=m
+
+#
+# Allegro DVT media platform drivers
+#
+
+#
+# Amlogic media platform drivers
+#
+CONFIG_VIDEO_MESON_GE2D=m
+
+#
+# Amphion drivers
+#
+CONFIG_VIDEO_AMPHION_VPU=m
+
+#
+# Aspeed media platform drivers
+#
+
+#
+# Atmel media platform drivers
+#
+
+#
+# Cadence media platform drivers
+#
+CONFIG_VIDEO_CADENCE_CSI2RX=m
+CONFIG_VIDEO_CADENCE_CSI2TX=m
+
+#
+# Chips&Media media platform drivers
+#
+CONFIG_VIDEO_CODA=m
+
+#
+# Intel media platform drivers
+#
+
+#
+# Marvell media platform drivers
+#
+CONFIG_VIDEO_CAFE_CCIC=m
+
+#
+# Mediatek media platform drivers
+#
+
+#
+# Microchip Technology, Inc. media platform drivers
+#
+
+#
+# NVidia media platform drivers
+#
+CONFIG_VIDEO_TEGRA_VDE=m
+
+#
+# NXP media platform drivers
+#
+# CONFIG_VIDEO_IMX7_CSI is not set
+CONFIG_VIDEO_IMX_MIPI_CSIS=m
+CONFIG_VIDEO_IMX8_ISI=m
+CONFIG_VIDEO_IMX8_ISI_M2M=y
+CONFIG_VIDEO_IMX_PXP=m
+CONFIG_VIDEO_DW100=m
+CONFIG_VIDEO_IMX8_JPEG=m
+
+#
+# Qualcomm media platform drivers
+#
+CONFIG_VIDEO_QCOM_CAMSS=m
+
+#
+# Renesas media platform drivers
+#
+
+#
+# Rockchip media platform drivers
+#
+CONFIG_VIDEO_ROCKCHIP_RGA=m
+CONFIG_VIDEO_ROCKCHIP_ISP1=m
+
+#
+# Samsung media platform drivers
+#
+
+#
+# STMicroelectronics media platform drivers
+#
+
+#
+# Sunxi media platform drivers
+#
+# CONFIG_VIDEO_SUN4I_CSI is not set
+# CONFIG_VIDEO_SUN6I_CSI is not set
+CONFIG_VIDEO_SUN6I_MIPI_CSI2=m
+CONFIG_VIDEO_SUN8I_A83T_MIPI_CSI2=m
+CONFIG_VIDEO_SUN8I_DEINTERLACE=m
+CONFIG_VIDEO_SUN8I_ROTATE=m
+
+#
+# Texas Instruments drivers
+#
+
+#
+# Verisilicon media platform drivers
+#
+CONFIG_VIDEO_HANTRO=m
+CONFIG_VIDEO_HANTRO_IMX8M=y
+CONFIG_VIDEO_HANTRO_ROCKCHIP=y
+CONFIG_VIDEO_HANTRO_SUNXI=y
+
+#
+# VIA media platform drivers
+#
+
+#
+# Xilinx media platform drivers
+#
+# CONFIG_VIDEO_XILINX is not set
+
+#
+# MMC/SDIO DVB adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_V4L_TEST_DRIVERS=y
+# CONFIG_VIDEO_VIM2M is not set
+# CONFIG_VIDEO_VICODEC is not set
+# CONFIG_VIDEO_VIMC is not set
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_CEC=y
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+# CONFIG_VIDEO_VISL is not set
+# CONFIG_DVB_TEST_DRIVERS is not set
+
+#
+# FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_TTPCI_EEPROM=m
+CONFIG_UVC_COMMON=m
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_VIDEO_V4L2_TPG=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+# end of Media drivers
+
+#
+# Media ancillary drivers
+#
+CONFIG_MEDIA_ATTACH=y
+
+#
+# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
+#
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_APTINA_PLL=m
+CONFIG_VIDEO_CCS_PLL=m
+CONFIG_VIDEO_AR0521=m
+CONFIG_VIDEO_HI556=m
+CONFIG_VIDEO_HI846=m
+CONFIG_VIDEO_HI847=m
+CONFIG_VIDEO_IMX208=m
+CONFIG_VIDEO_IMX214=m
+CONFIG_VIDEO_IMX219=m
+CONFIG_VIDEO_IMX258=m
+CONFIG_VIDEO_IMX274=m
+CONFIG_VIDEO_IMX290=m
+CONFIG_VIDEO_IMX296=m
+CONFIG_VIDEO_IMX319=m
+CONFIG_VIDEO_IMX334=m
+CONFIG_VIDEO_IMX335=m
+CONFIG_VIDEO_IMX355=m
+CONFIG_VIDEO_IMX412=m
+CONFIG_VIDEO_IMX415=m
+CONFIG_VIDEO_MAX9271_LIB=m
+CONFIG_VIDEO_MT9M001=m
+CONFIG_VIDEO_MT9M111=m
+CONFIG_VIDEO_MT9P031=m
+CONFIG_VIDEO_MT9T112=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
+CONFIG_VIDEO_MT9V111=m
+CONFIG_VIDEO_OG01A1B=m
+CONFIG_VIDEO_OV02A10=m
+CONFIG_VIDEO_OV08D10=m
+CONFIG_VIDEO_OV08X40=m
+CONFIG_VIDEO_OV13858=m
+CONFIG_VIDEO_OV13B10=m
+CONFIG_VIDEO_OV2640=m
+CONFIG_VIDEO_OV2659=m
+CONFIG_VIDEO_OV2680=m
+CONFIG_VIDEO_OV2685=m
+CONFIG_VIDEO_OV2740=m
+CONFIG_VIDEO_OV4689=m
+CONFIG_VIDEO_OV5640=m
+CONFIG_VIDEO_OV5645=m
+CONFIG_VIDEO_OV5647=m
+CONFIG_VIDEO_OV5648=m
+CONFIG_VIDEO_OV5670=m
+CONFIG_VIDEO_OV5675=m
+CONFIG_VIDEO_OV5693=m
+CONFIG_VIDEO_OV5695=m
+CONFIG_VIDEO_OV6650=m
+CONFIG_VIDEO_OV7251=m
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_OV772X=m
+CONFIG_VIDEO_OV7740=m
+CONFIG_VIDEO_OV8856=m
+CONFIG_VIDEO_OV8858=m
+CONFIG_VIDEO_OV8865=m
+CONFIG_VIDEO_OV9282=m
+CONFIG_VIDEO_OV9640=m
+CONFIG_VIDEO_OV9650=m
+CONFIG_VIDEO_OV9734=m
+CONFIG_VIDEO_RDACM20=m
+CONFIG_VIDEO_RDACM21=m
+CONFIG_VIDEO_RJ54N1=m
+CONFIG_VIDEO_S5C73M3=m
+CONFIG_VIDEO_S5K5BAF=m
+CONFIG_VIDEO_S5K6A3=m
+CONFIG_VIDEO_ST_VGXY61=m
+CONFIG_VIDEO_CCS=m
+CONFIG_VIDEO_ET8EK8=m
+# end of Camera sensor devices
+
+#
+# Lens drivers
+#
+CONFIG_VIDEO_AD5820=m
+CONFIG_VIDEO_AK7375=m
+CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9768=m
+CONFIG_VIDEO_DW9807_VCM=m
+# end of Lens drivers
+
+#
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_LM3560=m
+CONFIG_VIDEO_LM3646=m
+# end of Flash devices
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+CONFIG_VIDEO_TDA1997X=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_WM8775=m
+# end of Audio decoders, processors and mixers
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+# end of RDS decoders
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_ADV748X=m
+CONFIG_VIDEO_ADV7604=m
+CONFIG_VIDEO_ADV7604_CEC=y
+CONFIG_VIDEO_ADV7842=m
+CONFIG_VIDEO_ADV7842_CEC=y
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_ISL7998X=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_MAX9286=m
+CONFIG_VIDEO_ML86V7667=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TC358743=m
+CONFIG_VIDEO_TC358743_CEC=y
+CONFIG_VIDEO_TC358746=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_TW9910=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+# end of Video decoders
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
+CONFIG_VIDEO_AK881X=m
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_THS8200=m
+# end of Video encoders
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+# end of Video improvement chips
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+# end of Audio/Video compression chips
+
+#
+# SDR tuner chips
+#
+CONFIG_SDR_MAX2175=m
+# end of SDR tuner chips
+
+#
+# Miscellaneous helper chips
+#
+CONFIG_VIDEO_I2C=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_ST_MIPID02=m
+CONFIG_VIDEO_THS7303=m
+# end of Miscellaneous helper chips
+
+#
+# Media SPI Adapters
+#
+CONFIG_CXD2880_SPI_DRV=m
+CONFIG_VIDEO_GS1662=m
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_XC5000=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_TDA10071=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_GP8PSK_FE=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_RTL2832_SDR=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_CXD2880=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_STV0297=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_VES1820=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_MXL692=m
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+CONFIG_DVB_S921=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_MN88443X=m
+CONFIG_DVB_TC90522=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_A8293=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_HELENE=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBH29=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_DRX39XYJ=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+# end of Customise DVB Frontends
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Media ancillary drivers
+
+#
+# Graphics support
+#
+CONFIG_APERTURE_HELPERS=y
+CONFIG_VIDEO_CMDLINE=y
+CONFIG_VIDEO_NOMODESET=y
+CONFIG_TEGRA_HOST1X_CONTEXT_BUS=y
+CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HOST1X_FIREWALL=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DBI=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
+# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_DP_AUX_BUS=m
+CONFIG_DRM_DISPLAY_HELPER=m
+CONFIG_DRM_DISPLAY_DP_HELPER=y
+CONFIG_DRM_DISPLAY_HDCP_HELPER=y
+CONFIG_DRM_DISPLAY_HDMI_HELPER=y
+CONFIG_DRM_DP_AUX_CHARDEV=y
+# CONFIG_DRM_DP_CEC is not set
+CONFIG_DRM_TTM=m
+CONFIG_DRM_BUDDY=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_TTM_HELPER=m
+CONFIG_DRM_GEM_DMA_HELPER=m
+CONFIG_DRM_GEM_SHMEM_HELPER=m
+CONFIG_DRM_SUBALLOC_HELPER=m
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+CONFIG_DRM_HDLCD=m
+# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
+CONFIG_DRM_MALI_DISPLAY=m
+CONFIG_DRM_KOMEDA=m
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_USERPTR is not set
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+# CONFIG_DRM_AMD_ACP is not set
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+CONFIG_DRM_AMD_DC_FP=y
+CONFIG_DRM_AMD_DC_SI=y
+CONFIG_DRM_AMD_SECURE_DISPLAY=y
+# end of Display Engine Configuration
+
+CONFIG_HSA_AMD=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_PLATFORM_DRIVER=y
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+# CONFIG_NOUVEAU_DEBUG_PUSH is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+# CONFIG_DRM_KMB_DISPLAY is not set
+CONFIG_DRM_VGEM=m
+# CONFIG_DRM_VKMS is not set
+CONFIG_DRM_ROCKCHIP=m
+CONFIG_ROCKCHIP_VOP=y
+CONFIG_ROCKCHIP_VOP2=y
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_ROCKCHIP_CDN_DP=y
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_INNO_HDMI=y
+CONFIG_ROCKCHIP_LVDS=y
+CONFIG_ROCKCHIP_RGB=y
+CONFIG_ROCKCHIP_RK3066_HDMI=y
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+# CONFIG_DRM_MGAG200 is not set
+# CONFIG_DRM_SUN4I is not set
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_VIRTIO_GPU_KMS=y
+CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM_GPU_STATE=y
+# CONFIG_DRM_MSM_GPU_SUDO is not set
+CONFIG_DRM_MSM_MDSS=y
+CONFIG_DRM_MSM_MDP4=y
+CONFIG_DRM_MSM_MDP5=y
+CONFIG_DRM_MSM_DPU=y
+CONFIG_DRM_MSM_DP=y
+CONFIG_DRM_MSM_DSI=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_10NM_PHY=y
+CONFIG_DRM_MSM_DSI_7NM_PHY=y
+CONFIG_DRM_MSM_HDMI=y
+CONFIG_DRM_MSM_HDMI_HDCP=y
+CONFIG_DRM_TEGRA=m
+# CONFIG_DRM_TEGRA_DEBUG is not set
+CONFIG_DRM_TEGRA_STAGING=y
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+# CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
+CONFIG_DRM_PANEL_ARM_VERSATILE=m
+CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m
+CONFIG_DRM_PANEL_AUO_A030JTN01=m
+CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0=m
+CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
+CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
+CONFIG_DRM_PANEL_DSI_CM=m
+# CONFIG_DRM_PANEL_LVDS is not set
+CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_EDP=m
+CONFIG_DRM_PANEL_EBBG_FT8719=m
+CONFIG_DRM_PANEL_ELIDA_KD35T133=m
+CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
+# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
+CONFIG_DRM_PANEL_HIMAX_HX8394=m
+# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
+# CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
+# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
+CONFIG_DRM_PANEL_JADARD_JD9365DA_H3=m
+# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_JDI_R63452 is not set
+CONFIG_DRM_PANEL_KHADAS_TS050=m
+# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
+CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_LG_LB035Q02 is not set
+# CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966=m
+# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
+CONFIG_DRM_PANEL_NEWVISION_NV3051D=m
+CONFIG_DRM_PANEL_NEWVISION_NV3052C=m
+CONFIG_DRM_PANEL_NOVATEK_NT35510=m
+CONFIG_DRM_PANEL_NOVATEK_NT35560=m
+CONFIG_DRM_PANEL_NOVATEK_NT35950=m
+CONFIG_DRM_PANEL_NOVATEK_NT36523=m
+# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
+CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
+# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
+CONFIG_DRM_PANEL_ORISETECH_OTA5601A=m
+# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
+CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m
+# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
+# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
+# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set
+# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS060T1SX01 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
+CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
+CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
+# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
+# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
+# CONFIG_DRM_PANEL_TPO_TPG110 is not set
+# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
+CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
+# CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
+CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_CHIPONE_ICN6211=m
+CONFIG_DRM_CHRONTEL_CH7033=m
+CONFIG_DRM_CROS_EC_ANX7688=m
+CONFIG_DRM_DISPLAY_CONNECTOR=m
+CONFIG_DRM_FSL_LDB=m
+CONFIG_DRM_ITE_IT6505=m
+CONFIG_DRM_LONTIUM_LT8912B=m
+CONFIG_DRM_LONTIUM_LT9211=m
+CONFIG_DRM_LONTIUM_LT9611=m
+CONFIG_DRM_LONTIUM_LT9611UXC=m
+CONFIG_DRM_ITE_IT66121=m
+CONFIG_DRM_LVDS_CODEC=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_NWL_MIPI_DSI=m
+# CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PARADE_PS8622 is not set
+CONFIG_DRM_PARADE_PS8640=m
+CONFIG_DRM_SAMSUNG_DSIM=m
+# CONFIG_DRM_SIL_SII8620 is not set
+# CONFIG_DRM_SII902X is not set
+# CONFIG_DRM_SII9234 is not set
+CONFIG_DRM_SIMPLE_BRIDGE=m
+# CONFIG_DRM_THINE_THC63LVD1024 is not set
+CONFIG_DRM_TOSHIBA_TC358762=m
+# CONFIG_DRM_TOSHIBA_TC358764 is not set
+# CONFIG_DRM_TOSHIBA_TC358767 is not set
+# CONFIG_DRM_TOSHIBA_TC358768 is not set
+CONFIG_DRM_TOSHIBA_TC358775=m
+CONFIG_DRM_TI_DLPC3433=m
+# CONFIG_DRM_TI_TFP410 is not set
+CONFIG_DRM_TI_SN65DSI83=m
+# CONFIG_DRM_TI_SN65DSI86 is not set
+CONFIG_DRM_TI_TPD12S015=m
+CONFIG_DRM_ANALOGIX_ANX6345=m
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+CONFIG_DRM_ANALOGIX_DP=m
+CONFIG_DRM_ANALOGIX_ANX7625=m
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
+CONFIG_DRM_I2C_ADV7511_CEC=y
+CONFIG_DRM_CDNS_DSI=m
+CONFIG_DRM_CDNS_DSI_J721E=y
+CONFIG_DRM_CDNS_MHDP8546=m
+CONFIG_DRM_IMX8QM_LDB=m
+CONFIG_DRM_IMX8QXP_LDB=m
+CONFIG_DRM_IMX8QXP_PIXEL_COMBINER=m
+CONFIG_DRM_IMX8QXP_PIXEL_LINK=m
+CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI=m
+CONFIG_DRM_DW_HDMI=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+CONFIG_DRM_DW_HDMI_GP_AUDIO=m
+# CONFIG_DRM_DW_HDMI_CEC is not set
+CONFIG_DRM_DW_MIPI_DSI=m
+# end of Display Interface Bridges
+
+CONFIG_DRM_IMX_DCSS=m
+CONFIG_DRM_IMX_LCDC=m
+CONFIG_DRM_V3D=m
+CONFIG_DRM_VC4=m
+# CONFIG_DRM_VC4_HDMI_CEC is not set
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
+CONFIG_DRM_HISI_HIBMC=m
+CONFIG_DRM_HISI_KIRIN=m
+CONFIG_DRM_LOGICVC=m
+CONFIG_DRM_MXS=y
+# CONFIG_DRM_MXSFB is not set
+CONFIG_DRM_IMX_LCDIF=m
+CONFIG_DRM_MESON=m
+CONFIG_DRM_MESON_DW_HDMI=m
+# CONFIG_DRM_ARCPGU is not set
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_GM12U320=m
+CONFIG_DRM_PANEL_MIPI_DBI=m
+CONFIG_DRM_SIMPLEDRM=m
+# CONFIG_TINYDRM_HX8357D is not set
+# CONFIG_TINYDRM_ILI9163 is not set
+# CONFIG_TINYDRM_ILI9225 is not set
+# CONFIG_TINYDRM_ILI9341 is not set
+CONFIG_TINYDRM_ILI9486=m
+# CONFIG_TINYDRM_MI0283QT is not set
+# CONFIG_TINYDRM_REPAPER is not set
+# CONFIG_TINYDRM_ST7586 is not set
+# CONFIG_TINYDRM_ST7735R is not set
+# CONFIG_DRM_PL111 is not set
+CONFIG_DRM_XEN=y
+CONFIG_DRM_XEN_FRONTEND=m
+CONFIG_DRM_LIMA=m
+CONFIG_DRM_PANFROST=m
+CONFIG_DRM_TIDSS=m
+CONFIG_DRM_GUD=m
+CONFIG_DRM_SSD130X=m
+CONFIG_DRM_SSD130X_I2C=m
+CONFIG_DRM_SSD130X_SPI=m
+CONFIG_DRM_HYPERV=m
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+CONFIG_DRM_PRIVACY_SCREEN=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_SVGALIB=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+CONFIG_FB_ARMCLCD=y
+CONFIG_FB_IMX=m
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_EFI=y
+# CONFIG_FB_OPENCORES is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+# CONFIG_FB_VOODOO1 is not set
+CONFIG_FB_VT8623=m
+# CONFIG_FB_TRIDENT is not set
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+# CONFIG_FB_CARMINE is not set
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=y
+# CONFIG_FB_METRONOME is not set
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+# CONFIG_FB_MX3 is not set
+CONFIG_FB_HYPERV=m
+CONFIG_FB_SIMPLE=m
+# CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SM712 is not set
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI922X=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+CONFIG_LCD_OTM3225A=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_KTD253=m
+CONFIG_BACKLIGHT_KTZ8866=m
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_MT6370=m
+CONFIG_BACKLIGHT_QCOM_WLED=m
+CONFIG_BACKLIGHT_RT4831=m
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3630A is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+CONFIG_BACKLIGHT_LP855X=m
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
+# CONFIG_BACKLIGHT_ARCXCNN is not set
+CONFIG_BACKLIGHT_LED=m
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
+# CONFIG_LOGO is not set
+# end of Graphics support
+
+CONFIG_DRM_ACCEL=y
+CONFIG_DRM_ACCEL_QAIC=m
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_CTL_FAST_LOOKUP=y
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_CTL_INPUT_VALIDATION=y
+CONFIG_SND_VMASTER=y
+CONFIG_SND_CTL_LED=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+CONFIG_SND_ALOOP=m
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+CONFIG_SND_MTS64=m
+# CONFIG_SND_SERIAL_U16550 is not set
+CONFIG_SND_SERIAL_GENERIC=m
+# CONFIG_SND_MPU401 is not set
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALI5451=m
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+CONFIG_SND_AZT3328=m
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDSP is not set
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+CONFIG_SND_VIRTUOSO=m
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_GENERIC_LEDS=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_TEGRA=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_SCODEC_CS35L41=m
+CONFIG_SND_HDA_CS_DSP_CONTROLS=m
+CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CS8409=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y
+# CONFIG_SND_HDA_CTL_DEV_ID is not set
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_ALIGNED_MMIO=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_EXT_CORE=m
+CONFIG_SND_HDA_PREALLOC_SIZE=2048
+CONFIG_SND_INTEL_NHLT=y
+CONFIG_SND_INTEL_DSP_CONFIG=m
+CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREFACE is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=m
+# CONFIG_SND_SOC_AMD_ACP is not set
+# CONFIG_SND_AMD_ACP_CONFIG is not set
+CONFIG_SND_SOC_APPLE_MCA=m
+# CONFIG_SND_ATMEL_SOC is not set
+CONFIG_SND_BCM2835_SOC_I2S=m
+CONFIG_SND_BCM63XX_I2S_WHISTLER=m
+# CONFIG_SND_DESIGNWARE_I2S is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+# CONFIG_SND_SOC_FSL_ASRC is not set
+CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_MQS=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_SPDIF=m
+CONFIG_SND_SOC_FSL_ESAI=m
+CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_FSL_XCVR=m
+CONFIG_SND_SOC_FSL_AUD2HTX=m
+CONFIG_SND_SOC_FSL_UTILS=m
+CONFIG_SND_SOC_FSL_RPMSG=m
+CONFIG_SND_SOC_IMX_PCM_DMA=m
+CONFIG_SND_SOC_IMX_AUDIO_RPMSG=m
+CONFIG_SND_SOC_IMX_PCM_RPMSG=m
+CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_IMX_SOC=m
+
+#
+# SoC Audio support for Freescale i.MX boards:
+#
+CONFIG_SND_SOC_IMX_ES8328=m
+CONFIG_SND_SOC_IMX_SGTL5000=m
+CONFIG_SND_SOC_IMX_SPDIF=m
+CONFIG_SND_SOC_FSL_ASOC_CARD=m
+CONFIG_SND_SOC_IMX_AUDMIX=m
+CONFIG_SND_SOC_IMX_HDMI=m
+CONFIG_SND_SOC_IMX_RPMSG=m
+CONFIG_SND_SOC_IMX_CARD=m
+# end of SoC Audio for Freescale CPUs
+
+CONFIG_SND_I2S_HI6210_I2S=m
+# CONFIG_SND_KIRKWOOD_SOC is not set
+# CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_INTEL_KEEMBAY=m
+# CONFIG_SND_SOC_MTK_BTCVSD is not set
+
+#
+# ASoC support for Amlogic platforms
+#
+CONFIG_SND_MESON_AIU=m
+# CONFIG_SND_MESON_AXG_FRDDR is not set
+# CONFIG_SND_MESON_AXG_TODDR is not set
+# CONFIG_SND_MESON_AXG_TDMIN is not set
+# CONFIG_SND_MESON_AXG_TDMOUT is not set
+# CONFIG_SND_MESON_AXG_SOUND_CARD is not set
+# CONFIG_SND_MESON_AXG_SPDIFOUT is not set
+# CONFIG_SND_MESON_AXG_SPDIFIN is not set
+# CONFIG_SND_MESON_AXG_PDM is not set
+CONFIG_SND_MESON_CODEC_GLUE=m
+# CONFIG_SND_MESON_GX_SOUND_CARD is not set
+# CONFIG_SND_MESON_G12A_TOACODEC is not set
+# CONFIG_SND_MESON_G12A_TOHDMITX is not set
+CONFIG_SND_SOC_MESON_T9015=m
+# end of ASoC support for Amlogic platforms
+
+CONFIG_SND_SOC_QCOM=m
+CONFIG_SND_SOC_LPASS_CPU=m
+CONFIG_SND_SOC_LPASS_HDMI=m
+CONFIG_SND_SOC_LPASS_PLATFORM=m
+CONFIG_SND_SOC_LPASS_APQ8016=m
+CONFIG_SND_SOC_LPASS_SC7180=m
+# CONFIG_SND_SOC_STORM is not set
+CONFIG_SND_SOC_APQ8016_SBC=m
+CONFIG_SND_SOC_QCOM_COMMON=m
+CONFIG_SND_SOC_QDSP6_COMMON=m
+CONFIG_SND_SOC_QDSP6_CORE=m
+CONFIG_SND_SOC_QDSP6_AFE=m
+CONFIG_SND_SOC_QDSP6_AFE_DAI=m
+CONFIG_SND_SOC_QDSP6_AFE_CLOCKS=m
+CONFIG_SND_SOC_QDSP6_ADM=m
+CONFIG_SND_SOC_QDSP6_ROUTING=m
+CONFIG_SND_SOC_QDSP6_ASM=m
+CONFIG_SND_SOC_QDSP6_ASM_DAI=m
+CONFIG_SND_SOC_QDSP6_APM_DAI=m
+CONFIG_SND_SOC_QDSP6_APM_LPASS_DAI=m
+CONFIG_SND_SOC_QDSP6_APM=m
+CONFIG_SND_SOC_QDSP6_PRM_LPASS_CLOCKS=m
+CONFIG_SND_SOC_QDSP6_PRM=m
+CONFIG_SND_SOC_QDSP6=m
+CONFIG_SND_SOC_MSM8996=m
+CONFIG_SND_SOC_SC7180=m
+CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP_I2S=m
+CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
+CONFIG_SND_SOC_ROCKCHIP_PDM=m
+CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
+CONFIG_SND_SOC_ROCKCHIP_RT5645=m
+CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
+CONFIG_SND_SOC_RK3399_GRU_SOUND=m
+# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+#
+# Allwinner SoC Audio support
+#
+# CONFIG_SND_SUN4I_CODEC is not set
+# CONFIG_SND_SUN8I_CODEC is not set
+# CONFIG_SND_SUN8I_CODEC_ANALOG is not set
+# CONFIG_SND_SUN50I_CODEC_ANALOG is not set
+# CONFIG_SND_SUN4I_I2S is not set
+# CONFIG_SND_SUN4I_SPDIF is not set
+CONFIG_SND_SUN50I_DMIC=m
+# end of Allwinner SoC Audio support
+
+CONFIG_SND_SOC_TEGRA=m
+# CONFIG_SND_SOC_TEGRA20_AC97 is not set
+# CONFIG_SND_SOC_TEGRA20_DAS is not set
+# CONFIG_SND_SOC_TEGRA20_I2S is not set
+CONFIG_SND_SOC_TEGRA20_SPDIF=m
+# CONFIG_SND_SOC_TEGRA30_AHUB is not set
+# CONFIG_SND_SOC_TEGRA30_I2S is not set
+# CONFIG_SND_SOC_TEGRA210_AHUB is not set
+# CONFIG_SND_SOC_TEGRA210_DMIC is not set
+# CONFIG_SND_SOC_TEGRA210_I2S is not set
+# CONFIG_SND_SOC_TEGRA210_OPE is not set
+# CONFIG_SND_SOC_TEGRA186_ASRC is not set
+# CONFIG_SND_SOC_TEGRA186_DSPK is not set
+# CONFIG_SND_SOC_TEGRA210_ADMAIF is not set
+# CONFIG_SND_SOC_TEGRA210_MVC is not set
+# CONFIG_SND_SOC_TEGRA210_SFC is not set
+# CONFIG_SND_SOC_TEGRA210_AMX is not set
+# CONFIG_SND_SOC_TEGRA210_ADX is not set
+# CONFIG_SND_SOC_TEGRA210_MIXER is not set
+# CONFIG_SND_SOC_TEGRA_AUDIO_GRAPH_CARD is not set
+CONFIG_SND_SOC_TEGRA_MACHINE_DRV=m
+CONFIG_SND_SOC_TEGRA_RT5631=m
+CONFIG_SND_SOC_TEGRA_RT5640=m
+CONFIG_SND_SOC_TEGRA_WM8753=m
+CONFIG_SND_SOC_TEGRA_WM8903=m
+# CONFIG_SND_SOC_TEGRA_WM9712 is not set
+CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
+CONFIG_SND_SOC_TEGRA_ALC5632=m
+CONFIG_SND_SOC_TEGRA_MAX98090=m
+CONFIG_SND_SOC_TEGRA_MAX98088=m
+CONFIG_SND_SOC_TEGRA_RT5677=m
+# CONFIG_SND_SOC_TEGRA_SGTL5000 is not set
+CONFIG_SND_SOC_XILINX_I2S=m
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
+# CONFIG_SND_SOC_XTFPGA_I2S is not set
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+CONFIG_SND_SOC_WM_HUBS=m
+# CONFIG_SND_SOC_AC97_CODEC is not set
+CONFIG_SND_SOC_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1372=m
+CONFIG_SND_SOC_ADAU1372_I2C=m
+CONFIG_SND_SOC_ADAU1372_SPI=m
+# CONFIG_SND_SOC_ADAU1701 is not set
+# CONFIG_SND_SOC_ADAU1761_I2C is not set
+# CONFIG_SND_SOC_ADAU1761_SPI is not set
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_ADAU7118=m
+CONFIG_SND_SOC_ADAU7118_HW=m
+CONFIG_SND_SOC_ADAU7118_I2C=m
+# CONFIG_SND_SOC_AK4104 is not set
+# CONFIG_SND_SOC_AK4118 is not set
+# CONFIG_SND_SOC_AK4375 is not set
+CONFIG_SND_SOC_AK4458=m
+# CONFIG_SND_SOC_AK4554 is not set
+# CONFIG_SND_SOC_AK4613 is not set
+# CONFIG_SND_SOC_AK4642 is not set
+# CONFIG_SND_SOC_AK5386 is not set
+CONFIG_SND_SOC_AK5558=m
+# CONFIG_SND_SOC_ALC5623 is not set
+CONFIG_SND_SOC_ALC5632=m
+# CONFIG_SND_SOC_AW8738 is not set
+CONFIG_SND_SOC_AW88395_LIB=m
+CONFIG_SND_SOC_AW88395=m
+# CONFIG_SND_SOC_BD28623 is not set
+# CONFIG_SND_SOC_BT_SCO is not set
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+# CONFIG_SND_SOC_CS35L32 is not set
+# CONFIG_SND_SOC_CS35L33 is not set
+# CONFIG_SND_SOC_CS35L34 is not set
+# CONFIG_SND_SOC_CS35L35 is not set
+# CONFIG_SND_SOC_CS35L36 is not set
+CONFIG_SND_SOC_CS35L41_LIB=m
+# CONFIG_SND_SOC_CS35L41_SPI is not set
+# CONFIG_SND_SOC_CS35L41_I2C is not set
+# CONFIG_SND_SOC_CS35L45_SPI is not set
+# CONFIG_SND_SOC_CS35L45_I2C is not set
+# CONFIG_SND_SOC_CS35L56_I2C is not set
+# CONFIG_SND_SOC_CS35L56_SPI is not set
+CONFIG_SND_SOC_CS42L42_CORE=m
+# CONFIG_SND_SOC_CS42L42 is not set
+# CONFIG_SND_SOC_CS42L51_I2C is not set
+# CONFIG_SND_SOC_CS42L52 is not set
+# CONFIG_SND_SOC_CS42L56 is not set
+# CONFIG_SND_SOC_CS42L73 is not set
+CONFIG_SND_SOC_CS42L83=m
+# CONFIG_SND_SOC_CS4234 is not set
+# CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_SOC_CS4270 is not set
+# CONFIG_SND_SOC_CS4271_I2C is not set
+# CONFIG_SND_SOC_CS4271_SPI is not set
+# CONFIG_SND_SOC_CS42XX8_I2C is not set
+# CONFIG_SND_SOC_CS43130 is not set
+# CONFIG_SND_SOC_CS4341 is not set
+# CONFIG_SND_SOC_CS4349 is not set
+# CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_CX2072X is not set
+# CONFIG_SND_SOC_DA7213 is not set
+CONFIG_SND_SOC_DA7219=m
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+# CONFIG_SND_SOC_ES7134 is not set
+# CONFIG_SND_SOC_ES7241 is not set
+# CONFIG_SND_SOC_ES8316 is not set
+CONFIG_SND_SOC_ES8326=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDA=m
+CONFIG_SND_SOC_ICS43432=m
+CONFIG_SND_SOC_IDT821034=m
+# CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98357A=m
+# CONFIG_SND_SOC_MAX98504 is not set
+# CONFIG_SND_SOC_MAX9867 is not set
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98520=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX98373_I2C=m
+# CONFIG_SND_SOC_MAX98390 is not set
+# CONFIG_SND_SOC_MAX98396 is not set
+# CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+# CONFIG_SND_SOC_PCM1681 is not set
+# CONFIG_SND_SOC_PCM1789_I2C is not set
+# CONFIG_SND_SOC_PCM179X_I2C is not set
+# CONFIG_SND_SOC_PCM179X_SPI is not set
+# CONFIG_SND_SOC_PCM186X_I2C is not set
+# CONFIG_SND_SOC_PCM186X_SPI is not set
+# CONFIG_SND_SOC_PCM3060_I2C is not set
+# CONFIG_SND_SOC_PCM3060_SPI is not set
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
+# CONFIG_SND_SOC_PCM3168A_SPI is not set
+# CONFIG_SND_SOC_PCM5102A is not set
+# CONFIG_SND_SOC_PCM512x_I2C is not set
+# CONFIG_SND_SOC_PCM512x_SPI is not set
+CONFIG_SND_SOC_PEB2466=m
+CONFIG_SND_SOC_RK3328=m
+CONFIG_SND_SOC_RK817=m
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RT5514=m
+CONFIG_SND_SOC_RT5514_SPI=m
+# CONFIG_SND_SOC_RT5616 is not set
+CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+# CONFIG_SND_SOC_RT5659 is not set
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_RT5682=m
+CONFIG_SND_SOC_RT5682_I2C=m
+CONFIG_SND_SOC_RT5682S=m
+# CONFIG_SND_SOC_RT9120 is not set
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SIMPLE_MUX=m
+CONFIG_SND_SOC_SMA1303=m
+# CONFIG_SND_SOC_SPDIF is not set
+CONFIG_SND_SOC_SRC4XXX_I2C=m
+CONFIG_SND_SOC_SRC4XXX=m
+# CONFIG_SND_SOC_SSM2305 is not set
+CONFIG_SND_SOC_SSM2518=m
+# CONFIG_SND_SOC_SSM2602_SPI is not set
+# CONFIG_SND_SOC_SSM2602_I2C is not set
+# CONFIG_SND_SOC_SSM4567 is not set
+# CONFIG_SND_SOC_STA32X is not set
+# CONFIG_SND_SOC_STA350 is not set
+# CONFIG_SND_SOC_STI_SAS is not set
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TAS2562 is not set
+# CONFIG_SND_SOC_TAS2764 is not set
+# CONFIG_SND_SOC_TAS2770 is not set
+# CONFIG_SND_SOC_TAS2780 is not set
+# CONFIG_SND_SOC_TAS5086 is not set
+# CONFIG_SND_SOC_TAS571X is not set
+# CONFIG_SND_SOC_TAS5720 is not set
+# CONFIG_SND_SOC_TAS5805M is not set
+# CONFIG_SND_SOC_TAS6424 is not set
+# CONFIG_SND_SOC_TDA7419 is not set
+# CONFIG_SND_SOC_TFA9879 is not set
+CONFIG_SND_SOC_TFA989X=m
+# CONFIG_SND_SOC_TLV320ADC3XXX is not set
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
+CONFIG_SND_SOC_TLV320AIC31XX=m
+# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320AIC3X_I2C=m
+CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+# CONFIG_SND_SOC_TLV320ADCX140 is not set
+CONFIG_SND_SOC_TS3A227E=m
+# CONFIG_SND_SOC_TSCS42XX is not set
+# CONFIG_SND_SOC_TSCS454 is not set
+# CONFIG_SND_SOC_UDA1334 is not set
+# CONFIG_SND_SOC_WM8510 is not set
+# CONFIG_SND_SOC_WM8523 is not set
+# CONFIG_SND_SOC_WM8524 is not set
+# CONFIG_SND_SOC_WM8580 is not set
+# CONFIG_SND_SOC_WM8711 is not set
+# CONFIG_SND_SOC_WM8728 is not set
+# CONFIG_SND_SOC_WM8731_I2C is not set
+# CONFIG_SND_SOC_WM8731_SPI is not set
+# CONFIG_SND_SOC_WM8737 is not set
+# CONFIG_SND_SOC_WM8741 is not set
+# CONFIG_SND_SOC_WM8750 is not set
+CONFIG_SND_SOC_WM8753=m
+# CONFIG_SND_SOC_WM8770 is not set
+# CONFIG_SND_SOC_WM8776 is not set
+# CONFIG_SND_SOC_WM8782 is not set
+# CONFIG_SND_SOC_WM8804_I2C is not set
+# CONFIG_SND_SOC_WM8804_SPI is not set
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+# CONFIG_SND_SOC_WM8940 is not set
+# CONFIG_SND_SOC_WM8960 is not set
+CONFIG_SND_SOC_WM8961=m
+# CONFIG_SND_SOC_WM8962 is not set
+# CONFIG_SND_SOC_WM8974 is not set
+# CONFIG_SND_SOC_WM8978 is not set
+# CONFIG_SND_SOC_WM8985 is not set
+CONFIG_SND_SOC_WM8994=m
+# CONFIG_SND_SOC_ZL38060 is not set
+# CONFIG_SND_SOC_MAX9759 is not set
+# CONFIG_SND_SOC_MT6351 is not set
+# CONFIG_SND_SOC_MT6358 is not set
+# CONFIG_SND_SOC_MT6660 is not set
+# CONFIG_SND_SOC_NAU8315 is not set
+# CONFIG_SND_SOC_NAU8540 is not set
+# CONFIG_SND_SOC_NAU8810 is not set
+# CONFIG_SND_SOC_NAU8821 is not set
+# CONFIG_SND_SOC_NAU8822 is not set
+# CONFIG_SND_SOC_NAU8824 is not set
+# CONFIG_SND_SOC_TPA6130A2 is not set
+# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_RX_MACRO is not set
+# CONFIG_SND_SOC_LPASS_TX_MACRO is not set
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_AUDIO_GRAPH_CARD=m
+CONFIG_SND_AUDIO_GRAPH_CARD2=m
+CONFIG_SND_AUDIO_GRAPH_CARD2_CUSTOM_SAMPLE=m
+# CONFIG_SND_TEST_COMPONENT is not set
+CONFIG_SND_SYNTH_EMUX=m
+# CONFIG_SND_XEN_FRONTEND is not set
+CONFIG_SND_VIRTIO=m
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+# CONFIG_HID_ACCUTOUCH is not set
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+# CONFIG_HID_APPLEIR is not set
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+# CONFIG_HID_BIGBEN_FF is not set
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+# CONFIG_HID_ELAN is not set
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EVISION=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_FT260=m
+CONFIG_HID_GEMBIRD=m
+# CONFIG_HID_GFRM is not set
+CONFIG_HID_GLORIOUS=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_VIVALDI_COMMON=m
+# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_VIVALDI=m
+# CONFIG_HID_GT683R is not set
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+# CONFIG_HID_VIEWSONIC is not set
+CONFIG_HID_VRC2=m
+CONFIG_HID_XIAOMI=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+# CONFIG_HID_ITE is not set
+# CONFIG_HID_JABRA is not set
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LETSKETCH=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+# CONFIG_HID_MAYFLASH is not set
+CONFIG_HID_MEGAWORLD_FF=m
+# CONFIG_HID_REDRAGON is not set
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NINTENDO=m
+CONFIG_NINTENDO_FF=y
+# CONFIG_HID_NTI is not set
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+# CONFIG_HID_PICOLCD_LCD is not set
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_PLAYSTATION_FF=y
+CONFIG_HID_PXRC=m
+CONFIG_HID_RAZER=m
+CONFIG_HID_PRIMAX=m
+# CONFIG_HID_RETRODE is not set
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SIGMAMICRO=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+# CONFIG_HID_STEAM is not set
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_TOPRE=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+# CONFIG_HID_UDRAW_PS3 is not set
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+CONFIG_HID_MCP2221=m
+# end of Special HID drivers
+
+#
+# HID-BPF support
+#
+CONFIG_HID_BPF=y
+# end of HID-BPF support
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+CONFIG_I2C_HID=m
+CONFIG_I2C_HID_ACPI=m
+CONFIG_I2C_HID_OF=m
+CONFIG_I2C_HID_OF_ELAN=m
+CONFIG_I2C_HID_OF_GOODIX=m
+CONFIG_I2C_HID_CORE=m
+
+#
+# Surface System Aggregator Module HID support
+#
+CONFIG_SURFACE_KBD=m
+# end of Surface System Aggregator Module HID support
+
+CONFIG_SURFACE_HID_CORE=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+CONFIG_USB_CONN_GPIO=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=m
+# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_XHCI_HISTB=m
+# CONFIG_USB_XHCI_MVEBU is not set
+CONFIG_USB_XHCI_TEGRA=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_FSL=m
+CONFIG_USB_EHCI_HCD_NPCM7XX=m
+CONFIG_USB_EHCI_HCD_ORION=m
+CONFIG_USB_EHCI_TEGRA=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_MAX3421_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+CONFIG_USB_XEN_HCD=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=15
+CONFIG_USBIP_VHCI_NR_HCS=8
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
+
+#
+# USB dual-mode controller drivers
+#
+CONFIG_USB_CDNS_SUPPORT=m
+CONFIG_USB_CDNS_HOST=y
+CONFIG_USB_CDNS3=m
+# CONFIG_USB_CDNS3_GADGET is not set
+# CONFIG_USB_CDNS3_HOST is not set
+CONFIG_USB_CDNS3_PCI_WRAP=m
+CONFIG_USB_CDNS3_IMX=m
+CONFIG_USB_CDNSP_PCI=m
+CONFIG_USB_CDNSP_GADGET=y
+CONFIG_USB_CDNSP_HOST=y
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+
+#
+# Platform Glue Layer
+#
+CONFIG_USB_MUSB_SUNXI=m
+
+#
+# MUSB DMA mode
+#
+# CONFIG_MUSB_PIO_ONLY is not set
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_ULPI is not set
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
+CONFIG_USB_DWC3_MESON_G12A=m
+CONFIG_USB_DWC3_OF_SIMPLE=m
+CONFIG_USB_DWC3_QCOM=m
+CONFIG_USB_DWC3_IMX8MP=m
+CONFIG_USB_DWC2=m
+# CONFIG_USB_DWC2_HOST is not set
+
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+# CONFIG_USB_DWC2_PERIPHERAL is not set
+CONFIG_USB_DWC2_DUAL_ROLE=y
+# CONFIG_USB_DWC2_PCI is not set
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CHIPIDEA_MSM=m
+CONFIG_USB_CHIPIDEA_IMX=m
+CONFIG_USB_CHIPIDEA_GENERIC=m
+CONFIG_USB_CHIPIDEA_TEGRA=m
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1761_UDC=y
+# CONFIG_USB_ISP1760_HOST_ROLE is not set
+# CONFIG_USB_ISP1760_GADGET_ROLE is not set
+CONFIG_USB_ISP1760_DUAL_ROLE=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+# CONFIG_USB_SERIAL_F8153X is not set
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+# CONFIG_USB_SERIAL_UPD78F0730 is not set
+CONFIG_USB_SERIAL_XR=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_USS720 is not set
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_QCOM_EUD=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+# CONFIG_USB_HUB_USB251XB is not set
+CONFIG_USB_HSIC_USB3503=m
+# CONFIG_USB_HSIC_USB4604 is not set
+# CONFIG_USB_LINK_LAYER_TEST is not set
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ONBOARD_HUB=m
+# CONFIG_USB_ATM is not set
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ISP1301 is not set
+CONFIG_USB_MXS_PHY=m
+CONFIG_USB_TEGRA_PHY=m
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
+
+#
+# USB Peripheral Controller
+#
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_SNP_UDC_PLAT is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_BDC_UDC is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_NET2272 is not set
+CONFIG_USB_NET2280=m
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_GADGET_XILINX is not set
+CONFIG_USB_MAX3420_UDC=m
+CONFIG_USB_TEGRA_XUDC=m
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+# CONFIG_USB_CONFIGFS_F_TCM is not set
+
+#
+# USB Gadget precomposed configurations
+#
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_AUDIO is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
+# CONFIG_USB_G_NCM is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_GADGET_TARGET is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_WEBCAM is not set
+CONFIG_USB_RAW_GADGET=m
+# end of USB Gadget precomposed configurations
+
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_RT1711H=m
+CONFIG_TYPEC_MT6360=m
+CONFIG_TYPEC_TCPCI_MT6370=m
+CONFIG_TYPEC_TCPCI_MAXIM=m
+CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
+CONFIG_UCSI_ACPI=m
+CONFIG_UCSI_STM32G0=m
+CONFIG_UCSI_PMIC_GLINK=m
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_ANX7411=m
+CONFIG_TYPEC_RT1719=m
+CONFIG_TYPEC_HD3SS3220=m
+CONFIG_TYPEC_STUSB160X=m
+CONFIG_TYPEC_QCOM_PMIC=m
+CONFIG_TYPEC_WUSB3801=m
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+CONFIG_TYPEC_MUX_FSA4480=m
+CONFIG_TYPEC_MUX_GPIO_SBU=m
+CONFIG_TYPEC_MUX_PI3USB30532=m
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
+
+#
+# USB Type-C Alternate Mode drivers
+#
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_MMC=y
+CONFIG_PWRSEQ_EMMC=y
+# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SIMPLE=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=256
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+CONFIG_MMC_CRYPTO=y
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_ARMMMCI=m
+CONFIG_MMC_QCOM_DML=y
+CONFIG_MMC_STM32_SDMMC=y
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_OF_ARASAN=m
+# CONFIG_MMC_SDHCI_OF_AT91 is not set
+CONFIG_MMC_SDHCI_OF_ESDHC=m
+# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
+# CONFIG_MMC_SDHCI_CADENCE is not set
+CONFIG_MMC_SDHCI_ESDHC_IMX=m
+CONFIG_MMC_SDHCI_TEGRA=m
+# CONFIG_MMC_SDHCI_PXAV3 is not set
+CONFIG_MMC_SDHCI_F_SDH30=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
+CONFIG_MMC_SDHCI_IPROC=m
+CONFIG_MMC_MESON_GX=m
+# CONFIG_MMC_MESON_MX_SDIO is not set
+CONFIG_MMC_ALCOR=m
+CONFIG_MMC_SDHCI_MSM=m
+CONFIG_MMC_MXC=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SPI=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_DW=m
+CONFIG_MMC_DW_PLTFM=m
+# CONFIG_MMC_DW_BLUEFIELD is not set
+# CONFIG_MMC_DW_EXYNOS is not set
+# CONFIG_MMC_DW_HI3798CV200 is not set
+CONFIG_MMC_DW_K3=m
+# CONFIG_MMC_DW_PCI is not set
+CONFIG_MMC_DW_ROCKCHIP=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_SUNXI=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_HSQ=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_BCM2835=m
+# CONFIG_MMC_MTK is not set
+CONFIG_MMC_SDHCI_XENON=m
+# CONFIG_MMC_SDHCI_OMAP is not set
+CONFIG_MMC_SDHCI_AM654=m
+CONFIG_SCSI_UFSHCD=m
+# CONFIG_SCSI_UFS_BSG is not set
+CONFIG_SCSI_UFS_CRYPTO=y
+CONFIG_SCSI_UFS_HPB=y
+CONFIG_SCSI_UFS_HWMON=y
+CONFIG_SCSI_UFSHCD_PCI=m
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_CLASS_FLASH is not set
+CONFIG_LEDS_CLASS_MULTICOLOR=m
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_AN30259A is not set
+# CONFIG_LEDS_AW2013 is not set
+# CONFIG_LEDS_BCM6328 is not set
+# CONFIG_LEDS_BCM6358 is not set
+# CONFIG_LEDS_CR0014114 is not set
+# CONFIG_LEDS_EL15203000 is not set
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3532 is not set
+# CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_LM3692X is not set
+# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+# CONFIG_LEDS_LP3952 is not set
+# CONFIG_LEDS_LP50XX is not set
+CONFIG_LEDS_LP55XX_COMMON=m
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP8501 is not set
+# CONFIG_LEDS_LP8860 is not set
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
+# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2606MVV=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_LT3593=m
+# CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_TLC591XX is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_IS31FL319X is not set
+# CONFIG_LEDS_IS31FL32XX is not set
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+# CONFIG_LEDS_BLINKM is not set
+# CONFIG_LEDS_SYSCON is not set
+# CONFIG_LEDS_MLXREG is not set
+# CONFIG_LEDS_USER is not set
+CONFIG_LEDS_SPI_BYTE=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+CONFIG_LEDS_LM3697=m
+
+#
+# Flash and Torch LED drivers
+#
+
+#
+# RGB LED drivers
+#
+CONFIG_LEDS_PWM_MULTICOLOR=m
+CONFIG_LEDS_QCOM_LPG=m
+CONFIG_LEDS_MT6370_RGB=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+# CONFIG_LEDS_TRIGGER_PATTERN is not set
+CONFIG_LEDS_TRIGGER_AUDIO=m
+CONFIG_LEDS_TRIGGER_TTY=m
+
+#
+# Simple LED drivers
+#
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_VIRT_DMA=y
+# CONFIG_INFINIBAND_BNXT_RE is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
+CONFIG_INFINIBAND_ERDMA=m
+# CONFIG_INFINIBAND_HNS is not set
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_RDMA_RXE=m
+CONFIG_RDMA_SIW=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_RTRS=m
+CONFIG_INFINIBAND_RTRS_CLIENT=m
+CONFIG_INFINIBAND_RTRS_SERVER=m
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_THUNDERX=m
+CONFIG_EDAC_ALTERA=y
+CONFIG_EDAC_ALTERA_SDRAM=y
+CONFIG_EDAC_ALTERA_OCRAM=y
+CONFIG_EDAC_ALTERA_ETHERNET=y
+CONFIG_EDAC_ALTERA_NAND=y
+CONFIG_EDAC_ALTERA_USB=y
+CONFIG_EDAC_ALTERA_SDMMC=y
+CONFIG_EDAC_SYNOPSYS=m
+CONFIG_EDAC_XGENE=m
+# CONFIG_EDAC_QCOM is not set
+CONFIG_EDAC_DMC520=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_ABB5ZES3 is not set
+# CONFIG_RTC_DRV_ABEOZ9 is not set
+# CONFIG_RTC_DRV_ABX80X is not set
+CONFIG_RTC_DRV_DS1307=y
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_HYM8563 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+CONFIG_RTC_DRV_MAX77686=y
+CONFIG_RTC_DRV_NCT3018Y=m
+CONFIG_RTC_DRV_RK808=m
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_ISL12026 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF85063 is not set
+# CONFIG_RTC_DRV_PCF85363 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+CONFIG_RTC_DRV_BD70528=m
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8010 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3028 is not set
+# CONFIG_RTC_DRV_RV3032 is not set
+# CONFIG_RTC_DRV_RV8803 is not set
+# CONFIG_RTC_DRV_SD3078 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1302 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1343 is not set
+# CONFIG_RTC_DRV_DS1347 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6916 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_MCP795 is not set
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+# CONFIG_RTC_DRV_RX6110 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1685_FAMILY is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+CONFIG_RTC_DRV_EFI=y
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_OPTEE is not set
+# CONFIG_RTC_DRV_ZYNQMP is not set
+# CONFIG_RTC_DRV_CROS_EC is not set
+# CONFIG_RTC_DRV_NTXEC is not set
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_IMXDI=m
+CONFIG_RTC_DRV_MESON_VRTC=m
+# CONFIG_RTC_DRV_PL030 is not set
+CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_SUN6I=y
+CONFIG_RTC_DRV_MV=m
+CONFIG_RTC_DRV_ARMADA38X=m
+CONFIG_RTC_DRV_CADENCE=m
+# CONFIG_RTC_DRV_FTRTC010 is not set
+CONFIG_RTC_DRV_PM8XXX=m
+CONFIG_RTC_DRV_TEGRA=y
+CONFIG_RTC_DRV_MXC=m
+CONFIG_RTC_DRV_MXC_V2=m
+# CONFIG_RTC_DRV_SNVS is not set
+CONFIG_RTC_DRV_BBNSM=m
+CONFIG_RTC_DRV_IMX_SC=m
+CONFIG_RTC_DRV_XGENE=y
+# CONFIG_RTC_DRV_R7301 is not set
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+# CONFIG_RTC_DRV_GOLDFISH is not set
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DMA_ACPI=y
+CONFIG_DMA_OF=y
+# CONFIG_ALTERA_MSGDMA is not set
+# CONFIG_AMBA_PL08X is not set
+CONFIG_APPLE_ADMAC=y
+# CONFIG_AXI_DMAC is not set
+# CONFIG_BCM_SBA_RAID is not set
+CONFIG_DMA_BCM2835=y
+CONFIG_DMA_SUN6I=m
+# CONFIG_DW_AXI_DMAC is not set
+# CONFIG_FSL_EDMA is not set
+CONFIG_FSL_QDMA=m
+CONFIG_HISI_DMA=m
+CONFIG_IMX_DMA=m
+CONFIG_IMX_SDMA=m
+# CONFIG_INTEL_IDMA64 is not set
+CONFIG_K3_DMA=m
+CONFIG_MV_XOR=y
+CONFIG_MV_XOR_V2=y
+# CONFIG_MXS_DMA is not set
+CONFIG_MX3_IPU=y
+CONFIG_MX3_IPU_IRQS=4
+CONFIG_PL330_DMA=m
+CONFIG_PLX_DMA=m
+CONFIG_TEGRA186_GPC_DMA=m
+CONFIG_TEGRA20_APB_DMA=y
+CONFIG_TEGRA210_ADMA=y
+CONFIG_XGENE_DMA=m
+# CONFIG_XILINX_DMA is not set
+CONFIG_XILINX_XDMA=m
+# CONFIG_XILINX_ZYNQMP_DMA is not set
+CONFIG_XILINX_ZYNQMP_DPDMA=m
+CONFIG_QCOM_BAM_DMA=m
+CONFIG_QCOM_GPI_DMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+# CONFIG_DW_DMAC is not set
+# CONFIG_DW_DMAC_PCI is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
+CONFIG_SF_PDMA=m
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+# CONFIG_UDMABUF is not set
+# CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
+# CONFIG_DMABUF_SELFTESTS is not set
+# CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
+# end of DMABUF options
+
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_PANEL is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
+# CONFIG_UIO_DMEM_GENIRQ is not set
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+# CONFIG_UIO_PRUSS is not set
+CONFIG_UIO_MF624=m
+CONFIG_UIO_HV_GENERIC=m
+CONFIG_VFIO=m
+CONFIG_VFIO_CONTAINER=y
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_NOIOMMU=y
+CONFIG_VFIO_VIRQFD=y
+CONFIG_VFIO_PCI_CORE=m
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI=m
+CONFIG_MLX5_VFIO_PCI=m
+CONFIG_HISI_ACC_VFIO_PCI=m
+# CONFIG_VFIO_PLATFORM is not set
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VMGENID=y
+CONFIG_NITRO_ENCLAVES=m
+CONFIG_VIRTIO_ANCHOR=y
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_PCI_LIB=m
+CONFIG_VIRTIO_PCI_LIB_LEGACY=m
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_PMEM=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+CONFIG_VDPA=m
+# CONFIG_VDPA_SIM is not set
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_MLX5_VDPA=y
+CONFIG_MLX5_VDPA_NET=m
+# CONFIG_MLX5_VDPA_STEERING_DEBUG is not set
+CONFIG_VP_VDPA=m
+CONFIG_SNET_VDPA=m
+CONFIG_VHOST_IOTLB=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST_TASK=y
+CONFIG_VHOST=m
+CONFIG_VHOST_MENU=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+# CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PCI_STUB=y
+CONFIG_XEN_PCIDEV_STUB=m
+# CONFIG_XEN_PVCALLS_FRONTEND is not set
+# CONFIG_XEN_PVCALLS_BACKEND is not set
+CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_EFI=y
+CONFIG_XEN_AUTO_XLATE=y
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
+CONFIG_XEN_GRANT_DMA_IOMMU=y
+CONFIG_XEN_GRANT_DMA_OPS=y
+CONFIG_XEN_VIRTIO=y
+# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
+# end of Xen driver support
+
+# CONFIG_GREYBUS is not set
+# CONFIG_COMEDI is not set
+CONFIG_STAGING=y
+# CONFIG_PRISM2_USB is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTLLIB is not set
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+# CONFIG_RTS5208 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16240 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7816 is not set
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+# CONFIG_ADT7316 is not set
+# end of Analog digital bi-direction converters
+
+#
+# Direct Digital Synthesis
+#
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+# CONFIG_AD5933 is not set
+# end of Network Analyzer, Impedance Converters
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S1210 is not set
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+# CONFIG_FB_SM750 is not set
+# CONFIG_MFD_NVEC is not set
+# CONFIG_STAGING_MEDIA is not set
+# CONFIG_STAGING_BOARD is not set
+# CONFIG_LTE_GDM724X is not set
+# CONFIG_FB_TFT is not set
+# CONFIG_KS7010 is not set
+CONFIG_BCM_VIDEOCORE=y
+# CONFIG_BCM2835_VCHIQ is not set
+# CONFIG_SND_BCM2835 is not set
+# CONFIG_VIDEO_BCM2835 is not set
+# CONFIG_PI433 is not set
+# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_FIELDBUS_DEV is not set
+CONFIG_QLGE=m
+# CONFIG_VME_BUS is not set
+# CONFIG_GOLDFISH is not set
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_ACPI=m
+CONFIG_CHROMEOS_TBMC=m
+CONFIG_CROS_EC=y
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_RPMSG=m
+CONFIG_CROS_EC_SPI=m
+CONFIG_CROS_EC_UART=m
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LIGHTBAR=m
+CONFIG_CROS_EC_VBC=m
+CONFIG_CROS_EC_DEBUGFS=m
+CONFIG_CROS_EC_SENSORHUB=m
+CONFIG_CROS_EC_SYSFS=m
+CONFIG_CROS_EC_TYPEC=m
+CONFIG_CROS_HPS_I2C=m
+CONFIG_CROS_USBPD_LOGGER=m
+CONFIG_CROS_USBPD_NOTIFY=m
+CONFIG_CHROMEOS_PRIVACY_SCREEN=m
+CONFIG_CROS_TYPEC_SWITCH=m
+# CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_SURFACE_PLATFORMS=y
+CONFIG_SURFACE_3_POWER_OPREGION=m
+# CONFIG_SURFACE_ACPI_NOTIFY is not set
+# CONFIG_SURFACE_AGGREGATOR_CDEV is not set
+# CONFIG_SURFACE_AGGREGATOR_HUB is not set
+# CONFIG_SURFACE_AGGREGATOR_REGISTRY is not set
+# CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH is not set
+CONFIG_SURFACE_DTX=m
+CONFIG_SURFACE_GPE=m
+CONFIG_SURFACE_HOTPLUG=m
+# CONFIG_SURFACE_PRO3_BUTTON is not set
+CONFIG_SURFACE_AGGREGATOR=m
+CONFIG_SURFACE_AGGREGATOR_BUS=y
+# CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Clock driver for ARM Reference designs
+#
+CONFIG_CLK_ICST=y
+CONFIG_CLK_SP810=y
+CONFIG_CLK_VEXPRESS_OSC=y
+# end of Clock driver for ARM Reference designs
+
+CONFIG_LMK04832=m
+CONFIG_COMMON_CLK_APPLE_NCO=m
+# CONFIG_COMMON_CLK_MAX77686 is not set
+CONFIG_COMMON_CLK_MAX9485=m
+CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_HI655X=m
+CONFIG_COMMON_CLK_SCMI=m
+CONFIG_COMMON_CLK_SI5341=m
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMMON_CLK_SI514 is not set
+# CONFIG_COMMON_CLK_SI544 is not set
+# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_BM1880=y
+# CONFIG_COMMON_CLK_CDCE706 is not set
+# CONFIG_COMMON_CLK_CDCE925 is not set
+# CONFIG_COMMON_CLK_CS2000_CP is not set
+CONFIG_COMMON_CLK_AXI_CLKGEN=m
+CONFIG_COMMON_CLK_XGENE=y
+# CONFIG_COMMON_CLK_PWM is not set
+CONFIG_COMMON_CLK_RS9_PCIE=m
+CONFIG_COMMON_CLK_SI521XX=m
+# CONFIG_COMMON_CLK_VC5 is not set
+CONFIG_COMMON_CLK_VC7=m
+# CONFIG_COMMON_CLK_BD718XX is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
+CONFIG_CLK_BCM2711_DVP=y
+# CONFIG_CLK_BCM2835 is not set
+CONFIG_CLK_BCM_63XX=y
+CONFIG_COMMON_CLK_IPROC=y
+CONFIG_CLK_RASPBERRYPI=m
+CONFIG_COMMON_CLK_HI3516CV300=y
+CONFIG_COMMON_CLK_HI3519=y
+CONFIG_COMMON_CLK_HI3559A=y
+CONFIG_COMMON_CLK_HI3660=y
+CONFIG_COMMON_CLK_HI3670=y
+CONFIG_COMMON_CLK_HI3798CV200=y
+CONFIG_COMMON_CLK_HI6220=y
+CONFIG_RESET_HISI=y
+CONFIG_STUB_CLK_HI6220=y
+# CONFIG_STUB_CLK_HI3660 is not set
+CONFIG_MXC_CLK=y
+CONFIG_MXC_CLK_SCU=y
+CONFIG_CLK_IMX8MM=y
+CONFIG_CLK_IMX8MN=y
+CONFIG_CLK_IMX8MP=y
+CONFIG_CLK_IMX8MQ=y
+CONFIG_CLK_IMX8QXP=y
+CONFIG_CLK_IMX8ULP=y
+CONFIG_CLK_IMX93=y
+
+#
+# Clock support for Amlogic platforms
+#
+CONFIG_COMMON_CLK_MESON_REGMAP=y
+CONFIG_COMMON_CLK_MESON_DUALDIV=y
+CONFIG_COMMON_CLK_MESON_MPLL=y
+CONFIG_COMMON_CLK_MESON_PHASE=m
+CONFIG_COMMON_CLK_MESON_PLL=y
+CONFIG_COMMON_CLK_MESON_SCLK_DIV=m
+CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y
+CONFIG_COMMON_CLK_MESON_AO_CLKC=y
+CONFIG_COMMON_CLK_MESON_EE_CLKC=y
+CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=y
+CONFIG_COMMON_CLK_GXBB=y
+CONFIG_COMMON_CLK_AXG=y
+CONFIG_COMMON_CLK_AXG_AUDIO=m
+CONFIG_COMMON_CLK_G12A=y
+# end of Clock support for Amlogic platforms
+
+CONFIG_ARMADA_AP_CP_HELPER=y
+CONFIG_ARMADA_37XX_CLK=y
+CONFIG_ARMADA_AP806_SYSCON=y
+CONFIG_ARMADA_CP110_SYSCON=y
+CONFIG_QCOM_GDSC=y
+CONFIG_QCOM_RPMCC=y
+CONFIG_COMMON_CLK_QCOM=y
+CONFIG_QCOM_A53PLL=y
+CONFIG_QCOM_A7PLL=m
+CONFIG_QCOM_CLK_APCS_MSM8916=m
+CONFIG_QCOM_CLK_APCC_MSM8996=m
+CONFIG_QCOM_CLK_APCS_SDX55=m
+CONFIG_QCOM_CLK_RPM=m
+CONFIG_QCOM_CLK_SMD_RPM=m
+# CONFIG_APQ_GCC_8084 is not set
+# CONFIG_APQ_MMCC_8084 is not set
+# CONFIG_IPQ_APSS_PLL is not set
+# CONFIG_IPQ_APSS_6018 is not set
+# CONFIG_IPQ_GCC_4019 is not set
+CONFIG_IPQ_GCC_5332=m
+# CONFIG_IPQ_GCC_6018 is not set
+# CONFIG_IPQ_GCC_806X is not set
+# CONFIG_IPQ_LCC_806X is not set
+# CONFIG_IPQ_GCC_8074 is not set
+CONFIG_IPQ_GCC_9574=m
+# CONFIG_MSM_GCC_8660 is not set
+CONFIG_MSM_GCC_8909=m
+CONFIG_MSM_GCC_8916=y
+CONFIG_MSM_GCC_8917=m
+# CONFIG_MSM_GCC_8939 is not set
+# CONFIG_MSM_GCC_8960 is not set
+# CONFIG_MSM_LCC_8960 is not set
+CONFIG_MDM_GCC_9607=m
+# CONFIG_MDM_GCC_9615 is not set
+# CONFIG_MDM_LCC_9615 is not set
+# CONFIG_MSM_MMCC_8960 is not set
+# CONFIG_MSM_GCC_8953 is not set
+# CONFIG_MSM_GCC_8974 is not set
+# CONFIG_MSM_MMCC_8974 is not set
+# CONFIG_MSM_GCC_8976 is not set
+# CONFIG_MSM_MMCC_8994 is not set
+# CONFIG_MSM_GCC_8994 is not set
+CONFIG_MSM_GCC_8996=y
+CONFIG_MSM_MMCC_8996=y
+# CONFIG_MSM_GCC_8998 is not set
+# CONFIG_MSM_GPUCC_8998 is not set
+# CONFIG_MSM_MMCC_8998 is not set
+# CONFIG_QCM_GCC_2290 is not set
+# CONFIG_QCM_DISPCC_2290 is not set
+# CONFIG_QCS_GCC_404 is not set
+# CONFIG_SC_CAMCC_7180 is not set
+# CONFIG_SC_CAMCC_7280 is not set
+# CONFIG_SC_DISPCC_7180 is not set
+# CONFIG_SC_DISPCC_7280 is not set
+# CONFIG_SC_DISPCC_8280XP is not set
+CONFIG_SA_GCC_8775P=m
+CONFIG_SA_GPUCC_8775P=m
+CONFIG_SC_GCC_7180=m
+CONFIG_SC_GCC_7280=m
+CONFIG_SC_GCC_8180X=m
+CONFIG_SC_GCC_8280XP=m
+# CONFIG_SC_GPUCC_7180 is not set
+# CONFIG_SC_GPUCC_7280 is not set
+CONFIG_SC_GPUCC_8280XP=m
+# CONFIG_SC_LPASSCC_7280 is not set
+CONFIG_SC_LPASS_CORECC_7180=m
+CONFIG_SC_LPASS_CORECC_7280=m
+# CONFIG_SC_MSS_7180 is not set
+# CONFIG_SC_VIDEOCC_7180 is not set
+# CONFIG_SC_VIDEOCC_7280 is not set
+# CONFIG_SDM_CAMCC_845 is not set
+CONFIG_SDM_GCC_660=m
+CONFIG_SDM_MMCC_660=m
+CONFIG_SDM_GPUCC_660=m
+# CONFIG_QCS_TURING_404 is not set
+# CONFIG_QCS_Q6SSTOP_404 is not set
+# CONFIG_QDU_GCC_1000 is not set
+CONFIG_SDM_GCC_845=m
+CONFIG_SDM_GPUCC_845=m
+CONFIG_SDM_VIDEOCC_845=m
+CONFIG_SDM_DISPCC_845=m
+CONFIG_SDM_LPASSCC_845=m
+CONFIG_SDX_GCC_55=m
+CONFIG_SDX_GCC_65=m
+CONFIG_SM_CAMCC_6350=m
+CONFIG_SM_CAMCC_8250=m
+CONFIG_SM_CAMCC_8450=m
+CONFIG_SM_DISPCC_6115=m
+CONFIG_SM_DISPCC_6125=m
+CONFIG_SM_DISPCC_8250=m
+CONFIG_SM_DISPCC_6350=m
+CONFIG_SM_DISPCC_6375=m
+CONFIG_SM_DISPCC_8450=m
+CONFIG_SM_DISPCC_8550=m
+CONFIG_SM_GCC_6115=m
+CONFIG_SM_GCC_6125=m
+CONFIG_SM_GCC_6350=m
+CONFIG_SM_GCC_6375=m
+CONFIG_SM_GCC_7150=m
+# CONFIG_SM_GCC_8150 is not set
+CONFIG_SM_GCC_8250=m
+CONFIG_SM_GCC_8350=m
+CONFIG_SM_GCC_8450=m
+CONFIG_SM_GCC_8550=m
+CONFIG_SM_GPUCC_6115=m
+CONFIG_SM_GPUCC_6125=m
+CONFIG_SM_GPUCC_6375=m
+CONFIG_SM_GPUCC_6350=m
+# CONFIG_SM_GPUCC_8150 is not set
+# CONFIG_SM_GPUCC_8250 is not set
+CONFIG_SM_GPUCC_8350=m
+CONFIG_SM_TCSRCC_8550=m
+# CONFIG_SM_VIDEOCC_8150 is not set
+# CONFIG_SM_VIDEOCC_8250 is not set
+# CONFIG_SPMI_PMIC_CLKDIV is not set
+# CONFIG_QCOM_HFPLL is not set
+# CONFIG_KPSS_XCC is not set
+# CONFIG_CLK_GFM_LPASS_SM8250 is not set
+CONFIG_COMMON_CLK_ROCKCHIP=y
+CONFIG_CLK_PX30=y
+CONFIG_CLK_RK3308=y
+CONFIG_CLK_RK3328=y
+CONFIG_CLK_RK3368=y
+CONFIG_CLK_RK3399=y
+CONFIG_CLK_RK3568=y
+CONFIG_CLK_RK3588=y
+CONFIG_CLK_INTEL_SOCFPGA=y
+CONFIG_CLK_INTEL_SOCFPGA64=y
+CONFIG_SUNXI_CCU=y
+CONFIG_SUN50I_A64_CCU=y
+CONFIG_SUN50I_A100_CCU=y
+CONFIG_SUN50I_A100_R_CCU=y
+CONFIG_SUN50I_H6_CCU=y
+CONFIG_SUN50I_H616_CCU=y
+CONFIG_SUN50I_H6_R_CCU=y
+CONFIG_SUN6I_RTC_CCU=y
+CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_DE2_CCU=y
+CONFIG_SUN8I_R_CCU=y
+CONFIG_CLK_TEGRA_BPMP=y
+CONFIG_TEGRA_CLK_DFLL=y
+CONFIG_COMMON_CLK_VISCONTI=y
+# CONFIG_XILINX_VCU is not set
+CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
+# CONFIG_HWSPINLOCK is not set
+
+#
+# Clock Source drivers
+#
+CONFIG_TIMER_OF=y
+CONFIG_TIMER_ACPI=y
+CONFIG_TIMER_PROBE=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_ROCKCHIP_TIMER=y
+CONFIG_SUN4I_TIMER=y
+CONFIG_TEGRA_TIMER=y
+CONFIG_TEGRA186_TIMER=y
+CONFIG_NPCM7XX_TIMER=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
+CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_HISILICON_ERRATUM_161010101=y
+CONFIG_ARM64_ERRATUM_858921=y
+CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
+CONFIG_ARM_TIMER_SP804=y
+CONFIG_TIMER_IMX_SYS_CTR=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+CONFIG_APPLE_MAILBOX=m
+# CONFIG_ARM_MHU is not set
+# CONFIG_ARM_MHU_V2 is not set
+CONFIG_IMX_MBOX=m
+# CONFIG_PLATFORM_MHU is not set
+# CONFIG_PL320_MBOX is not set
+CONFIG_ARMADA_37XX_RWTM_MBOX=m
+# CONFIG_ROCKCHIP_MBOX is not set
+CONFIG_PCC=y
+# CONFIG_ALTERA_MBOX is not set
+CONFIG_BCM2835_MBOX=y
+# CONFIG_HI3660_MBOX is not set
+CONFIG_HI6220_MBOX=y
+# CONFIG_MAILBOX_TEST is not set
+CONFIG_QCOM_APCS_IPC=m
+CONFIG_TEGRA_HSP_MBOX=y
+CONFIG_XGENE_SLIMPRO_MBOX=m
+CONFIG_SUN6I_MSGBOX=m
+CONFIG_QCOM_IPCC=y
+CONFIG_IOMMU_IOVA=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+CONFIG_IOMMU_IO_PGTABLE=y
+CONFIG_IOMMU_IO_PGTABLE_LPAE=y
+# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
+# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
+CONFIG_IOMMU_IO_PGTABLE_DART=y
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_OF_IOMMU=y
+CONFIG_IOMMU_DMA=y
+CONFIG_IOMMU_SVA=y
+# CONFIG_IOMMUFD is not set
+CONFIG_ROCKCHIP_IOMMU=y
+CONFIG_SUN50I_IOMMU=y
+CONFIG_TEGRA_IOMMU_SMMU=y
+CONFIG_APPLE_DART=y
+CONFIG_ARM_SMMU=y
+# CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
+CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
+CONFIG_ARM_SMMU_QCOM=y
+# CONFIG_ARM_SMMU_QCOM_DEBUG is not set
+CONFIG_ARM_SMMU_V3=y
+CONFIG_ARM_SMMU_V3_SVA=y
+CONFIG_QCOM_IOMMU=y
+CONFIG_VIRTIO_IOMMU=m
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=y
+CONFIG_REMOTEPROC_CDEV=y
+CONFIG_IMX_REMOTEPROC=m
+CONFIG_IMX_DSP_REMOTEPROC=m
+CONFIG_QCOM_SYSMON=m
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+CONFIG_RPMSG=m
+# CONFIG_RPMSG_CHAR is not set
+# CONFIG_RPMSG_CTRL is not set
+CONFIG_RPMSG_NS=m
+CONFIG_RPMSG_QCOM_GLINK=m
+CONFIG_RPMSG_QCOM_GLINK_RPM=m
+# CONFIG_RPMSG_VIRTIO is not set
+# end of Rpmsg drivers
+
+# CONFIG_SOUNDWIRE is not set
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+CONFIG_MESON_CANVAS=m
+CONFIG_MESON_CLK_MEASURE=y
+CONFIG_MESON_GX_SOCINFO=y
+CONFIG_MESON_GX_PM_DOMAINS=y
+CONFIG_MESON_EE_PM_DOMAINS=y
+CONFIG_MESON_SECURE_PM_DOMAINS=y
+# end of Amlogic SoC drivers
+
+#
+# Apple SoC drivers
+#
+CONFIG_APPLE_PMGR_PWRSTATE=y
+CONFIG_APPLE_RTKIT=y
+CONFIG_APPLE_SART=y
+# end of Apple SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+CONFIG_BCM2835_POWER=y
+CONFIG_RASPBERRYPI_POWER=y
+CONFIG_SOC_BRCMSTB=y
+CONFIG_BCM_PMB=y
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# CONFIG_QUICC_ENGINE is not set
+CONFIG_FSL_GUTS=y
+CONFIG_FSL_RCPM=y
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# fujitsu SoC drivers
+#
+# CONFIG_A64FX_DIAG is not set
+# end of fujitsu SoC drivers
+
+#
+# i.MX SoC drivers
+#
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
+CONFIG_SOC_IMX8M=y
+CONFIG_SOC_IMX9=y
+CONFIG_IMX8M_BLK_CTRL=y
+CONFIG_IMX9_BLK_CTRL=y
+# end of i.MX SoC drivers
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# CONFIG_LITEX_SOC_CONTROLLER is not set
+# end of Enable LiteX SoC Builder specific drivers
+
+CONFIG_WPCM450_SOC=m
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_AOSS_QMP=m
+CONFIG_QCOM_COMMAND_DB=y
+CONFIG_QCOM_CPR=m
+CONFIG_QCOM_GENI_SE=m
+CONFIG_QCOM_GSBI=m
+CONFIG_QCOM_LLCC=m
+CONFIG_QCOM_KRYO_L2_ACCESSORS=y
+CONFIG_QCOM_MDT_LOADER=m
+# CONFIG_QCOM_OCMEM is not set
+CONFIG_QCOM_PDR_HELPERS=m
+CONFIG_QCOM_PMIC_GLINK=m
+CONFIG_QCOM_QMI_HELPERS=m
+CONFIG_QCOM_RAMP_CTRL=m
+# CONFIG_QCOM_RMTFS_MEM is not set
+# CONFIG_QCOM_RPMH is not set
+CONFIG_QCOM_RPMPD=m
+CONFIG_QCOM_SMD_RPM=m
+CONFIG_QCOM_SPM=m
+CONFIG_QCOM_WCNSS_CTRL=m
+CONFIG_QCOM_APR=m
+CONFIG_QCOM_ICC_BWMON=m
+# end of Qualcomm SoC drivers
+
+CONFIG_ROCKCHIP_GRF=y
+CONFIG_ROCKCHIP_IODOMAIN=m
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_SUNXI_MBUS=y
+CONFIG_SUNXI_SRAM=y
+CONFIG_SUN20I_PPU=y
+CONFIG_ARCH_TEGRA_132_SOC=y
+CONFIG_ARCH_TEGRA_210_SOC=y
+# CONFIG_ARCH_TEGRA_186_SOC is not set
+CONFIG_ARCH_TEGRA_194_SOC=y
+CONFIG_ARCH_TEGRA_234_SOC=y
+CONFIG_SOC_TEGRA_FUSE=y
+CONFIG_SOC_TEGRA_FLOWCTRL=y
+CONFIG_SOC_TEGRA_PMC=y
+CONFIG_SOC_TEGRA_POWERGATE_BPMP=y
+CONFIG_SOC_TEGRA_CBB=y
+# CONFIG_SOC_TI is not set
+
+#
+# Xilinx SoC drivers
+#
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_ARM_IMX_BUS_DEVFREQ=m
+CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
+CONFIG_ARM_TEGRA_DEVFREQ=m
+# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
+CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ=m
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+# CONFIG_EXTCON_ADC_JACK is not set
+CONFIG_EXTCON_FSA9480=m
+# CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_MAX3355 is not set
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_QCOM_SPMI_MISC=m
+# CONFIG_EXTCON_RT8973A is not set
+# CONFIG_EXTCON_SM5502 is not set
+CONFIG_EXTCON_USB_GPIO=m
+# CONFIG_EXTCON_USBC_CROS_EC is not set
+CONFIG_EXTCON_USBC_TUSB320=m
+CONFIG_MEMORY=y
+# CONFIG_ARM_PL172_MPMC is not set
+CONFIG_TEGRA_MC=y
+CONFIG_TEGRA210_EMC_TABLE=y
+CONFIG_TEGRA210_EMC=m
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+# CONFIG_IIO_BUFFER_CB is not set
+CONFIG_IIO_BUFFER_DMA=m
+CONFIG_IIO_BUFFER_DMAENGINE=m
+# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+# CONFIG_IIO_CONFIGFS is not set
+CONFIG_IIO_GTS_HELPER=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_SW_DEVICE is not set
+# CONFIG_IIO_SW_TRIGGER is not set
+CONFIG_IIO_TRIGGERED_EVENT=m
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADXL313_I2C is not set
+# CONFIG_ADXL313_SPI is not set
+# CONFIG_ADXL345_I2C is not set
+# CONFIG_ADXL345_SPI is not set
+# CONFIG_ADXL355_I2C is not set
+# CONFIG_ADXL355_SPI is not set
+# CONFIG_ADXL367_SPI is not set
+# CONFIG_ADXL367_I2C is not set
+# CONFIG_ADXL372_SPI is not set
+# CONFIG_ADXL372_I2C is not set
+# CONFIG_BMA180 is not set
+# CONFIG_BMA220 is not set
+CONFIG_BMA400=m
+CONFIG_BMA400_I2C=m
+CONFIG_BMA400_SPI=m
+# CONFIG_BMC150_ACCEL is not set
+# CONFIG_BMI088_ACCEL is not set
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
+# CONFIG_DMARD06 is not set
+# CONFIG_DMARD09 is not set
+# CONFIG_DMARD10 is not set
+CONFIG_FXLS8962AF=m
+CONFIG_FXLS8962AF_I2C=m
+CONFIG_FXLS8962AF_SPI=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+CONFIG_IIO_KX022A=m
+CONFIG_IIO_KX022A_SPI=m
+CONFIG_IIO_KX022A_I2C=m
+# CONFIG_KXSD9 is not set
+# CONFIG_KXCJK1013 is not set
+# CONFIG_MC3230 is not set
+# CONFIG_MMA7455_I2C is not set
+# CONFIG_MMA7455_SPI is not set
+# CONFIG_MMA7660 is not set
+# CONFIG_MMA8452 is not set
+# CONFIG_MMA9551 is not set
+# CONFIG_MMA9553 is not set
+CONFIG_MSA311=m
+# CONFIG_MXC4005 is not set
+# CONFIG_MXC6255 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_SCA3300 is not set
+# CONFIG_STK8312 is not set
+# CONFIG_STK8BA50 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD4130=m
+CONFIG_AD7091R5=m
+CONFIG_AD7124=m
+# CONFIG_AD7192 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7280 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7292 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7606_IFACE_PARALLEL is not set
+# CONFIG_AD7606_IFACE_SPI is not set
+# CONFIG_AD7766 is not set
+# CONFIG_AD7768_1 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD7949 is not set
+# CONFIG_AD799X is not set
+# CONFIG_ADI_AXI_ADC is not set
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
+# CONFIG_CC10001_ADC is not set
+# CONFIG_ENVELOPE_DETECTOR is not set
+# CONFIG_HI8435 is not set
+# CONFIG_HX711 is not set
+# CONFIG_INA2XX_ADC is not set
+CONFIG_IMX7D_ADC=m
+CONFIG_IMX8QXP_ADC=m
+CONFIG_IMX93_ADC=m
+# CONFIG_LTC2471 is not set
+# CONFIG_LTC2485 is not set
+# CONFIG_LTC2496 is not set
+# CONFIG_LTC2497 is not set
+# CONFIG_MAX1027 is not set
+# CONFIG_MAX11100 is not set
+# CONFIG_MAX1118 is not set
+CONFIG_MAX11205=m
+CONFIG_MAX11410=m
+# CONFIG_MAX1241 is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX9611 is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+# CONFIG_MCP3911 is not set
+# CONFIG_MEDIATEK_MT6360_ADC is not set
+# CONFIG_MEDIATEK_MT6370_ADC is not set
+CONFIG_MESON_SARADC=m
+# CONFIG_MP2629_ADC is not set
+# CONFIG_NAU7802 is not set
+# CONFIG_NPCM_ADC is not set
+CONFIG_QCOM_VADC_COMMON=m
+# CONFIG_QCOM_SPMI_RRADC is not set
+CONFIG_QCOM_SPMI_IADC=m
+CONFIG_QCOM_SPMI_VADC=m
+# CONFIG_QCOM_SPMI_ADC5 is not set
+# CONFIG_ROCKCHIP_SARADC is not set
+CONFIG_RICHTEK_RTQ6056=m
+# CONFIG_SD_ADC_MODULATOR is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADC0832 is not set
+# CONFIG_TI_ADC084S021 is not set
+# CONFIG_TI_ADC12138 is not set
+# CONFIG_TI_ADC108S102 is not set
+# CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADC161S626 is not set
+# CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS7924 is not set
+# CONFIG_TI_ADS1100 is not set
+# CONFIG_TI_ADS7950 is not set
+# CONFIG_TI_ADS8344 is not set
+# CONFIG_TI_ADS8688 is not set
+# CONFIG_TI_ADS124S08 is not set
+# CONFIG_TI_ADS131E08 is not set
+# CONFIG_TI_LMP92064 is not set
+# CONFIG_TI_TLC4541 is not set
+# CONFIG_TI_TSC2046 is not set
+# CONFIG_VF610_ADC is not set
+CONFIG_VIPERBOARD_ADC=m
+CONFIG_XILINX_XADC=m
+# end of Analog to digital converters
+
+#
+# Analog to digital and digital to analog converters
+#
+CONFIG_AD74115=m
+CONFIG_AD74413R=m
+# end of Analog to digital and digital to analog converters
+
+#
+# Analog Front Ends
+#
+# CONFIG_IIO_RESCALE is not set
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+# CONFIG_AD8366 is not set
+# CONFIG_ADA4250 is not set
+# CONFIG_HMC425 is not set
+# end of Amplifiers
+
+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7150 is not set
+# CONFIG_AD7746 is not set
+# end of Capacitance to digital converters
+
+#
+# Chemical Sensors
+#
+# CONFIG_ATLAS_PH_SENSOR is not set
+# CONFIG_ATLAS_EZO_SENSOR is not set
+# CONFIG_BME680 is not set
+# CONFIG_CCS811 is not set
+# CONFIG_IAQCORE is not set
+# CONFIG_PMS7003 is not set
+CONFIG_SCD30_CORE=m
+CONFIG_SCD30_I2C=m
+CONFIG_SCD30_SERIAL=m
+CONFIG_SCD4X=m
+# CONFIG_SENSIRION_SGP30 is not set
+# CONFIG_SENSIRION_SGP40 is not set
+# CONFIG_SPS30_I2C is not set
+# CONFIG_SPS30_SERIAL is not set
+CONFIG_SENSEAIR_SUNRISE_CO2=m
+# CONFIG_VZ89X is not set
+# end of Chemical Sensors
+
+# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+#
+# IIO SCMI Sensors
+#
+CONFIG_IIO_SCMI=m
+# end of IIO SCMI Sensors
+
+#
+# SSP Sensor Common
+#
+# CONFIG_IIO_SSP_SENSORHUB is not set
+# end of SSP Sensor Common
+
+#
+# Digital to analog converters
+#
+CONFIG_AD3552R=m
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+CONFIG_AD5446=m
+# CONFIG_AD5449 is not set
+# CONFIG_AD5592R is not set
+# CONFIG_AD5593R is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_LTC2688 is not set
+# CONFIG_AD5686_SPI is not set
+# CONFIG_AD5696_I2C is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5758 is not set
+# CONFIG_AD5761 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5766 is not set
+# CONFIG_AD5770R is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD7293 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD8801 is not set
+# CONFIG_DPOT_DAC is not set
+# CONFIG_DS4424 is not set
+# CONFIG_LTC1660 is not set
+# CONFIG_LTC2632 is not set
+# CONFIG_M62332 is not set
+# CONFIG_MAX517 is not set
+CONFIG_MAX5522=m
+# CONFIG_MAX5821 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4922 is not set
+# CONFIG_TI_DAC082S085 is not set
+# CONFIG_TI_DAC5571 is not set
+# CONFIG_TI_DAC7311 is not set
+# CONFIG_TI_DAC7612 is not set
+# CONFIG_VF610_DAC is not set
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+# end of IIO dummy driver
+
+#
+# Filters
+#
+CONFIG_ADMV8818=m
+# end of Filters
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+# CONFIG_AD9523 is not set
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+# CONFIG_ADF4350 is not set
+CONFIG_ADF4371=m
+CONFIG_ADF4377=m
+CONFIG_ADMV1013=m
+CONFIG_ADMV1014=m
+CONFIG_ADMV4420=m
+# CONFIG_ADRF6780 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
+CONFIG_ADXRS290=m
+# CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
+# CONFIG_FXAS21002C is not set
+CONFIG_HID_SENSOR_GYRO_3D=m
+# CONFIG_MPU3050_I2C is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_ITG3200 is not set
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+# CONFIG_AFE4403 is not set
+# CONFIG_AFE4404 is not set
+# CONFIG_MAX30100 is not set
+# CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+# CONFIG_AM2315 is not set
+CONFIG_DHT11=m
+# CONFIG_HDC100X is not set
+CONFIG_HDC2010=m
+# CONFIG_HID_SENSOR_HUMIDITY is not set
+# CONFIG_HTS221 is not set
+# CONFIG_HTU21 is not set
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16460 is not set
+# CONFIG_ADIS16475 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_BMI160_I2C is not set
+# CONFIG_BMI160_SPI is not set
+# CONFIG_BOSCH_BNO055_SERIAL is not set
+# CONFIG_BOSCH_BNO055_I2C is not set
+# CONFIG_FXOS8700_I2C is not set
+# CONFIG_FXOS8700_SPI is not set
+# CONFIG_KMX61 is not set
+CONFIG_INV_ICM42600=m
+CONFIG_INV_ICM42600_I2C=m
+CONFIG_INV_ICM42600_SPI=m
+# CONFIG_INV_MPU6050_I2C is not set
+# CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_IIO_ST_LSM6DSX is not set
+# CONFIG_IIO_ST_LSM9DS0 is not set
+# end of Inertial measurement units
+
+#
+# Light sensors
+#
+CONFIG_ACPI_ALS=m
+# CONFIG_ADJD_S311 is not set
+# CONFIG_ADUX1020 is not set
+# CONFIG_AL3010 is not set
+# CONFIG_AL3320A is not set
+# CONFIG_APDS9300 is not set
+# CONFIG_APDS9960 is not set
+CONFIG_AS73211=m
+# CONFIG_BH1750 is not set
+CONFIG_BH1780=m
+# CONFIG_CM32181 is not set
+# CONFIG_CM3232 is not set
+# CONFIG_CM3323 is not set
+# CONFIG_CM3605 is not set
+# CONFIG_CM36651 is not set
+# CONFIG_GP2AP002 is not set
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_IQS621_ALS is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_ISL29125 is not set
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+# CONFIG_JSA1212 is not set
+CONFIG_ROHM_BU27034=m
+# CONFIG_RPR0521 is not set
+# CONFIG_LTR501 is not set
+CONFIG_LTRF216A=m
+# CONFIG_LV0104CS is not set
+# CONFIG_MAX44000 is not set
+# CONFIG_MAX44009 is not set
+# CONFIG_NOA1305 is not set
+# CONFIG_OPT3001 is not set
+# CONFIG_PA12203001 is not set
+# CONFIG_SI1133 is not set
+# CONFIG_SI1145 is not set
+# CONFIG_STK3310 is not set
+# CONFIG_ST_UVIS25 is not set
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
+CONFIG_TSL2591=m
+# CONFIG_TSL2772 is not set
+# CONFIG_TSL4531 is not set
+# CONFIG_US5182D is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VCNL4035 is not set
+# CONFIG_VEML6030 is not set
+# CONFIG_VEML6070 is not set
+# CONFIG_VL6180 is not set
+# CONFIG_ZOPT2201 is not set
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+# CONFIG_AK8974 is not set
+# CONFIG_AK8975 is not set
+# CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_MAG3110 is not set
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+# CONFIG_MMC35240 is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+# CONFIG_SENSORS_RM3100_I2C is not set
+# CONFIG_SENSORS_RM3100_SPI is not set
+CONFIG_TI_TMAG5273=m
+# CONFIG_YAMAHA_YAS530 is not set
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+# CONFIG_IIO_MUX is not set
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+# CONFIG_IIO_INTERRUPT_TRIGGER is not set
+# CONFIG_IIO_SYSFS_TRIGGER is not set
+# end of Triggers - standalone
+
+#
+# Linear and angular position sensors
+#
+# CONFIG_IQS624_POS is not set
+CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
+# end of Linear and angular position sensors
+
+#
+# Digital potentiometers
+#
+CONFIG_AD5110=m
+# CONFIG_AD5272 is not set
+# CONFIG_DS1803 is not set
+# CONFIG_MAX5432 is not set
+# CONFIG_MAX5481 is not set
+# CONFIG_MAX5487 is not set
+# CONFIG_MCP4018 is not set
+# CONFIG_MCP4131 is not set
+# CONFIG_MCP4531 is not set
+# CONFIG_MCP41010 is not set
+# CONFIG_TPL0102 is not set
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+# CONFIG_LMP91000 is not set
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+# CONFIG_ABP060MG is not set
+# CONFIG_BMP280 is not set
+# CONFIG_DLHL60D is not set
+CONFIG_DPS310=m
+CONFIG_HID_SENSOR_PRESS=m
+# CONFIG_HP03 is not set
+# CONFIG_ICP10100 is not set
+# CONFIG_MPL115_I2C is not set
+# CONFIG_MPL115_SPI is not set
+# CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
+# CONFIG_MS5637 is not set
+# CONFIG_IIO_ST_PRESS is not set
+# CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
+# CONFIG_ZPA2326 is not set
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+CONFIG_CROS_EC_MKBP_PROXIMITY=m
+# CONFIG_ISL29501 is not set
+# CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_MB1232 is not set
+# CONFIG_PING is not set
+# CONFIG_RFD77402 is not set
+# CONFIG_SRF04 is not set
+# CONFIG_SX9310 is not set
+# CONFIG_SX9324 is not set
+# CONFIG_SX9360 is not set
+# CONFIG_SX9500 is not set
+# CONFIG_SRF08 is not set
+# CONFIG_VCNL3020 is not set
+# CONFIG_VL53L0X_I2C is not set
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+# CONFIG_IQS620AT_TEMP is not set
+# CONFIG_LTC2983 is not set
+# CONFIG_MAXIM_THERMOCOUPLE is not set
+# CONFIG_HID_SENSOR_TEMP is not set
+# CONFIG_MLX90614 is not set
+# CONFIG_MLX90632 is not set
+# CONFIG_TMP006 is not set
+# CONFIG_TMP007 is not set
+# CONFIG_TMP117 is not set
+# CONFIG_TSYS01 is not set
+# CONFIG_TSYS02D is not set
+CONFIG_MAX30208=m
+# CONFIG_MAX31856 is not set
+# CONFIG_MAX31865 is not set
+# end of Temperature sensors
+
+# CONFIG_NTB is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_DEBUG is not set
+CONFIG_PWM_APPLE=m
+CONFIG_PWM_ATMEL_TCB=m
+CONFIG_PWM_BCM2835=m
+CONFIG_PWM_CLK=m
+# CONFIG_PWM_CROS_EC is not set
+CONFIG_PWM_DWC=m
+# CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_HIBVT is not set
+# CONFIG_PWM_IMX1 is not set
+# CONFIG_PWM_IMX27 is not set
+# CONFIG_PWM_IMX_TPM is not set
+# CONFIG_PWM_IQS620A is not set
+# CONFIG_PWM_KEEMBAY is not set
+CONFIG_PWM_MESON=m
+CONFIG_PWM_NTXEC=m
+# CONFIG_PWM_PCA9685 is not set
+CONFIG_PWM_RASPBERRYPI_POE=m
+CONFIG_PWM_ROCKCHIP=m
+CONFIG_PWM_SUN4I=m
+CONFIG_PWM_TEGRA=m
+CONFIG_PWM_VISCONTI=m
+CONFIG_PWM_XILINX=m
+
+#
+# IRQ chip support
+#
+CONFIG_IRQCHIP=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_PM=y
+CONFIG_ARM_GIC_MAX_NR=1
+CONFIG_ARM_GIC_V2M=y
+CONFIG_ARM_GIC_V3=y
+CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_ARM_GIC_V3_ITS_PCI=y
+# CONFIG_AL_FIC is not set
+CONFIG_BRCMSTB_L2_IRQ=y
+CONFIG_HISILICON_IRQ_MBIGEN=y
+CONFIG_MADERA_IRQ=m
+CONFIG_SUN6I_R_INTC=y
+CONFIG_SUNXI_NMI_INTC=y
+# CONFIG_XILINX_INTC is not set
+CONFIG_IMX_GPCV2=y
+CONFIG_MVEBU_GICP=y
+CONFIG_MVEBU_ICU=y
+CONFIG_MVEBU_ODMI=y
+CONFIG_MVEBU_PIC=y
+CONFIG_MVEBU_SEI=y
+CONFIG_PARTITION_PERCPU=y
+CONFIG_QCOM_IRQ_COMBINER=y
+CONFIG_MESON_IRQ_GPIO=y
+# CONFIG_QCOM_PDC is not set
+# CONFIG_QCOM_MPM is not set
+CONFIG_IMX_IRQSTEER=y
+CONFIG_IMX_INTMUX=y
+CONFIG_IMX_MU_MSI=m
+CONFIG_APPLE_AIC=y
+# end of IRQ chip support
+
+# CONFIG_IPACK_BUS is not set
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_IMX7=y
+CONFIG_RESET_MESON=y
+# CONFIG_RESET_MESON_AUDIO_ARB is not set
+CONFIG_RESET_NPCM=y
+# CONFIG_RESET_QCOM_AOSS is not set
+# CONFIG_RESET_QCOM_PDC is not set
+CONFIG_RESET_RASPBERRYPI=m
+CONFIG_RESET_SCMI=y
+CONFIG_RESET_SIMPLE=y
+CONFIG_RESET_SUNXI=y
+# CONFIG_RESET_TI_SYSCON is not set
+CONFIG_RESET_TI_TPS380X=m
+CONFIG_COMMON_RESET_HI3660=y
+CONFIG_COMMON_RESET_HI6220=y
+CONFIG_RESET_TEGRA_BPMP=y
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PHY_MIPI_DPHY=y
+CONFIG_PHY_XGENE=m
+CONFIG_PHY_CAN_TRANSCEIVER=m
+CONFIG_PHY_SUN4I_USB=m
+CONFIG_PHY_SUN6I_MIPI_DPHY=m
+# CONFIG_PHY_SUN9I_USB is not set
+CONFIG_PHY_SUN50I_USB3=m
+CONFIG_PHY_MESON8B_USB2=m
+CONFIG_PHY_MESON_GXL_USB2=y
+CONFIG_PHY_MESON_G12A_MIPI_DPHY_ANALOG=y
+CONFIG_PHY_MESON_G12A_USB2=y
+CONFIG_PHY_MESON_G12A_USB3_PCIE=y
+CONFIG_PHY_MESON_AXG_PCIE=y
+CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG=y
+CONFIG_PHY_MESON_AXG_MIPI_DPHY=m
+
+#
+# PHY drivers for Broadcom platforms
+#
+# CONFIG_BCM_KONA_USB2_PHY is not set
+CONFIG_PHY_BRCM_SATA=m
+CONFIG_PHY_BRCM_USB=m
+# end of PHY drivers for Broadcom platforms
+
+CONFIG_PHY_CADENCE_TORRENT=m
+# CONFIG_PHY_CADENCE_DPHY is not set
+# CONFIG_PHY_CADENCE_DPHY_RX is not set
+# CONFIG_PHY_CADENCE_SIERRA is not set
+CONFIG_PHY_CADENCE_SALVO=m
+CONFIG_PHY_FSL_IMX8MQ_USB=m
+CONFIG_PHY_MIXEL_LVDS_PHY=m
+CONFIG_PHY_MIXEL_MIPI_DPHY=m
+CONFIG_PHY_FSL_IMX8M_PCIE=m
+CONFIG_PHY_HI6220_USB=m
+CONFIG_PHY_HI3660_USB=m
+CONFIG_PHY_HI3670_USB=m
+CONFIG_PHY_HI3670_PCIE=m
+# CONFIG_PHY_HISTB_COMBPHY is not set
+# CONFIG_PHY_HISI_INNO_USB2 is not set
+CONFIG_PHY_MVEBU_A3700_COMPHY=m
+CONFIG_PHY_MVEBU_A3700_UTMI=m
+CONFIG_PHY_MVEBU_A38X_COMPHY=m
+CONFIG_PHY_MVEBU_CP110_COMPHY=m
+CONFIG_PHY_MVEBU_CP110_UTMI=m
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
+CONFIG_PHY_LAN966X_SERDES=m
+# CONFIG_PHY_CPCAP_USB is not set
+# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_OCELOT_SERDES is not set
+CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_QCOM_EDP=m
+CONFIG_PHY_QCOM_IPQ4019_USB=m
+CONFIG_PHY_QCOM_IPQ806X_SATA=m
+CONFIG_PHY_QCOM_PCIE2=m
+CONFIG_PHY_QCOM_QMP=m
+CONFIG_PHY_QCOM_QMP_COMBO=m
+CONFIG_PHY_QCOM_QMP_PCIE=m
+CONFIG_PHY_QCOM_QMP_PCIE_8996=m
+CONFIG_PHY_QCOM_QMP_UFS=m
+CONFIG_PHY_QCOM_QMP_USB=m
+CONFIG_PHY_QCOM_QUSB2=m
+CONFIG_PHY_QCOM_SNPS_EUSB2=m
+CONFIG_PHY_QCOM_EUSB2_REPEATER=m
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_QCOM_USB_HS_28NM=m
+CONFIG_PHY_QCOM_USB_SS=m
+# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+CONFIG_PHY_ROCKCHIP_DP=m
+CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
+CONFIG_PHY_ROCKCHIP_EMMC=m
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
+CONFIG_PHY_ROCKCHIP_INNO_USB2=m
+CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=m
+# CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set
+CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m
+CONFIG_PHY_ROCKCHIP_PCIE=m
+CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
+CONFIG_PHY_ROCKCHIP_TYPEC=m
+CONFIG_PHY_ROCKCHIP_USB=m
+# CONFIG_PHY_SAMSUNG_USB2 is not set
+CONFIG_PHY_TEGRA_XUSB=m
+CONFIG_PHY_TEGRA194_P2U=m
+CONFIG_PHY_TUSB1210=m
+# CONFIG_PHY_INTEL_KEEMBAY_EMMC is not set
+# CONFIG_PHY_INTEL_KEEMBAY_USB is not set
+# end of PHY Subsystem
+
+# CONFIG_POWERCAP is not set
+# CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
+# CONFIG_ARM_CCI_PMU is not set
+# CONFIG_ARM_CCN is not set
+# CONFIG_ARM_CMN is not set
+CONFIG_ARM_PMU=y
+CONFIG_ARM_PMU_ACPI=y
+CONFIG_ARM_SMMU_V3_PMU=m
+CONFIG_ARM_PMUV3=y
+# CONFIG_ARM_DSU_PMU is not set
+CONFIG_FSL_IMX8_DDR_PMU=m
+# CONFIG_QCOM_L2_PMU is not set
+# CONFIG_QCOM_L3_PMU is not set
+CONFIG_THUNDERX2_PMU=m
+# CONFIG_XGENE_PMU is not set
+# CONFIG_ARM_SPE_PMU is not set
+CONFIG_ARM_DMC620_PMU=m
+CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_APPLE_M1_CPU_PMU=y
+CONFIG_ALIBABA_UNCORE_DRW_PMU=m
+# CONFIG_HISI_PMU is not set
+CONFIG_HISI_PCIE_PMU=m
+CONFIG_HNS3_PMU=m
+CONFIG_MARVELL_CN10K_DDR_PMU=m
+CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
+CONFIG_MESON_DDR_PMU=m
+# end of Performance monitor support
+
+CONFIG_RAS=y
+CONFIG_USB4=m
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# Android
+#
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
+# end of Android
+
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=y
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=y
+CONFIG_BTT=y
+CONFIG_OF_PMEM=y
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_HMEM=m
+CONFIG_DEV_DAX_CXL=m
+CONFIG_DEV_DAX_HMEM_DEVICES=y
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+
+#
+# Layout Types
+#
+CONFIG_NVMEM_LAYOUT_SL28_VPD=m
+# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
+# end of Layout Types
+
+CONFIG_NVMEM_APPLE_EFUSES=y
+CONFIG_NVMEM_IMX_IIM=m
+CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_IMX_OCOTP_SCU=m
+CONFIG_NVMEM_MESON_EFUSE=m
+CONFIG_NVMEM_MESON_MX_EFUSE=m
+CONFIG_NVMEM_QCOM_QFPROM=m
+CONFIG_NVMEM_RMEM=m
+CONFIG_NVMEM_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_ROCKCHIP_OTP=m
+CONFIG_NVMEM_SNVS_LPGPR=m
+CONFIG_NVMEM_SPMI_SDAM=m
+CONFIG_NVMEM_SUNXI_SID=m
+CONFIG_NVMEM_U_BOOT_ENV=m
+
+#
+# HW tracing support
+#
+# CONFIG_STM is not set
+# CONFIG_INTEL_TH is not set
+# CONFIG_HISI_PTT is not set
+# end of HW tracing support
+
+# CONFIG_FPGA is not set
+# CONFIG_FSI is not set
+CONFIG_TEE=m
+CONFIG_OPTEE=m
+# CONFIG_OPTEE_INSECURE_LOAD_IMAGE is not set
+CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
+CONFIG_MUX_ADG792A=m
+CONFIG_MUX_ADGS1408=m
+CONFIG_MUX_GPIO=m
+CONFIG_MUX_MMIO=m
+# end of Multiplexer drivers
+
+CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+CONFIG_INTERCONNECT=y
+CONFIG_INTERCONNECT_IMX=m
+CONFIG_INTERCONNECT_IMX8MM=m
+CONFIG_INTERCONNECT_IMX8MN=m
+CONFIG_INTERCONNECT_IMX8MQ=m
+CONFIG_INTERCONNECT_IMX8MP=m
+CONFIG_INTERCONNECT_QCOM=y
+CONFIG_INTERCONNECT_QCOM_MSM8916=m
+CONFIG_INTERCONNECT_QCOM_MSM8939=m
+# CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
+CONFIG_INTERCONNECT_QCOM_MSM8996=m
+CONFIG_INTERCONNECT_QCOM_OSM_L3=m
+CONFIG_INTERCONNECT_QCOM_QCM2290=m
+# CONFIG_INTERCONNECT_QCOM_QCS404 is not set
+CONFIG_INTERCONNECT_QCOM_SDM660=m
+CONFIG_INTERCONNECT_QCOM_SMD_RPM=m
+# CONFIG_COUNTER is not set
+# CONFIG_MOST is not set
+# CONFIG_PECI is not set
+CONFIG_HTE=y
+CONFIG_HTE_TEGRA194=m
+# CONFIG_HTE_TEGRA194_TEST is not set
+CONFIG_CDX_BUS=y
+CONFIG_CDX_CONTROLLER=m
+# CONFIG_MCDI_LOGGING is not set
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+CONFIG_LEGACY_DIRECT_IO=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+# CONFIG_XFS_SUPPORT_ASCII_CI is not set
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
+# CONFIG_F2FS_FS_COMPRESSION is not set
+# CONFIG_F2FS_IOSTAT is not set
+CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_EXPORTFS_BLOCK_OPS=y
+CONFIG_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_XINO_AUTO is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_NETFS_SUPPORT=m
+CONFIG_NETFS_STATS=y
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_DEBUG is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_ERROR_INJECTION is not set
+# CONFIG_CACHEFILES_ONDEMAND is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/EXFAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
+CONFIG_FAT_DEFAULT_UTF8=y
+CONFIG_EXFAT_FS=m
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+CONFIG_NTFS3_FS=m
+# CONFIG_NTFS3_64BIT_CLUSTER is not set
+CONFIG_NTFS3_LZX_XPRESS=y
+# CONFIG_NTFS3_FS_POSIX_ACL is not set
+# end of DOS/FAT/EXFAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+# CONFIG_TMPFS_INODE64 is not set
+CONFIG_ARCH_SUPPORTS_HUGETLBFS=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_EFIVAR_FS=m
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ORANGEFS_FS is not set
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
+# CONFIG_UBIFS_ATIME_SUPPORT is not set
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_SECURITY=y
+CONFIG_UBIFS_FS_AUTHENTICATION=y
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=m
+# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+CONFIG_ROMFS_BACKED_BY_BOTH=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_ROMFS_ON_MTD=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
+CONFIG_PSTORE_DEFLATE_COMPRESS=m
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
+# CONFIG_PSTORE_842_COMPRESS is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS is not set
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+# CONFIG_PSTORE_BLK is not set
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EROFS_FS=m
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+# CONFIG_EROFS_FS_ZIP is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFSD=m
+# CONFIG_NFSD_V2 is not set
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+# CONFIG_NFSD_SCSILAYOUT is not set
+# CONFIG_NFSD_FLEXFILELAYOUT is not set
+# CONFIG_NFSD_V4_2_INTER_SSC is not set
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y
+# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CEPH_FS_SECURITY_LABEL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS=m
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+CONFIG_DLM_DEBUG=y
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+CONFIG_IO_WQ=y
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_REQUEST_CACHE=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+CONFIG_TRUSTED_KEYS=m
+CONFIG_TRUSTED_KEYS_TEE=y
+CONFIG_TRUSTED_KEYS_CAAM=y
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_KEY_DH_OPERATIONS is not set
+CONFIG_KEY_NOTIFICATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_INFINIBAND is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_SECURITY_PATH=y
+CONFIG_LSM_MMAP_MIN_ADDR=32768
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_FORTIFY_SOURCE is not set
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
+CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
+# CONFIG_SECURITY_SMACK is not set
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+# CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set
+CONFIG_SECURITY_APPARMOR=y
+# CONFIG_SECURITY_APPARMOR_DEBUG is not set
+CONFIG_SECURITY_APPARMOR_INTROSPECT_POLICY=y
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+CONFIG_SECURITY_APPARMOR_EXPORT_BINARY=y
+CONFIG_SECURITY_APPARMOR_PARANOID_LOAD=y
+# CONFIG_SECURITY_LOADPIN is not set
+CONFIG_SECURITY_YAMA=y
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_INTEGRITY=y
+CONFIG_INTEGRITY_SIGNATURE=y
+CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
+CONFIG_INTEGRITY_TRUSTED_KEYRING=y
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_IMA is not set
+# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
+# CONFIG_EVM is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
+
+#
+# Kernel hardening options
+#
+CONFIG_GCC_PLUGIN_STRUCTLEAK=y
+
+#
+# Memory initialization
+#
+# CONFIG_INIT_STACK_NONE is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
+CONFIG_GCC_PLUGIN_STACKLEAK=y
+# CONFIG_GCC_PLUGIN_STACKLEAK_VERBOSE is not set
+CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
+# CONFIG_STACKLEAK_METRICS is not set
+CONFIG_STACKLEAK_RUNTIME_DISABLE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
+CONFIG_ZERO_CALL_USED_REGS=y
+# end of Memory initialization
+
+CONFIG_RANDSTRUCT_NONE=y
+# CONFIG_RANDSTRUCT_FULL is not set
+# CONFIG_RANDSTRUCT_PERFORMANCE is not set
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SKCIPHER=y
+CONFIG_CRYPTO_SKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=m
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=m
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ENGINE=m
+# end of Crypto core or helper
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=m
+# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+# end of Public-key cryptography
+
+#
+# Block ciphers
+#
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_TI is not set
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARIA=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_SM4_GENERIC=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+# end of Block ciphers
+
+#
+# Length-preserving ciphers and modes
+#
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_HCTR2=m
+# CONFIG_CRYPTO_KEYWRAP is not set
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XCTR=m
+CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_NHPOLY1305=m
+# end of Length-preserving ciphers and modes
+
+#
+# AEAD (authenticated encryption with associated data) ciphers
+#
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_AEGIS128_SIMD=y
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ESSIV=m
+# end of AEAD (authenticated encryption with associated data) ciphers
+
+#
+# Hashes, digests, and MACs
+#
+CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_POLYVAL=m
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_SM3_GENERIC=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_XXHASH=m
+# end of Hashes, digests, and MACs
+
+#
+# CRCs (cyclic redundancy checks)
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRC64_ROCKSOFT=y
+# end of CRCs (cyclic redundancy checks)
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_842 is not set
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=m
+# end of Compression
+
+#
+# Random number generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=m
+CONFIG_CRYPTO_DRBG_HMAC=y
+# CONFIG_CRYPTO_DRBG_HASH is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+CONFIG_CRYPTO_DRBG=m
+CONFIG_CRYPTO_JITTERENTROPY=m
+# end of Random number generation
+
+#
+# Userspace interface
+#
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
+# CONFIG_CRYPTO_STATS is not set
+# end of Userspace interface
+
+CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_NHPOLY1305_NEON=m
+CONFIG_CRYPTO_CHACHA20_NEON=m
+
+#
+# Accelerated Cryptographic Algorithms for CPU (arm64)
+#
+CONFIG_CRYPTO_GHASH_ARM64_CE=m
+CONFIG_CRYPTO_POLY1305_NEON=m
+CONFIG_CRYPTO_SHA1_ARM64_CE=m
+CONFIG_CRYPTO_SHA256_ARM64=m
+CONFIG_CRYPTO_SHA2_ARM64_CE=m
+CONFIG_CRYPTO_SHA512_ARM64=m
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
+CONFIG_CRYPTO_SHA3_ARM64=m
+CONFIG_CRYPTO_SM3_NEON=m
+CONFIG_CRYPTO_SM3_ARM64_CE=m
+CONFIG_CRYPTO_POLYVAL_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64=m
+CONFIG_CRYPTO_AES_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
+CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
+CONFIG_CRYPTO_AES_ARM64_BS=m
+CONFIG_CRYPTO_SM4_ARM64_CE=m
+CONFIG_CRYPTO_SM4_ARM64_CE_BLK=m
+CONFIG_CRYPTO_SM4_ARM64_NEON_BLK=m
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
+CONFIG_CRYPTO_SM4_ARM64_CE_CCM=m
+CONFIG_CRYPTO_SM4_ARM64_CE_GCM=m
+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
+# end of Accelerated Cryptographic Algorithms for CPU (arm64)
+
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_ALLWINNER=y
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set
+# CONFIG_CRYPTO_DEV_SUN4I_SS_DEBUG is not set
+CONFIG_CRYPTO_DEV_SUN8I_CE=m
+# CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG is not set
+# CONFIG_CRYPTO_DEV_SUN8I_CE_HASH is not set
+# CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG is not set
+# CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG is not set
+CONFIG_CRYPTO_DEV_SUN8I_SS=m
+# CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG is not set
+# CONFIG_CRYPTO_DEV_SUN8I_SS_PRNG is not set
+# CONFIG_CRYPTO_DEV_SUN8I_SS_HASH is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
+# CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_BLOB_GEN=y
+CONFIG_CRYPTO_DEV_SAHARA=m
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
+# CONFIG_CRYPTO_DEV_CCP is not set
+# CONFIG_CRYPTO_DEV_MXS_DCP is not set
+CONFIG_CRYPTO_DEV_CPT=m
+CONFIG_CAVIUM_CPT=m
+CONFIG_CRYPTO_DEV_NITROX=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+CONFIG_CRYPTO_DEV_MARVELL=m
+CONFIG_CRYPTO_DEV_MARVELL_CESA=m
+# CONFIG_CRYPTO_DEV_OCTEONTX_CPT is not set
+CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m
+# CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 is not set
+# CONFIG_CRYPTO_DEV_KEEMBAY_OCS_ECC is not set
+# CONFIG_CRYPTO_DEV_KEEMBAY_OCS_HCU is not set
+# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
+# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set
+# CONFIG_CRYPTO_DEV_QAT_C62X is not set
+# CONFIG_CRYPTO_DEV_QAT_4XXX is not set
+# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
+# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
+# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
+# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
+CONFIG_CRYPTO_DEV_QCE=m
+CONFIG_CRYPTO_DEV_QCE_SKCIPHER=y
+CONFIG_CRYPTO_DEV_QCE_SHA=y
+CONFIG_CRYPTO_DEV_QCE_AEAD=y
+CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL=y
+# CONFIG_CRYPTO_DEV_QCE_ENABLE_SKCIPHER is not set
+# CONFIG_CRYPTO_DEV_QCE_ENABLE_SHA is not set
+# CONFIG_CRYPTO_DEV_QCE_ENABLE_AEAD is not set
+CONFIG_CRYPTO_DEV_QCE_SW_MAX_LEN=512
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
+# CONFIG_CRYPTO_DEV_ROCKCHIP is not set
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+# CONFIG_CRYPTO_DEV_CCREE is not set
+CONFIG_CRYPTO_DEV_HISI_SEC=m
+CONFIG_CRYPTO_DEV_HISI_SEC2=m
+CONFIG_CRYPTO_DEV_HISI_QM=m
+CONFIG_CRYPTO_DEV_HISI_ZIP=m
+CONFIG_CRYPTO_DEV_HISI_HPRE=m
+CONFIG_CRYPTO_DEV_HISI_TRNG=m
+CONFIG_CRYPTO_DEV_HISTB_TRNG=m
+CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
+# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+# CONFIG_FIPS_SIGNATURE_SELFTEST is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_LINEAR_RANGES=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_HAVE_ARCH_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_PRIME_NUMBERS=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_STMP_DEVICE=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+# CONFIG_INDIRECT_PIO is not set
+# CONFIG_TRACE_MMIO_ACCESS is not set
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_UTILS=y
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_GF128MUL=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA1=y
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC64_ROCKSOFT=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=y
+# CONFIG_CRC4 is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=y
+CONFIG_XXHASH=y
+CONFIG_AUDIT_GENERIC=y
+CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
+CONFIG_AUDIT_COMPAT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMMON=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_ARM is not set
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_SPARC is not set
+CONFIG_XZ_DEC_MICROLZMA=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_ZSTD=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_DMA_OPS=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_DECLARE_COHERENT=y
+CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
+CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
+CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
+CONFIG_SWIOTLB=y
+CONFIG_DMA_RESTRICTED_POOL=y
+CONFIG_DMA_NONCOHERENT_MMAP=y
+CONFIG_DMA_COHERENT_POOL=y
+CONFIG_DMA_DIRECT_REMAP=y
+CONFIG_DMA_CMA=y
+CONFIG_DMA_PERNUMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=64
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_CHECK_SIGNATURE=y
+# CONFIG_FORCE_NR_CPUS is not set
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_SIGNATURE=y
+CONFIG_DIMLIB=y
+CONFIG_LIBFDT=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+CONFIG_FONT_6x10=y
+# CONFIG_FONT_10x18 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+CONFIG_FONT_TER16x32=y
+CONFIG_FONT_6x8=y
+CONFIG_SG_SPLIT=y
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_MEMREGION=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_STACKDEPOT=y
+CONFIG_SBITMAP=y
+# end of Library routines
+
+CONFIG_GENERIC_IOREMAP=y
+CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_POLYNOMIAL=m
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+CONFIG_STACKTRACE_BUILD_ID=y
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
+CONFIG_SYMBOLIC_ERRNAME=y
+CONFIG_DEBUG_BUGVERBOSE=y
+# end of printk and dmesg options
+
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+CONFIG_AS_HAS_NON_CONST_LEB128=y
+# CONFIG_DEBUG_INFO_NONE is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF5 is not set
+# CONFIG_DEBUG_INFO_REDUCED is not set
+CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
+# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+# CONFIG_DEBUG_INFO_BTF is not set
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_FRAME_WARN=2048
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_VMLINUX_MAP is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+#
+# Generic Kernel Debugging Instruments
+#
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+CONFIG_HAVE_ARCH_KCSAN=y
+CONFIG_HAVE_KCSAN_COMPILER=y
+# CONFIG_KCSAN is not set
+# end of Generic Kernel Debugging Instruments
+
+#
+# Networking Debugging
+#
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
+# CONFIG_DEBUG_NET is not set
+# end of Networking Debugging
+
+#
+# Memory Debugging
+#
+CONFIG_PAGE_EXTENSION=y
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_PAGE_OWNER is not set
+# CONFIG_PAGE_TABLE_CHECK is not set
+CONFIG_PAGE_POISONING=y
+# CONFIG_DEBUG_PAGE_REF is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
+CONFIG_ARCH_HAS_DEBUG_WX=y
+# CONFIG_DEBUG_WX is not set
+CONFIG_GENERIC_PTDUMP=y
+# CONFIG_PTDUMP_DEBUGFS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_PER_VMA_LOCK_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SHRINKER_DEBUG is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_SCHED_STACK_END_CHECK=y
+CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
+# CONFIG_DEBUG_VM is not set
+CONFIG_DEBUG_VM_PGTABLE=y
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
+CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
+# CONFIG_KASAN is not set
+CONFIG_HAVE_ARCH_KFENCE=y
+CONFIG_KFENCE=y
+CONFIG_KFENCE_SAMPLE_INTERVAL=0
+CONFIG_KFENCE_NUM_OBJECTS=255
+# CONFIG_KFENCE_DEFERRABLE is not set
+# CONFIG_KFENCE_STATIC_KEYS is not set
+CONFIG_KFENCE_STRESS_TEST_FAULTS=0
+# end of Memory Debugging
+
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Oops, Lockups and Hangs
+#
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+# CONFIG_WQ_WATCHDOG is not set
+# CONFIG_TEST_LOCKUP is not set
+# end of Debug Oops, Lockups and Hangs
+
+#
+# Scheduler Debugging
+#
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+# end of Scheduler Debugging
+
+# CONFIG_DEBUG_TIMEKEEPING is not set
+CONFIG_DEBUG_PREEMPT=y
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WW_MUTEX_SELFTEST is not set
+# CONFIG_SCF_TORTURE_TEST is not set
+# CONFIG_CSD_LOCK_WAIT_DEBUG is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+
+#
+# Debug kernel data structures
+#
+CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+CONFIG_BUG_ON_DATA_CORRUPTION=y
+# CONFIG_DEBUG_MAPLE_TREE is not set
+# end of Debug kernel data structures
+
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_RCU_SCALE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_REF_SCALE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
+CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
+# CONFIG_RCU_CPU_STALL_CPUTIME is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_DEBUG_CGROUP_REF is not set
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_BOOTTIME_TRACING is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
+CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_STACK_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_HWLAT_TRACER is not set
+# CONFIG_OSNOISE_TRACER is not set
+# CONFIG_TIMERLAT_TRACER is not set
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+# CONFIG_BPF_KPROBE_OVERRIDE is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
+CONFIG_SYNTH_EVENTS=y
+# CONFIG_USER_EVENTS is not set
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_TRACE_EVENT_INJECT is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_SYNTH_EVENT_GEN_TEST is not set
+# CONFIG_KPROBE_EVENT_GEN_TEST is not set
+# CONFIG_RV is not set
+# CONFIG_SAMPLES is not set
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+
+#
+# arm64 Debugging
+#
+# CONFIG_PID_IN_CONTEXTIDR is not set
+# CONFIG_DEBUG_EFI is not set
+# CONFIG_ARM64_RELOC_TEST is not set
+# CONFIG_CORESIGHT is not set
+# end of arm64 Debugging
+
+#
+# Kernel Testing and Coverage
+#
+# CONFIG_KUNIT is not set
+CONFIG_NOTIFIER_ERROR_INJECTION=m
+CONFIG_PM_NOTIFIER_ERROR_INJECT=m
+# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_TEST_DHRY is not set
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_MIN_HEAP is not set
+# CONFIG_TEST_DIV64 is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_TEST_REF_TRACKER is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_STRING_SELFTEST is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+CONFIG_TEST_SCANF=m
+# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_UUID is not set
+CONFIG_TEST_XARRAY=m
+# CONFIG_TEST_MAPLE_TREE is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_IDA is not set
+# CONFIG_TEST_LKM is not set
+CONFIG_TEST_BITOPS=m
+CONFIG_TEST_VMALLOC=m
+CONFIG_TEST_USER_COPY=m
+CONFIG_TEST_BPF=m
+CONFIG_TEST_BLACKHOLE_DEV=m
+# CONFIG_FIND_BIT_BENCHMARK is not set
+CONFIG_TEST_FIRMWARE=m
+# CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UDELAY is not set
+CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_TEST_DYNAMIC_DEBUG is not set
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_FREE_PAGES is not set
+CONFIG_ARCH_USE_MEMTEST=y
+# CONFIG_MEMTEST is not set
+# CONFIG_HYPERV_TESTING is not set
+# end of Kernel Testing and Coverage
+
+#
+# Rust hacking
+#
+# end of Rust hacking
+# end of Kernel hacking
diff --git a/gnu/packages/aux-files/linux-libre/6.4-i686.conf b/gnu/packages/aux-files/linux-libre/6.4-i686.conf
new file mode 100644
index 0000000000..10d53e521b
--- /dev/null
+++ b/gnu/packages/aux-files/linux-libre/6.4-i686.conf
@@ -0,0 +1,11652 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/i386 6.4.2 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=110300
+CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23800
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23800
+CONFIG_LLD_VERSION=0
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
+CONFIG_PAHOLE_VERSION=0
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_TABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_WERROR is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_HAVE_KERNEL_ZSTD=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+# CONFIG_KERNEL_ZSTD is not set
+CONFIG_DEFAULT_INIT=""
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_WATCH_QUEUE=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_USELIB=y
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_IRQ_MSI_IOMMU=y
+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
+CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_INIT=y
+CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
+CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
+CONFIG_CONTEXT_TRACKING=y
+CONFIG_CONTEXT_TRACKING_IDLE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_CLOCKSOURCE_WATCHDOG_MAX_SKEW_US=100
+# end of Timers subsystem
+
+CONFIG_BPF=y
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# BPF subsystem
+#
+CONFIG_BPF_SYSCALL=y
+# CONFIG_BPF_JIT is not set
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
+# CONFIG_BPF_PRELOAD is not set
+# end of BPF subsystem
+
+CONFIG_PREEMPT_BUILD=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPTION=y
+CONFIG_PREEMPT_DYNAMIC=y
+CONFIG_SCHED_CORE=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+# CONFIG_PSI_DEFAULT_DISABLED is not set
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+CONFIG_PREEMPT_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_TASKS_RCU=y
+CONFIG_TASKS_RUDE_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKHEADERS is not set
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+# CONFIG_PRINTK_INDEX is not set
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
+CONFIG_CC_NO_ARRAY_BOUNDS=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+# CONFIG_CGROUP_FAVOR_DYNMODS is not set
+CONFIG_MEMCG=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_SCHED_MM_CID=y
+CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_CGROUP_MISC=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_TIME_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
+CONFIG_BOOT_CONFIG=y
+# CONFIG_BOOT_CONFIG_FORCE is not set
+# CONFIG_BOOT_CONFIG_EMBED is not set
+CONFIG_INITRAMFS_PRESERVE_MTIME=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_LD_ORPHAN_WARN=y
+CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+CONFIG_SGETMASK_SYSCALL=y
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_SELFTEST is not set
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_GUEST_PERF_EVENTS=y
+# CONFIG_PC104 is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_X86_32=y
+CONFIG_FORCE_DYNAMIC_FTRACE=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_32_SMP=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_PGTABLE_LEVELS=3
+CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
+
+#
+# Processor type and features
+#
+CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_GOLDFISH is not set
+# CONFIG_X86_CPU_RESCTRL is not set
+# CONFIG_X86_BIGSMP is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
+# CONFIG_X86_GOLDFISH is not set
+# CONFIG_X86_INTEL_MID is not set
+CONFIG_X86_INTEL_QUARK=y
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_X86_AMD_PLATFORM_DEVICE=y
+CONFIG_IOSF_MBI=y
+CONFIG_IOSF_MBI_DEBUG=y
+CONFIG_X86_RDC321X=y
+CONFIG_X86_32_NON_STANDARD=y
+CONFIG_STA2X11=y
+CONFIG_X86_32_IRIS=m
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_PARAVIRT_SPINLOCKS=y
+CONFIG_X86_HV_CALLBACK_VECTOR=y
+CONFIG_XEN=y
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_PVHVM_SMP=y
+CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_SAVE_RESTORE=y
+# CONFIG_XEN_DEBUG_FS is not set
+CONFIG_XEN_PVH=y
+CONFIG_KVM_GUEST=y
+CONFIG_ARCH_CPUIDLE_HALTPOLL=y
+CONFIG_PVH=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_M486SX is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MELAN is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_X86_GENERIC=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=6
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_IA32_FEAT_CTL=y
+CONFIG_X86_VMX_FEATURE_NAMES=y
+CONFIG_PROCESSOR_SELECT=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_HYGON=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
+CONFIG_CPU_SUP_ZHAOXIN=y
+CONFIG_CPU_SUP_VORTEX_32=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_BOOT_VESA_SUPPORT=y
+CONFIG_NR_CPUS_RANGE_BEGIN=2
+CONFIG_NR_CPUS_RANGE_END=8
+CONFIG_NR_CPUS_DEFAULT=8
+CONFIG_NR_CPUS=8
+CONFIG_SCHED_CLUSTER=y
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_MC_PRIO=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+# CONFIG_X86_MCELOG_LEGACY is not set
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_ANCIENT_MCE is not set
+CONFIG_X86_MCE_THRESHOLD=y
+# CONFIG_X86_MCE_INJECT is not set
+
+#
+# Performance monitoring
+#
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
+CONFIG_PERF_EVENTS_INTEL_RAPL=y
+CONFIG_PERF_EVENTS_INTEL_CSTATE=y
+CONFIG_PERF_EVENTS_AMD_POWER=m
+CONFIG_PERF_EVENTS_AMD_UNCORE=m
+CONFIG_PERF_EVENTS_AMD_BRS=y
+# end of Performance monitoring
+
+# CONFIG_X86_LEGACY_VM86 is not set
+CONFIG_X86_16BIT=y
+CONFIG_X86_ESPFIX32=y
+CONFIG_X86_IOPL_IOPERM=y
+# CONFIG_TOSHIBA is not set
+CONFIG_X86_REBOOTFIXUPS=y
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+# CONFIG_MICROCODE_LATE_LOADING is not set
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+# CONFIG_NOHIGHMEM is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
+CONFIG_X86_PAE=y
+# CONFIG_X86_CPA_STATISTICS is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_X86_PMEM_LEGACY_DEVICE=y
+CONFIG_X86_PMEM_LEGACY=y
+CONFIG_HIGHPTE=y
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_X86_UMIP=y
+CONFIG_CC_HAS_IBT=y
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI_HANDOVER_PROTOCOL=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_RUNTIME_MAP=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+CONFIG_CRASH_DUMP=y
+CONFIG_KEXEC_JUMP=y
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_X86_NEED_RELOCS=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_MODIFY_LDT_SYSCALL=y
+# CONFIG_STRICT_SIGALTSTACK_SIZE is not set
+# end of Processor type and features
+
+CONFIG_CC_HAS_SLS=y
+CONFIG_CC_HAS_RETURN_THUNK=y
+CONFIG_CC_HAS_ENTRY_PADDING=y
+CONFIG_FUNCTION_PADDING_CFI=0
+CONFIG_FUNCTION_PADDING_BYTES=4
+CONFIG_SPECULATION_MITIGATIONS=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+CONFIG_RETPOLINE=y
+CONFIG_RETHUNK=y
+CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_USERSPACE_AUTOSLEEP is not set
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
+CONFIG_PM_CLK=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+# CONFIG_ENERGY_MODEL is not set
+CONFIG_ARCH_SUPPORTS_ACPI=y
+CONFIG_ACPI=y
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
+CONFIG_ACPI_TABLE_LIB=y
+# CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_SPCR_TABLE=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_TAD=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_PROCESSOR_CSTATE=y
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_PLATFORM_PROFILE=m
+CONFIG_ACPI_CUSTOM_DSDT_FILE=""
+CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_IOAPIC=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+CONFIG_ACPI_BGRT=y
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HAVE_ACPI_APEI_NMI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_EINJ=m
+# CONFIG_ACPI_APEI_ERST_DEBUG is not set
+CONFIG_ACPI_DPTF=y
+CONFIG_DPTF_POWER=m
+CONFIG_DPTF_PCH_FIVR=m
+CONFIG_ACPI_WATCHDOG=y
+CONFIG_ACPI_EXTLOG=m
+CONFIG_ACPI_CONFIGFS=m
+CONFIG_ACPI_PCC=y
+CONFIG_ACPI_FFH=y
+# CONFIG_PMIC_OPREGION is not set
+CONFIG_TPS68470_PMIC_OPREGION=y
+CONFIG_ACPI_VIOT=y
+CONFIG_X86_PM_TIMER=y
+CONFIG_X86_APM_BOOT=y
+CONFIG_APM=m
+# CONFIG_APM_IGNORE_USER_SUSPEND is not set
+# CONFIG_APM_DO_ENABLE is not set
+# CONFIG_APM_CPU_IDLE is not set
+# CONFIG_APM_DISPLAY_BLANK is not set
+# CONFIG_APM_ALLOW_INTS is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=y
+CONFIG_X86_AMD_PSTATE=y
+# CONFIG_X86_AMD_PSTATE_UT is not set
+CONFIG_X86_ACPI_CPUFREQ=y
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_POWERNOW_K6=m
+CONFIG_X86_POWERNOW_K7=m
+CONFIG_X86_POWERNOW_K7_ACPI=y
+CONFIG_X86_POWERNOW_K8=y
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+CONFIG_X86_GX_SUSPMOD=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=y
+CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
+CONFIG_X86_SPEEDSTEP_ICH=y
+CONFIG_X86_SPEEDSTEP_SMI=y
+CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_CPUFREQ_NFORCE2=y
+CONFIG_X86_LONGRUN=m
+CONFIG_X86_LONGHAUL=m
+# CONFIG_X86_E_POWERSAVER is not set
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=y
+CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+# end of CPU Frequency scaling
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE_GOV_TEO=y
+CONFIG_CPU_IDLE_GOV_HALTPOLL=y
+CONFIG_HALTPOLL_CPUIDLE=m
+# end of CPU Idle
+
+CONFIG_INTEL_IDLE=y
+# end of Power management and ACPI options
+
+#
+# Bus options (PCI etc.)
+#
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_XEN=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_ISA_BUS is not set
+CONFIG_ISA_DMA_API=y
+CONFIG_ISA=y
+CONFIG_SCx200=m
+CONFIG_SCx200HR_TIMER=m
+CONFIG_ALIX=y
+CONFIG_NET5501=y
+CONFIG_GEOS=y
+CONFIG_AMD_NB=y
+# end of Bus options (PCI etc.)
+
+#
+# Binary Emulations
+#
+CONFIG_COMPAT_32=y
+# end of Binary Emulations
+
+CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_PFNCACHE=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_DIRTY_RING=y
+CONFIG_HAVE_KVM_DIRTY_RING_TSO=y
+CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
+CONFIG_KVM_XFER_TO_GUEST_WORK=y
+CONFIG_HAVE_KVM_PM_NOTIFIER=y
+CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_WERROR=y
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_SMM=y
+CONFIG_KVM_XEN=y
+CONFIG_AS_AVX512=y
+CONFIG_AS_SHA1_NI=y
+CONFIG_AS_SHA256_NI=y
+CONFIG_AS_TPAUSE=y
+CONFIG_AS_GFNI=y
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_HOTPLUG_SMT=y
+CONFIG_GENERIC_ENTRY=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+# CONFIG_STATIC_CALL_SELFTEST is not set
+CONFIG_OPTPROBES=y
+CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_KRETPROBE_ON_RETHOOK=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
+CONFIG_ARCH_WANTS_NO_INSTR=y
+CONFIG_ARCH_32BIT_OFF_T=y
+CONFIG_HAVE_ASM_MODVERSIONS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_MMU_GATHER_TABLE_FREE=y
+CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
+CONFIG_MMU_GATHER_MERGE_VMAS=y
+CONFIG_MMU_LAZY_TLB_REFCOUNT=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_HAS_NMI_SAFE_THIS_CPU_OPS=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+CONFIG_HAVE_ARCH_STACKLEAK=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
+CONFIG_LTO_NONE=y
+CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PUD=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_ISA_BUS_API=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_HAVE_STATIC_CALL=y
+CONFIG_HAVE_PREEMPT_DYNAMIC=y
+CONFIG_HAVE_PREEMPT_DYNAMIC_CALL=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_SPLIT_ARG64=y
+CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y
+CONFIG_DYNAMIC_SIGFRAME=y
+CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_HAVE_GCC_PLUGINS=y
+CONFIG_GCC_PLUGINS=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_FUNCTION_ALIGNMENT_4B=y
+CONFIG_FUNCTION_ALIGNMENT=4
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_DEBUG is not set
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODULE_UNLOAD_TAINT_TRACKING is not set
+CONFIG_MODVERSIONS=y
+CONFIG_ASM_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS_NONE is not set
+CONFIG_MODULE_COMPRESS_GZIP=y
+# CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
+CONFIG_MODULE_DECOMPRESS=y
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+CONFIG_MODPROBE_PATH="/run/current-system/profile/bin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLOCK_LEGACY_AUTOLOAD=y
+CONFIG_BLK_RQ_ALLOC_TIME=y
+CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_CGROUP_PUNT_BIO=y
+CONFIG_BLK_DEV_BSG_COMMON=y
+CONFIG_BLK_ICQ=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_INTEGRITY_T10=y
+CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
+CONFIG_BLK_WBT=y
+CONFIG_BLK_WBT_MQ=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+CONFIG_BLK_CGROUP_FC_APPID=y
+CONFIG_BLK_CGROUP_IOCOST=y
+CONFIG_BLK_CGROUP_IOPRIO=y
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_DEBUG_FS_ZONED=y
+# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_INLINE_ENCRYPTION=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_ATARI_PARTITION=y
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+CONFIG_SGI_PARTITION=y
+CONFIG_ULTRIX_PARTITION=y
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+CONFIG_SYSV68_PARTITION=y
+CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
+CONFIG_BLK_MQ_STACKING=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_IOSCHED_BFQ=m
+# CONFIG_BFQ_GROUP_IOSCHED is not set
+# end of IO Schedulers
+
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
+CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
+CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_ZPOOL=y
+CONFIG_SWAP=y
+CONFIG_ZSWAP=y
+# CONFIG_ZSWAP_DEFAULT_ON is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+CONFIG_ZBUD=y
+CONFIG_Z3FOLD=m
+CONFIG_ZSMALLOC=y
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_ZSMALLOC_CHAIN_SIZE=8
+
+#
+# SLAB allocator options
+#
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLUB_TINY is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+# CONFIG_SLUB_STATS is not set
+CONFIG_SLUB_CPU_PARTIAL=y
+# end of SLAB allocator options
+
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_EXCLUSIVE_SYSTEM_RAM=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
+CONFIG_PAGE_REPORTING=y
+CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_BOUNCE=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_SYSFS=y
+CONFIG_CMA_AREAS=7
+CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_PAGE_IDLE_FLAG=y
+CONFIG_IDLE_PAGE_TRACKING=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
+CONFIG_ARCH_HAS_ZONE_DMA_SET=y
+CONFIG_ZONE_DMA=y
+CONFIG_HMM_MIRROR=y
+CONFIG_GET_FREE_REGION=y
+CONFIG_VMAP_PFN=y
+CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_TEST is not set
+CONFIG_GUP_GET_PXX_LOW_HIGH=y
+# CONFIG_DMAPOOL_TEST is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_MAPPING_DIRTY_HELPERS=y
+CONFIG_KMAP_LOCAL=y
+CONFIG_SECRETMEM=y
+CONFIG_ANON_VMA_NAME=y
+CONFIG_USERFAULTFD=y
+CONFIG_LOCK_MM_AND_FIND_VMA=y
+
+#
+# Data Access Monitoring
+#
+CONFIG_DAMON=y
+CONFIG_DAMON_VADDR=y
+CONFIG_DAMON_PADDR=y
+CONFIG_DAMON_SYSFS=y
+# CONFIG_DAMON_DBGFS is not set
+CONFIG_DAMON_RECLAIM=y
+CONFIG_DAMON_LRU_SORT=y
+# end of Data Access Monitoring
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_AF_UNIX_OOB=y
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+# CONFIG_TLS_DEVICE is not set
+# CONFIG_TLS_TOE is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+CONFIG_XFRM_STATISTICS=y
+CONFIG_XFRM_AH=m
+CONFIG_XFRM_ESP=m
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+# CONFIG_SMC is not set
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
+CONFIG_NET_HANDSHAKE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_ESP_OFFLOAD=m
+# CONFIG_INET_ESPINTCP is not set
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_TABLE_PERTURB_ORDER=16
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_RAW_DIAG=m
+# CONFIG_INET_DIAG_DESTROY is not set
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_ESP_OFFLOAD=m
+# CONFIG_INET6_ESPINTCP is not set
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
+# CONFIG_IPV6_RPL_LWTUNNEL is not set
+# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
+CONFIG_NETLABEL=y
+CONFIG_MPTCP=y
+CONFIG_INET_MPTCP_DIAG=m
+CONFIG_MPTCP_IPV6=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_EGRESS=y
+CONFIG_NETFILTER_SKIP_EGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_BPF_LINK=y
+CONFIG_NETFILTER_NETLINK_HOOK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_NETLINK_OSF=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_SYSLOG=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CONNTRACK_OVS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NF_NAT_OVS=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_TWOS=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_CRYPTO=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_BRIDGE_MRP=y
+CONFIG_BRIDGE_CFM=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_NONE=m
+CONFIG_NET_DSA_TAG_AR9331=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_LEGACY=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_HELLCREEK=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_OCELOT=m
+CONFIG_NET_DSA_TAG_OCELOT_8021Q=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_RTL4_A=m
+CONFIG_NET_DSA_TAG_RTL8_4=m
+CONFIG_NET_DSA_TAG_RZN1_A5PSW=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
+CONFIG_NET_DSA_TAG_XRS700X=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_COPS=m
+CONFIG_COPS_DAYNA=y
+CONFIG_COPS_TANGENT=y
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_MQPRIO_LIB=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_SCH_ETS=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_SAMPLE=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_MPLS=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_ACT_CT=m
+CONFIG_NET_ACT_GATE=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+# CONFIG_NET_TC_SKB_EXT is not set
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_BATMAN_V is not set
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VSOCKETS_LOOPBACK=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+CONFIG_HSR=m
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_QRTR=m
+CONFIG_QRTR_SMD=m
+CONFIG_QRTR_TUN=m
+CONFIG_QRTR_MHI=m
+CONFIG_NET_NCSI=y
+# CONFIG_NCSI_OEM_CMD_GET_MAC is not set
+# CONFIG_NCSI_OEM_CMD_KEEP_PHY is not set
+CONFIG_PCPU_DEV_REFCNT=y
+CONFIG_MAX_SKB_FRAGS=17
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+# CONFIG_BPF_STREAM_PARSER is not set
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_DROP_MONITOR=m
+# end of Network testing
+# end of Networking options
+
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_SCC=m
+# CONFIG_SCC_DELAY is not set
+# CONFIG_SCC_TRXECHO is not set
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_BAYCOM_EPP=m
+CONFIG_YAM=m
+# end of AX.25 network device drivers
+
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+CONFIG_CAN_J1939=m
+CONFIG_CAN_ISOTP=m
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_LE_L2CAP_ECRED=y
+CONFIG_BT_6LOWPAN=m
+# CONFIG_BT_LEDS is not set
+CONFIG_BT_MSFTEXT=y
+CONFIG_BT_AOSPEXT=y
+CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_SELFTEST is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_MTK=m
+CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
+CONFIG_BT_HCIBTUSB_POLL_SYNC=y
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_MTK=y
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_NOKIA=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_RTL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIUART_MRVL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBCM4377=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
+CONFIG_BT_HCIRSI=m
+CONFIG_BT_VIRTIO=m
+CONFIG_BT_NXPUART=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_INJECT_RX_DELAY is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+# CONFIG_RXKAD is not set
+# CONFIG_RXPERF is not set
+CONFIG_AF_KCM=m
+CONFIG_STREAM_PARSER=y
+CONFIG_MCTP=y
+CONFIG_MCTP_FLOWS=y
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+CONFIG_CFG80211_DEBUGFS=y
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_DEBUGFS=y
+CONFIG_MAC80211_MESSAGE_TRACING=y
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_RFKILL=y
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_FD=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_XEN=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=m
+CONFIG_NFC_NCI_UART=m
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_TRF7970A=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_VIRTUAL_NCI=m
+CONFIG_NFC_FDP=m
+CONFIG_NFC_FDP_I2C=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_PN532_UART=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_I2C=m
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
+CONFIG_NFC_MRVL_SPI=m
+CONFIG_NFC_ST21NFCA=m
+CONFIG_NFC_ST21NFCA_I2C=m
+CONFIG_NFC_ST_NCI=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+CONFIG_NFC_S3FWRN5=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_NFC_S3FWRN82_UART=m
+CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_NET_SELFTESTS=y
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_PAGE_POOL_STATS=y
+CONFIG_FAILOVER=y
+CONFIG_ETHTOOL_NETLINK=y
+
+#
+# Device Drivers
+#
+CONFIG_HAVE_EISA=y
+# CONFIG_EISA is not set
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_PCIE_DPC=y
+CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_EDR is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+# CONFIG_PCI_PF_STUB is not set
+CONFIG_PCI_ATS=y
+CONFIG_PCI_DOE=y
+CONFIG_PCI_LOCKLESS_CONFIG=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_LABEL=y
+# CONFIG_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_COMPAQ=m
+CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
+CONFIG_HOTPLUG_PCI_IBM=m
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+CONFIG_HOTPLUG_PCI_SHPC=y
+
+#
+# PCI controller drivers
+#
+
+#
+# Cadence-based PCIe controllers
+#
+# end of Cadence-based PCIe controllers
+
+#
+# DesignWare-based PCIe controllers
+#
+# CONFIG_PCI_MESON is not set
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+# end of DesignWare-based PCIe controllers
+
+#
+# Mobiveil-based PCIe controllers
+#
+# end of Mobiveil-based PCIe controllers
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
+CONFIG_CXL_BUS=m
+CONFIG_CXL_PCI=m
+# CONFIG_CXL_MEM_RAW_COMMANDS is not set
+CONFIG_CXL_ACPI=m
+CONFIG_CXL_PMEM=m
+CONFIG_CXL_MEM=m
+CONFIG_CXL_PORT=m
+CONFIG_CXL_SUSPEND=y
+CONFIG_CXL_REGION=y
+# CONFIG_CXL_REGION_INVALIDATION_TEST is not set
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_I82365=m
+CONFIG_TCIC=m
+CONFIG_PCMCIA_PROBE=y
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_TSI721=m
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
+# CONFIG_RAPIDIO_DEBUG is not set
+CONFIG_RAPIDIO_ENUM_BASIC=m
+CONFIG_RAPIDIO_CHMAN=m
+CONFIG_RAPIDIO_MPORT_CDEV=m
+
+#
+# RapidIO Switch drivers
+#
+CONFIG_RAPIDIO_CPS_XX=m
+CONFIG_RAPIDIO_CPS_GEN2=m
+CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
+
+#
+# Generic Driver Options
+#
+CONFIG_AUXILIARY_BUS=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEVTMPFS_SAFE=y
+# CONFIG_STANDALONE is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_DEBUG=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_FW_LOADER_SYSFS=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_LOADER_COMPRESS_XZ=y
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+CONFIG_FW_CACHE=y
+CONFIG_FW_UPLOAD=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_SYS_HYPERVISOR=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_SOC_BUS=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_W1=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SCCB=m
+CONFIG_REGMAP_I3C=m
+CONFIG_REGMAP_SPI_AVMM=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+# CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=m
+CONFIG_MHI_BUS_EP=m
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# end of ARM System Control and Management Interface Protocol
+
+CONFIG_EDD=y
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+CONFIG_FW_CFG_SYSFS=m
+# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
+CONFIG_SYSFB=y
+CONFIG_SYSFB_SIMPLEFB=y
+CONFIG_FW_CS_DSP=m
+CONFIG_GOOGLE_FIRMWARE=y
+# CONFIG_GOOGLE_SMI is not set
+CONFIG_GOOGLE_CBMEM=m
+CONFIG_GOOGLE_COREBOOT_TABLE=m
+# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
+CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
+# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
+# CONFIG_GOOGLE_VPD is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=m
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
+CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_BOOTLOADER_CONTROL=m
+CONFIG_EFI_CAPSULE_LOADER=y
+CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
+# CONFIG_EFI_TEST is not set
+CONFIG_EFI_DEV_PATH_PARSER=y
+CONFIG_APPLE_PROPERTIES=y
+CONFIG_RESET_ATTACK_MITIGATION=y
+# CONFIG_EFI_RCI2_TABLE is not set
+# CONFIG_EFI_DISABLE_PCI_DMA is not set
+CONFIG_EFI_EARLYCON=y
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
+# CONFIG_EFI_DISABLE_RUNTIME is not set
+CONFIG_EFI_COCO_SECRET=y
+# end of EFI (Extensible Firmware Interface) Support
+
+CONFIG_UEFI_CPER=y
+CONFIG_UEFI_CPER_X86=y
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_GNSS=m
+CONFIG_GNSS_SERIAL=m
+CONFIG_GNSS_MTK_SERIAL=m
+CONFIG_GNSS_SIRF_SERIAL=m
+CONFIG_GNSS_UBX_SERIAL=m
+CONFIG_GNSS_USB=m
+CONFIG_MTD=m
+# CONFIG_MTD_TESTS is not set
+
+#
+# Partition parsers
+#
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+
+#
+# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK.
+#
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_PHYSMAP_GPIO_ADDR=y
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_SCx200_DOCFLASH=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+# CONFIG_MTD_PMC551_BUGFIX is not set
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+CONFIG_MTD_DATAFLASH_OTP=y
+CONFIG_MTD_MCHP23K256=m
+CONFIG_MTD_MCHP48L640=m
+CONFIG_MTD_SST25L=m
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
+# end of Self-contained MTD device drivers
+
+#
+# NAND
+#
+CONFIG_MTD_NAND_CORE=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+# CONFIG_MTD_ONENAND_OTP is not set
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_RAW_NAND=m
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_CS553X=m
+CONFIG_MTD_NAND_MXIC=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_NAND_ARASAN=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_SPI_NAND=m
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
+CONFIG_MTD_NAND_ECC_MXIC=y
+# end of ECC engine support
+# end of NAND
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set
+CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_FASTMAP=y
+CONFIG_MTD_UBI_GLUEBI=m
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_HYPERBUS=m
+# CONFIG_OF is not set
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_ISAPNP=y
+CONFIG_PNPBIOS=y
+CONFIG_PNPBIOS_PROC_FS=y
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
+CONFIG_CDROM=y
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+# CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_ZRAM_MULTI_COMP=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_VIRTIO_BLK=y
+CONFIG_BLK_DEV_RBD=m
+# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLK_DEV_RNBD=y
+CONFIG_BLK_DEV_RNBD_CLIENT=m
+CONFIG_BLK_DEV_RNBD_SERVER=m
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+# CONFIG_NVME_MULTIPATH is not set
+# CONFIG_NVME_VERBOSE_ERRORS is not set
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+# CONFIG_NVME_AUTH is not set
+CONFIG_NVME_TARGET=m
+# CONFIG_NVME_TARGET_PASSTHRU is not set
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+CONFIG_NVME_TARGET_FCLOOP=m
+CONFIG_NVME_TARGET_TCP=m
+# CONFIG_NVME_TARGET_AUTH is not set
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_DUMMY_IRQ=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_SMPRO_ERRMON=m
+CONFIG_SMPRO_MISC=m
+# CONFIG_CS5535_MFGPT is not set
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_PCH_PHUB=m
+CONFIG_LATTICE_ECP3_CONFIG=m
+CONFIG_SRAM=y
+CONFIG_DW_XDATA_PCIE=m
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_XILINX_SDFEC=m
+CONFIG_MISC_RTSX=m
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_EEPROM_IDT_89HPESX=m
+CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+# CONFIG_INTEL_MEI is not set
+# CONFIG_INTEL_MEI_ME is not set
+# CONFIG_INTEL_MEI_TXE is not set
+# CONFIG_INTEL_MEI_HDCP is not set
+# CONFIG_INTEL_MEI_PXP is not set
+CONFIG_VMWARE_VMCI=m
+CONFIG_ECHO=m
+CONFIG_BCM_VK=m
+CONFIG_BCM_VK_TTY=y
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_UACCE=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+CONFIG_GP_PCI1XXXX=m
+# end of Misc devices
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_COMMON=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AHA152X=m
+CONFIG_SCSI_AHA1542=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
+CONFIG_AIC7XXX_RESET_DELAY_MS=5000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=5000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
+CONFIG_SCSI_MYRB=m
+CONFIG_SCSI_MYRS=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_FDOMAIN=m
+CONFIG_SCSI_FDOMAIN_PCI=m
+CONFIG_SCSI_FDOMAIN_ISA=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_GENERIC_NCR5380=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+CONFIG_SCSI_IPR_DUMP=y
+CONFIG_SCSI_QLOGIC_FAS=m
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+# CONFIG_TCM_QLA2XXX_DEBUG is not set
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_QEDI=m
+CONFIG_QEDF=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_EFCT=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_NSP32=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_NINJA_SCSI=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_ATA=y
+CONFIG_SATA_HOST=y
+CONFIG_PATA_TIMINGS=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_FORCE=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_DWC=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_DWC=m
+# CONFIG_SATA_DWC_OLD_DMA is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_CS5535=m
+CONFIG_PATA_CS5536=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3_DMA is not set
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_ISAPNP=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_QDI=m
+CONFIG_PATA_RZ1000=m
+CONFIG_PATA_WINBOND_VLB=m
+CONFIG_PATA_PARPORT=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PATA_PARPORT_ATEN=m
+CONFIG_PATA_PARPORT_BPCK=m
+CONFIG_PATA_PARPORT_BPCK6=m
+CONFIG_PATA_PARPORT_COMM=m
+CONFIG_PATA_PARPORT_DSTR=m
+CONFIG_PATA_PARPORT_FIT2=m
+CONFIG_PATA_PARPORT_FIT3=m
+CONFIG_PATA_PARPORT_EPAT=m
+CONFIG_PATA_PARPORT_EPATC8=y
+CONFIG_PATA_PARPORT_EPIA=m
+CONFIG_PATA_PARPORT_FRIQ=m
+CONFIG_PATA_PARPORT_FRPW=m
+CONFIG_PATA_PARPORT_KBIC=m
+CONFIG_PATA_PARPORT_KTTI=m
+CONFIG_PATA_PARPORT_ON20=m
+CONFIG_PATA_PARPORT_ON26=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_HST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+# CONFIG_DM_INIT is not set
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_ZONED=m
+CONFIG_DM_AUDIT=y
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_REMOTE_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+CONFIG_FUSION_LOGGING=y
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=m
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
+CONFIG_EQUALIZER=m
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_GTP=m
+CONFIG_AMT=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
+CONFIG_TUN=y
+CONFIG_TAP=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=y
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+CONFIG_VSOCKMON=m
+CONFIG_MHI_NET=m
+CONFIG_SUNGEM_PHY=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_ISA=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+CONFIG_CAIF_DRIVERS=y
+CONFIG_CAIF_TTY=m
+CONFIG_CAIF_VIRTIO=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_B53=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_B53_SERDES=m
+CONFIG_NET_DSA_BCM_SF2=m
+# CONFIG_NET_DSA_LOOP is not set
+CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m
+CONFIG_NET_DSA_LANTIQ_GSWIP=m
+CONFIG_NET_DSA_MT7530=m
+CONFIG_NET_DSA_MT7530_MDIO=m
+CONFIG_NET_DSA_MT7530_MMIO=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_PTP=y
+CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI=m
+CONFIG_NET_DSA_MV88E6XXX=m
+# CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_MSCC_FELIX_DSA_LIB=m
+CONFIG_NET_DSA_MSCC_OCELOT_EXT=m
+CONFIG_NET_DSA_MSCC_SEVILLE=m
+CONFIG_NET_DSA_AR9331=m
+CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT=y
+CONFIG_NET_DSA_SJA1105=m
+CONFIG_NET_DSA_SJA1105_PTP=y
+# CONFIG_NET_DSA_SJA1105_TAS is not set
+CONFIG_NET_DSA_XRS700X=m
+CONFIG_NET_DSA_XRS700X_I2C=m
+CONFIG_NET_DSA_XRS700X_MDIO=m
+CONFIG_NET_DSA_REALTEK=m
+# CONFIG_NET_DSA_REALTEK_MDIO is not set
+# CONFIG_NET_DSA_REALTEK_SMI is not set
+CONFIG_NET_DSA_REALTEK_RTL8365MB=m
+CONFIG_NET_DSA_REALTEK_RTL8366RB=m
+CONFIG_NET_DSA_SMSC_LAN9303=m
+CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
+CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
+CONFIG_NET_DSA_VITESSE_VSC73XX=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_EL3=m
+CONFIG_3C515=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_SLICOSS=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_LANCE=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_AMD_XGBE=m
+# CONFIG_AMD_XGBE_DCB is not set
+CONFIG_AMD_XGBE_HAVE_ECC=y
+CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ASIX=y
+CONFIG_SPI_AX88796C=m
+CONFIG_SPI_AX88796C_COMPRESSION=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_CX_ECAT=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+# CONFIG_SYSTEMPORT is not set
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+# CONFIG_BNXT_DCB is not set
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+CONFIG_MACB_PCI=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_CHELSIO_INLINE_CRYPTO=y
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_CS89x0=m
+CONFIG_CS89x0_ISA=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+# CONFIG_NET_VENDOR_CORTINA is not set
+CONFIG_NET_VENDOR_DAVICOM=y
+CONFIG_DM9051=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_ENGLEDER=y
+CONFIG_TSNEP=m
+# CONFIG_TSNEP_SELFTESTS is not set
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_FUNGIBLE=y
+CONFIG_FUN_CORE=m
+CONFIG_FUN_ETH=m
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_GVE=m
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_HINIC=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_E1000E_HWTS=y
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGBVF=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCB=y
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+CONFIG_IAVF=m
+CONFIG_I40EVF=m
+CONFIG_ICE=m
+CONFIG_ICE_SWITCHDEV=y
+CONFIG_ICE_HWTS=y
+CONFIG_FM10K=m
+CONFIG_IGC=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_ADI=y
+CONFIG_ADIN1110=m
+CONFIG_NET_VENDOR_LITEX=y
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_PRESTERA=m
+CONFIG_PRESTERA_PCI=m
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+# CONFIG_MLX5_FPGA is not set
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_BRIDGE=y
+CONFIG_MLX5_CORE_EN_DCB=y
+# CONFIG_MLX5_CORE_IPOIB is not set
+CONFIG_MLX5_EN_MACSEC=y
+CONFIG_MLX5_EN_IPSEC=y
+CONFIG_MLX5_SW_STEERING=y
+CONFIG_MLX5_SF=y
+CONFIG_MLX5_SF_MANAGER=y
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_CORE_THERMAL=y
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_I2C=m
+CONFIG_MLXSW_SPECTRUM=m
+CONFIG_MLXSW_SPECTRUM_DCB=y
+CONFIG_MLXSW_MINIMAL=m
+CONFIG_MLXFW=m
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ENCX24J600=m
+CONFIG_LAN743X=m
+# CONFIG_VCAP is not set
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_MSCC_OCELOT_SWITCH_LIB=m
+CONFIG_NET_VENDOR_MICROSOFT=y
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+# CONFIG_NFP_APP_FLOWER is not set
+CONFIG_NFP_APP_ABM_NIC=y
+CONFIG_NFP_NET_IPSEC=y
+# CONFIG_NFP_DEBUG is not set
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2000=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_ULTRA=m
+CONFIG_WD80x3=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_PCH_GBE=m
+CONFIG_ETHOC=m
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_PENSANDO=y
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_QCOM_EMAC=m
+CONFIG_RMNET=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_ROCKER=m
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_SFC_SIENA=m
+CONFIG_SFC_SIENA_MTD=y
+CONFIG_SFC_SIENA_MCDI_MON=y
+CONFIG_SFC_SIENA_SRIOV=y
+CONFIG_SFC_SIENA_MCDI_LOGGING=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC9194=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_INTEL=m
+CONFIG_DWMAC_LOONGSON=m
+# CONFIG_STMMAC_PCI is not set
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+CONFIG_DWC_XLGMAC=m
+CONFIG_DWC_XLGMAC_PCI=m
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VERTEXCOM=y
+CONFIG_MSE102X=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WANGXUN=y
+CONFIG_LIBWX=m
+CONFIG_NGBE=m
+CONFIG_TXGBE=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+# CONFIG_WIZNET_W5100_SPI is not set
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_EMACLITE=m
+CONFIG_XILINX_AXI_EMAC=m
+CONFIG_XILINX_LL_TEMAC=m
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+CONFIG_SKFP=m
+# CONFIG_HIPPI is not set
+CONFIG_NET_SB1000=m
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
+CONFIG_FIXED_PHY=y
+CONFIG_SFP=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+CONFIG_ADIN_PHY=m
+CONFIG_ADIN1100_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM84881_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
+CONFIG_MEDIATEK_GE_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_T1S_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MOTORCOMM_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_CBTX_PHY=m
+CONFIG_NXP_C45_TJA11XX_PHY=m
+CONFIG_NXP_TJA11XX_PHY=m
+CONFIG_NCN26000_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_DP83TD510_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_PSE_CONTROLLER=y
+CONFIG_PSE_REGULATOR=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_VXCAN=m
+CONFIG_CAN_NETLINK=y
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_RX_OFFLOAD=y
+CONFIG_CAN_CAN327=m
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_CAN_KVASER_PCIEFD=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
+CONFIG_CAN_CC770_PLATFORM=m
+CONFIG_CAN_CTUCANFD=m
+CONFIG_CAN_CTUCANFD_PCI=m
+CONFIG_CAN_IFI_CANFD=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_M_CAN_PCI=m
+CONFIG_CAN_M_CAN_PLATFORM=m
+CONFIG_CAN_M_CAN_TCAN4X5X=m
+CONFIG_CAN_PEAK_PCIEFD=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_EMS_PCMCIA=m
+CONFIG_CAN_F81601=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_PEAK_PCMCIA=m
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_SJA1000_ISA=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_TSCAN1=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+
+#
+# CAN SPI interfaces
+#
+CONFIG_CAN_HI311X=m
+CONFIG_CAN_MCP251X=m
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY is not set
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB=m
+CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+CONFIG_CAN_MCBA_USB=m
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+# CONFIG_CAN_DEBUG_DEVICES is not set
+
+#
+# MCTP Device Drivers
+#
+CONFIG_MCTP_SERIAL=m
+CONFIG_MCTP_TRANSPORT_I2C=m
+# end of MCTP Device Drivers
+
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_FWNODE_MDIO=y
+CONFIG_ACPI_MDIO=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MVUSB=m
+CONFIG_MDIO_MSCC_MIIM=m
+
+#
+# MDIO Multiplexers
+#
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+CONFIG_PCS_LYNX=m
+CONFIG_PCS_MTK_LYNXI=m
+CONFIG_PCS_ALTERA_TSE=m
+# end of PCS device drivers
+
+CONFIG_PLIP=m
+CONFIG_PPP=y
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=y
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8153_ECM=m
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_COMMON_DEBUG=y
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+CONFIG_ATH9K_DEBUGFS=y
+CONFIG_ATH9K_STATION_STATISTICS=y
+# CONFIG_ATH9K_DYNACK is not set
+CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_PCI_NO_EEPROM=m
+CONFIG_ATH9K_HTC=m
+CONFIG_ATH9K_HTC_DEBUGFS=y
+CONFIG_ATH9K_HWRNG=y
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+# CONFIG_CARL9170_DEBUGFS is not set
+CONFIG_CARL9170_WPC=y
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_TRACING=y
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_SDIO=m
+CONFIG_ATH10K_USB=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_SPECTRAL is not set
+CONFIG_ATH10K_TRACING=y
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_DEBUGFS is not set
+# CONFIG_ATH11K_TRACING is not set
+CONFIG_ATH12K=m
+# CONFIG_ATH12K_DEBUG is not set
+# CONFIG_ATH12K_TRACING is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+# CONFIG_B43_SDIO is not set
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMSMAC_LEDS=y
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+CONFIG_BRCM_TRACING=y
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_AIRO_CS=m
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_IWLEGACY_DEBUGFS=y
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEBUGFS=y
+CONFIG_IWLWIFI_DEVICE_TRACING=y
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
+CONFIG_P54_LEDS=y
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+# CONFIG_MT76x0U is not set
+# CONFIG_MT76x0E is not set
+# CONFIG_MT76x2E is not set
+# CONFIG_MT76x2U is not set
+# CONFIG_MT7603E is not set
+# CONFIG_MT7615E is not set
+# CONFIG_MT7663U is not set
+# CONFIG_MT7663S is not set
+# CONFIG_MT7915E is not set
+# CONFIG_MT7921E is not set
+# CONFIG_MT7921S is not set
+# CONFIG_MT7921U is not set
+# CONFIG_MT7996E is not set
+CONFIG_WLAN_VENDOR_MICROCHIP=y
+CONFIG_WILC1000=m
+CONFIG_WILC1000_SDIO=m
+CONFIG_WILC1000_SPI=m
+# CONFIG_WILC1000_HW_OOB_INTR is not set
+CONFIG_WLAN_VENDOR_PURELIFI=y
+CONFIG_PLFXLC=m
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_LIB_DEBUGFS is not set
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+# CONFIG_RTW88 is not set
+CONFIG_RTW89=m
+CONFIG_RTW89_CORE=m
+CONFIG_RTW89_PCI=m
+CONFIG_RTW89_8852A=m
+CONFIG_RTW89_8852B=m
+CONFIG_RTW89_8852C=m
+CONFIG_RTW89_8852AE=m
+CONFIG_RTW89_8852BE=m
+CONFIG_RTW89_8852CE=m
+# CONFIG_RTW89_DEBUGMSG is not set
+# CONFIG_RTW89_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+# CONFIG_RSI_DEBUGFS is not set
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_SILABS=y
+CONFIG_WFX=m
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_VIRT_WIFI=m
+CONFIG_WAN=y
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+CONFIG_HDLC_X25=m
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+CONFIG_PC300TOO=m
+CONFIG_N2=m
+CONFIG_C101=m
+CONFIG_FARSYNC=m
+CONFIG_LAPBETHER=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+CONFIG_IEEE802154_MRF24J40=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_CA8210=m
+# CONFIG_IEEE802154_CA8210_DEBUGFS is not set
+CONFIG_IEEE802154_MCR20A=m
+# CONFIG_IEEE802154_HWSIM is not set
+
+#
+# Wireless WAN
+#
+CONFIG_WWAN=y
+# CONFIG_WWAN_DEBUGFS is not set
+# CONFIG_WWAN_HWSIM is not set
+CONFIG_MHI_WWAN_CTRL=m
+CONFIG_MHI_WWAN_MBIM=m
+CONFIG_RPMSG_WWAN_CTRL=m
+CONFIG_IOSM=m
+CONFIG_MTK_T7XX=m
+# end of Wireless WAN
+
+CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
+CONFIG_USB4_NET=m
+CONFIG_HYPERV_NET=m
+CONFIG_NETDEVSIM=m
+CONFIG_NET_FAILOVER=y
+CONFIG_NETDEV_LEGACY_INIT=y
+CONFIG_ISDN=y
+CONFIG_ISDN_CAPI=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_HDLC=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+CONFIG_INPUT_VIVALDIFMAP=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADC=m
+CONFIG_KEYBOARD_ADP5520=m
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_APPLESPI=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+CONFIG_KEYBOARD_DLINK_DIR685=m
+CONFIG_KEYBOARD_LKKBD=m
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_PINEPHONE=m
+CONFIG_KEYBOARD_SAMSUNG=m
+CONFIG_KEYBOARD_STOWAWAY=m
+CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_IQS62X=m
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
+CONFIG_KEYBOARD_TWL4030=m
+CONFIG_KEYBOARD_XTKBD=m
+CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_KEYBOARD_MTK_PMIC=m
+CONFIG_KEYBOARD_CYPRESS_SF=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_PS2_SMBUS=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+# CONFIG_MOUSE_INPORT is not set
+CONFIG_MOUSE_LOGIBM=m
+CONFIG_MOUSE_PC110PAD=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADC=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_JOYSTICK_PSXPAD_SPI=m
+# CONFIG_JOYSTICK_PSXPAD_SPI_FF is not set
+CONFIG_JOYSTICK_PXRC=m
+CONFIG_JOYSTICK_QWIIC=m
+CONFIG_JOYSTICK_FSIA6B=m
+CONFIG_JOYSTICK_SENSEHAT=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_88PM860X=m
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ADC=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_BU21029=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
+CONFIG_TOUCHSCREEN_CY8CTMA140=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP5=m
+CONFIG_TOUCHSCREEN_DA9034=m
+CONFIG_TOUCHSCREEN_DA9052=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_EXC3000=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_HIDEEP=m
+CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
+CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_ILITEK=m
+CONFIG_TOUCHSCREEN_S6SY761=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_EKTF2127=m
+CONFIG_TOUCHSCREEN_ELAN=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
+CONFIG_TOUCHSCREEN_MSG2638=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS=m
+CONFIG_TOUCHSCREEN_IMAGIS=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_HTCPEN=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM831X=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
+CONFIG_TOUCHSCREEN_PCAP=m
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_STMFTS=m
+CONFIG_TOUCHSCREEN_SUR40=m
+CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZET6223=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_ZINITIX=m
+CONFIG_TOUCHSCREEN_HIMAX_HX83112B=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_88PM860X_ONKEY=m
+CONFIG_INPUT_88PM80X_ONKEY=m
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_ARIZONA_HAPTICS=m
+CONFIG_INPUT_ATC260X_ONKEY=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77693_HAPTIC=m
+CONFIG_INPUT_MAX8925_ONKEY=m
+CONFIG_INPUT_MAX8997_HAPTIC=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GPIO_BEEPER=m
+CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
+CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_TWL4030_PWRBUTTON=m
+CONFIG_INPUT_TWL4030_VIBRA=m
+CONFIG_INPUT_TWL6040_VIBRA=m
+CONFIG_INPUT_UINPUT=y
+CONFIG_INPUT_PALMAS_PWRBUTTON=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_INPUT_PWM_VIBRA=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_DA7280_HAPTICS=m
+CONFIG_INPUT_DA9052_ONKEY=m
+CONFIG_INPUT_DA9055_ONKEY=m
+CONFIG_INPUT_DA9063_ONKEY=m
+CONFIG_INPUT_WM831X_ON=m
+CONFIG_INPUT_PCAP=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IBM_PANEL=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_IQS269A=m
+CONFIG_INPUT_IQS626A=m
+CONFIG_INPUT_IQS7222=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_INPUT_RAVE_SP_PWRBUTTON=m
+CONFIG_INPUT_RT5120_PWRKEY=m
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+# CONFIG_RMI4_F34 is not set
+CONFIG_RMI4_F3A=y
+# CONFIG_RMI4_F54 is not set
+CONFIG_RMI4_F55=y
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
+CONFIG_SERIO_GPIO_PS2=m
+CONFIG_USERIO=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=0
+# CONFIG_LEGACY_TIOCSTI is not set
+CONFIG_LDISC_AUTOLOAD=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
+# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
+# CONFIG_SERIAL_8250_FINTEK is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCILIB=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=m
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_MEN_MCB=m
+CONFIG_SERIAL_8250_NR_UARTS=48
+CONFIG_SERIAL_8250_RUNTIME_UARTS=32
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_FOURPORT=m
+CONFIG_SERIAL_8250_ACCENT=m
+CONFIG_SERIAL_8250_BOCA=m
+CONFIG_SERIAL_8250_EXAR_ST16C554=m
+CONFIG_SERIAL_8250_HUB6=m
+CONFIG_SERIAL_8250_PCI1XXXX=m
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_DWLIB=y
+CONFIG_SERIAL_8250_DFL=m
+CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_8250_LPSS=m
+CONFIG_SERIAL_8250_MID=m
+CONFIG_SERIAL_8250_PERICOM=m
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_KGDB_NMI=y
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_MAX310X=y
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_CONSOLE_POLL=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_LANTIQ=m
+CONFIG_SERIAL_SCCNXP=y
+CONFIG_SERIAL_SCCNXP_CONSOLE=y
+CONFIG_SERIAL_SC16IS7XX_CORE=m
+CONFIG_SERIAL_SC16IS7XX=m
+CONFIG_SERIAL_SC16IS7XX_I2C=y
+CONFIG_SERIAL_SC16IS7XX_SPI=y
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_PCH_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_FSL_LINFLEXUART=m
+CONFIG_SERIAL_MEN_Z135=m
+# CONFIG_SERIAL_SPRD is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+CONFIG_IPWIRELESS=m
+CONFIG_N_GSM=m
+CONFIG_NOZOMI=m
+CONFIG_NULL_TTY=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_RPMSG_TTY=m
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+CONFIG_TTY_PRINTK=y
+CONFIG_TTY_PRINTK_LEVEL=6
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DMI_DECODE=y
+CONFIG_IPMI_PLAT_DATA=y
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_IPMB=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_SSIF_IPMI_BMC=m
+CONFIG_IPMB_DEVICE_INTERFACE=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_BA431=m
+CONFIG_HW_RANDOM_GEODE=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_DTLK=m
+CONFIG_APPLICOM=m
+CONFIG_SONYPI=m
+CONFIG_MWAVE=m
+CONFIG_SCx200_GPIO=m
+CONFIG_PC8736x_GPIO=m
+CONFIG_NSC_GPIO=m
+CONFIG_DEVMEM=y
+CONFIG_NVRAM=m
+CONFIG_DEVPORT=y
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=y
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TIS_CORE=y
+CONFIG_TCG_TIS=y
+CONFIG_TCG_TIS_SPI=m
+# CONFIG_TCG_TIS_SPI_CR50 is not set
+CONFIG_TCG_TIS_I2C=m
+# CONFIG_TCG_TIS_I2C_CR50 is not set
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_XEN=m
+CONFIG_TCG_CRB=y
+CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TCG_TIS_ST33ZP24_SPI=m
+CONFIG_TELCLOCK=m
+CONFIG_XILLYBUS_CLASS=m
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+CONFIG_XILLYUSB=m
+# end of Character devices
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_CCGX_UCSI=m
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_CHT_WC=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_CBUS_GPIO=m
+CONFIG_I2C_DESIGNWARE_CORE=y
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EG20T=m
+CONFIG_I2C_EMEV2=m
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+CONFIG_I2C_KEMPLD=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
+CONFIG_I2C_CP2615=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PCI1XXXX=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_PCA_ISA=m
+CONFIG_I2C_CROS_EC_TUNNEL=m
+CONFIG_SCx200_ACB=m
+CONFIG_I2C_VIRTIO=m
+# end of I2C Hardware Bus support
+
+CONFIG_I2C_STUB=m
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+# CONFIG_I2C_SLAVE_TESTUNIT is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+CONFIG_I3C=m
+CONFIG_CDNS_I3C_MASTER=m
+CONFIG_DW_I3C_MASTER=m
+CONFIG_SVC_I3C_MASTER=m
+# CONFIG_MIPI_I3C_HCI is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ALTERA=m
+CONFIG_SPI_ALTERA_CORE=m
+CONFIG_SPI_ALTERA_DFL=m
+CONFIG_SPI_AXI_SPI_ENGINE=m
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_CADENCE=m
+CONFIG_SPI_DESIGNWARE=m
+# CONFIG_SPI_DW_DMA is not set
+CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_DW_MMIO=m
+CONFIG_SPI_DLN2=m
+CONFIG_SPI_GPIO=m
+# CONFIG_SPI_INTEL_PCI is not set
+# CONFIG_SPI_INTEL_PLATFORM is not set
+CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_MICROCHIP_CORE=m
+CONFIG_SPI_MICROCHIP_CORE_QSPI=m
+CONFIG_SPI_LANTIQ_SSC=m
+CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_PCI1XXXX=m
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+CONFIG_SPI_SC18IS602=m
+CONFIG_SPI_SIFIVE=m
+CONFIG_SPI_MXIC=m
+CONFIG_SPI_TOPCLIFF_PCH=m
+CONFIG_SPI_XCOMM=m
+# CONFIG_SPI_XILINX is not set
+CONFIG_SPI_ZYNQMP_GQSPI=m
+CONFIG_SPI_AMD=m
+
+#
+# SPI Multiplexer support
+#
+CONFIG_SPI_MUX=m
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+# CONFIG_SPI_LOOPBACK_TEST is not set
+CONFIG_SPI_TLE62X0=m
+# CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
+CONFIG_SPMI=m
+# CONFIG_SPMI_HISI3670 is not set
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=m
+CONFIG_PTP_1588_CLOCK_OPTIONAL=m
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PTP_1588_CLOCK_PCH=m
+CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_IDT82P33=m
+CONFIG_PTP_1588_CLOCK_IDTCM=m
+# CONFIG_PTP_1588_CLOCK_VMW is not set
+CONFIG_PTP_1588_CLOCK_OCP=m
+CONFIG_PTP_DFL_TOD=m
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_CY8C95X0=m
+# CONFIG_PINCTRL_DA9062 is not set
+CONFIG_PINCTRL_MCP23S08_I2C=m
+CONFIG_PINCTRL_MCP23S08_SPI=m
+CONFIG_PINCTRL_MCP23S08=m
+CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_MADERA=m
+
+#
+# Intel pinctrl drivers
+#
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_LYNXPOINT=m
+CONFIG_PINCTRL_INTEL=y
+CONFIG_PINCTRL_ALDERLAKE=m
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_DENVERTON=m
+CONFIG_PINCTRL_ELKHARTLAKE=m
+CONFIG_PINCTRL_EMMITSBURG=m
+CONFIG_PINCTRL_GEMINILAKE=m
+CONFIG_PINCTRL_ICELAKE=m
+CONFIG_PINCTRL_JASPERLAKE=m
+CONFIG_PINCTRL_LAKEFIELD=m
+CONFIG_PINCTRL_LEWISBURG=m
+CONFIG_PINCTRL_METEORLAKE=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_TIGERLAKE=m
+# end of Intel pinctrl drivers
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_REGMAP=m
+CONFIG_GPIO_MAX730X=m
+CONFIG_GPIO_IDIO_16=m
+
+#
+# Memory mapped GPIO drivers
+#
+CONFIG_GPIO_AMDPT=m
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_EXAR=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_ICH=m
+CONFIG_GPIO_MB86S7X=m
+CONFIG_GPIO_MENZ127=m
+CONFIG_GPIO_TANGIER=m
+CONFIG_GPIO_VX855=m
+CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
+
+#
+# Port-mapped I/O GPIO drivers
+#
+CONFIG_GPIO_F7188X=m
+CONFIG_GPIO_IT87=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_SCH311X=m
+CONFIG_GPIO_WINBOND=m
+CONFIG_GPIO_WS16C48=m
+# end of Port-mapped I/O GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_FXL6408=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCA9570=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_ADP5520=m
+CONFIG_GPIO_ARIZONA=m
+CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_CRYSTAL_COVE=m
+CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_DA9052=m
+CONFIG_GPIO_DA9055=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_ELKHARTLAKE=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_KEMPLD=m
+CONFIG_GPIO_LP3943=m
+CONFIG_GPIO_LP873X=m
+CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_PALMAS=y
+CONFIG_GPIO_RC5T583=y
+CONFIG_GPIO_TIMBERDALE=y
+CONFIG_GPIO_TPS65086=m
+CONFIG_GPIO_TPS6586X=y
+CONFIG_GPIO_TPS65910=y
+CONFIG_GPIO_TPS65912=m
+CONFIG_GPIO_TPS68470=m
+CONFIG_GPIO_TQMX86=m
+CONFIG_GPIO_TWL4030=m
+CONFIG_GPIO_TWL6040=m
+CONFIG_GPIO_WHISKEY_COVE=m
+CONFIG_GPIO_WM831X=m
+CONFIG_GPIO_WM8350=m
+CONFIG_GPIO_WM8994=m
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_AMD8111=m
+CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_PCH=m
+CONFIG_GPIO_PCI_IDIO_16=m
+CONFIG_GPIO_PCIE_IDIO_24=m
+CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+CONFIG_GPIO_MAX3191X=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MC33880=m
+CONFIG_GPIO_PISOSR=m
+CONFIG_GPIO_XRA1403=m
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_LATCH=m
+# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_VIRTIO=m
+# CONFIG_GPIO_SIM is not set
+# end of Virtual GPIO drivers
+
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_GPIO=m
+CONFIG_W1_MASTER_SGI=m
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2405=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2408_READBACK=y
+CONFIG_W1_SLAVE_DS2413=m
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2430=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2438=m
+CONFIG_W1_SLAVE_DS250X=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_ATC260X=m
+# CONFIG_POWER_RESET_MT6323 is not set
+CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_RESET_TPS65086=y
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_GENERIC_ADC_BATTERY=m
+CONFIG_IP5XXX_POWER=m
+CONFIG_MAX8925_POWER=m
+CONFIG_WM831X_BACKUP=m
+CONFIG_WM831X_POWER=m
+CONFIG_WM8350_POWER=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_88PM860X=m
+CONFIG_CHARGER_ADP5061=m
+CONFIG_BATTERY_CW2015=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+# CONFIG_BATTERY_SAMSUNG_SDI is not set
+CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_SBS=m
+CONFIG_MANAGER_SBS=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+CONFIG_BATTERY_DA9030=m
+CONFIG_BATTERY_DA9052=m
+CONFIG_CHARGER_DA9150=m
+CONFIG_BATTERY_DA9150=m
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+CONFIG_AXP288_CHARGER=m
+CONFIG_AXP288_FUEL_GAUGE=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_BATTERY_MAX1721X=m
+CONFIG_BATTERY_TWL4030_MADC=m
+CONFIG_CHARGER_88PM860X=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_BATTERY_RX51=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_TWL4030=m
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_LP8788=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_CHARGER_MANAGER=y
+CONFIG_CHARGER_LT3651=m
+CONFIG_CHARGER_LTC4162L=m
+CONFIG_CHARGER_MAX14577=m
+CONFIG_CHARGER_MAX77693=m
+CONFIG_CHARGER_MAX77976=m
+CONFIG_CHARGER_MAX8997=m
+CONFIG_CHARGER_MAX8998=m
+CONFIG_CHARGER_MP2629=m
+CONFIG_CHARGER_MT6360=m
+CONFIG_CHARGER_MT6370=m
+CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ2515X=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_BQ25980=m
+CONFIG_CHARGER_BQ256XX=m
+CONFIG_CHARGER_SMB347=m
+CONFIG_CHARGER_TPS65090=m
+CONFIG_BATTERY_GAUGE_LTC2941=m
+CONFIG_BATTERY_GOLDFISH=m
+CONFIG_BATTERY_RT5033=m
+CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_RT9467=m
+CONFIG_CHARGER_RT9471=m
+CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_CROS_PCHG=m
+CONFIG_CHARGER_BD99954=m
+CONFIG_CHARGER_WILCO=m
+CONFIG_BATTERY_UG3105=m
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_SMPRO=m
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM1177=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_AHT10=m
+CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
+CONFIG_SENSORS_AS370=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_AXI_FAN_CONTROL=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORSAIR_CPRO=m
+CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_DRIVETEMP=y
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DELL_SMM=m
+# CONFIG_I8K is not set
+CONFIG_SENSORS_DA9052_ADC=m
+CONFIG_SENSORS_DA9055=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2947=m
+CONFIG_SENSORS_LTC2947_I2C=m
+CONFIG_SENSORS_LTC2947_SPI=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC2992=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX127=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX31730=m
+CONFIG_SENSORS_MAX31760=m
+CONFIG_SENSORS_MAX6620=m
+CONFIG_SENSORS_MAX6621=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MC34VR500=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_TC654=m
+CONFIG_SENSORS_TPS23861=m
+CONFIG_SENSORS_MENF21BMC_HWMON=m
+CONFIG_SENSORS_MR75203=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775_CORE=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT6775_I2C=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_NZXT_KRAKEN2=m
+CONFIG_SENSORS_NZXT_SMART2=m
+CONFIG_SENSORS_OCC_P8_I2C=m
+CONFIG_SENSORS_OCC=m
+CONFIG_SENSORS_OXP=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ACBEL_FSG032=m
+CONFIG_SENSORS_ADM1266=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_BEL_PFE=m
+CONFIG_SENSORS_BPA_RS600=m
+CONFIG_SENSORS_DELTA_AHE50DC_FAN=m
+CONFIG_SENSORS_FSP_3Y=m
+CONFIG_SENSORS_IBM_CFFPS=m
+CONFIG_SENSORS_DPS920AB=m
+CONFIG_SENSORS_INSPUR_IPSPS=m
+CONFIG_SENSORS_IR35221=m
+CONFIG_SENSORS_IR36021=m
+CONFIG_SENSORS_IR38064=m
+CONFIG_SENSORS_IR38064_REGULATOR=y
+CONFIG_SENSORS_IRPS5401=m
+CONFIG_SENSORS_ISL68137=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LM25066_REGULATOR=y
+CONFIG_SENSORS_LT7182S=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_LTC2978_REGULATOR=y
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX15301=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX16601=m
+CONFIG_SENSORS_MAX20730=m
+CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX31785=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_MP2888=m
+CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP5023=m
+CONFIG_SENSORS_MPQ7932_REGULATOR=y
+CONFIG_SENSORS_MPQ7932=m
+CONFIG_SENSORS_PIM4328=m
+CONFIG_SENSORS_PLI1209BC=m
+CONFIG_SENSORS_PLI1209BC_REGULATOR=y
+CONFIG_SENSORS_PM6764TR=m
+CONFIG_SENSORS_PXE1610=m
+CONFIG_SENSORS_Q54SJ108A2=m
+CONFIG_SENSORS_STPDDC60=m
+CONFIG_SENSORS_TDA38640=m
+CONFIG_SENSORS_TDA38640_REGULATOR=y
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_TPS53679=m
+CONFIG_SENSORS_TPS546D24=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_XDPE152=m
+CONFIG_SENSORS_XDPE122=m
+CONFIG_SENSORS_XDPE122_REGULATOR=y
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SBTSI=m
+CONFIG_SENSORS_SBRMI=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHT4x=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SY7636A=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC2305=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_STTS751=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_INA238=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_TC74=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP108=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_TMP464=m
+CONFIG_SENSORS_TMP513=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_WM831X=m
+CONFIG_SENSORS_WM8350=m
+CONFIG_SENSORS_XGENE=m
+CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_ASUS_WMI=m
+CONFIG_SENSORS_ASUS_EC=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_NETLINK=y
+# CONFIG_THERMAL_STATISTICS is not set
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_ACPI=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_DEVFREQ_THERMAL=y
+CONFIG_THERMAL_EMULATION=y
+
+#
+# Intel thermal drivers
+#
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_INTEL_TCC=y
+CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
+CONFIG_INTEL_SOC_DTS_THERMAL=m
+CONFIG_INTEL_QUARK_DTS_THERMAL=m
+
+#
+# ACPI INT340X thermal drivers
+#
+# end of ACPI INT340X thermal drivers
+
+CONFIG_INTEL_BXT_PMIC_THERMAL=m
+CONFIG_INTEL_PCH_THERMAL=m
+CONFIG_INTEL_TCC_COOLING=m
+CONFIG_INTEL_HFI_THERMAL=y
+# end of Intel thermal drivers
+
+CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT=y
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_DA9052_WATCHDOG=m
+CONFIG_DA9055_WATCHDOG=m
+CONFIG_DA9063_WATCHDOG=m
+CONFIG_DA9062_WATCHDOG=m
+CONFIG_MENF21BMC_WATCHDOG=m
+CONFIG_MENZ069_WATCHDOG=m
+CONFIG_WDAT_WDT=m
+CONFIG_WM831X_WATCHDOG=m
+CONFIG_WM8350_WATCHDOG=m
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_RAVE_SP_WATCHDOG=m
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_TWL4030_WATCHDOG=m
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ADVANTECH_EC_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_EBC_C384_WDT=m
+CONFIG_EXAR_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_KEMPLD_WDT=m
+CONFIG_SC1200_WDT=m
+CONFIG_SCx200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_RDC321X_WDT=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_SBC7240_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_TQMX86_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_NI903X_WDT=m
+CONFIG_NIC7018_WDT=m
+CONFIG_SIEMENS_SIMATIC_IPC_WDT=m
+CONFIG_MEN_A21_WDT=m
+CONFIG_XEN_WDT=m
+
+#
+# ISA-based Watchdog Cards
+#
+CONFIG_PCWATCHDOG=m
+CONFIG_MIXCOMWD=m
+CONFIG_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+# CONFIG_SSB_PCMCIAHOST is not set
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_HOST_SOC=y
+CONFIG_BCMA_DRIVER_PCI=y
+CONFIG_BCMA_SFLASH=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+CONFIG_MFD_CS5535=m
+CONFIG_MFD_AS3711=y
+CONFIG_MFD_SMPRO=m
+CONFIG_PMIC_ADP5520=y
+CONFIG_MFD_AAT2870_CORE=y
+CONFIG_MFD_BCM590XX=m
+CONFIG_MFD_BD9571MWV=m
+CONFIG_MFD_AXP20X=m
+CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_MADERA=m
+CONFIG_MFD_MADERA_I2C=m
+CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
+# CONFIG_MFD_CS47L35 is not set
+# CONFIG_MFD_CS47L85 is not set
+# CONFIG_MFD_CS47L90 is not set
+# CONFIG_MFD_CS47L92 is not set
+CONFIG_PMIC_DA903X=y
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
+CONFIG_MFD_DA9052_I2C=y
+CONFIG_MFD_DA9055=y
+CONFIG_MFD_DA9062=m
+CONFIG_MFD_DA9063=y
+CONFIG_MFD_DA9150=m
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_MFD_MP2629=m
+CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+CONFIG_INTEL_SOC_PMIC=y
+CONFIG_INTEL_SOC_PMIC_BXTWC=m
+CONFIG_INTEL_SOC_PMIC_CHTWC=y
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_MRFLD=m
+CONFIG_MFD_INTEL_LPSS=m
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_PMC_BXT=m
+CONFIG_MFD_IQS62X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_KEMPLD=m
+CONFIG_MFD_88PM800=m
+CONFIG_MFD_88PM805=m
+CONFIG_MFD_88PM860X=y
+CONFIG_MFD_MAX14577=y
+CONFIG_MFD_MAX77693=y
+CONFIG_MFD_MAX77843=y
+CONFIG_MFD_MAX8907=m
+CONFIG_MFD_MAX8925=y
+CONFIG_MFD_MAX8997=y
+CONFIG_MFD_MAX8998=y
+CONFIG_MFD_MT6360=m
+CONFIG_MFD_MT6370=m
+CONFIG_MFD_MT6397=m
+CONFIG_MFD_MENF21BMC=m
+CONFIG_MFD_OCELOT=m
+CONFIG_EZX_PCAP=y
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_MFD_SY7636A=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RT4831=m
+CONFIG_MFD_RT5033=m
+CONFIG_MFD_RT5120=m
+CONFIG_MFD_RC5T583=y
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SIMPLE_MFD_I2C=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_SKY81452=m
+CONFIG_MFD_STA2X11=y
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
+CONFIG_MFD_LP8788=y
+CONFIG_MFD_TI_LMU=m
+CONFIG_MFD_PALMAS=y
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65086=m
+CONFIG_MFD_TPS65090=y
+CONFIG_MFD_TI_LP873X=m
+CONFIG_MFD_TPS6586X=y
+CONFIG_MFD_TPS65910=y
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
+CONFIG_MFD_TPS65912_SPI=y
+CONFIG_TWL4030_CORE=y
+CONFIG_MFD_TWL4030_AUDIO=y
+CONFIG_TWL6040_CORE=y
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_MFD_TQMX86=m
+CONFIG_MFD_VX855=m
+CONFIG_MFD_ARIZONA=m
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_ARIZONA_SPI=m
+CONFIG_MFD_CS47L24=y
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+CONFIG_MFD_WM8997=y
+CONFIG_MFD_WM8998=y
+CONFIG_MFD_WM8400=y
+CONFIG_MFD_WM831X=y
+CONFIG_MFD_WM831X_I2C=y
+CONFIG_MFD_WM831X_SPI=y
+CONFIG_MFD_WM8350=y
+CONFIG_MFD_WM8350_I2C=y
+CONFIG_MFD_WM8994=m
+CONFIG_MFD_ATC260X=m
+CONFIG_MFD_ATC260X_I2C=m
+CONFIG_RAVE_SP_CORE=m
+CONFIG_MFD_INTEL_M10_BMC_CORE=m
+CONFIG_MFD_INTEL_M10_BMC_SPI=m
+CONFIG_MFD_INTEL_M10_BMC_PMCI=m
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_88PG86X=m
+CONFIG_REGULATOR_88PM800=m
+CONFIG_REGULATOR_88PM8607=m
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_AAT2870=m
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AS3711=m
+CONFIG_REGULATOR_ATC260X=m
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BCM590XX=m
+CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_DA903X=m
+CONFIG_REGULATOR_DA9052=m
+CONFIG_REGULATOR_DA9055=m
+CONFIG_REGULATOR_DA9062=m
+CONFIG_REGULATOR_DA9210=m
+CONFIG_REGULATOR_DA9211=m
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LM363X=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_LP8788=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_LTC3676=m
+CONFIG_REGULATOR_MAX14577=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8893=m
+CONFIG_REGULATOR_MAX8907=m
+CONFIG_REGULATOR_MAX8925=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MAX8997=m
+CONFIG_REGULATOR_MAX8998=m
+CONFIG_REGULATOR_MAX20086=m
+CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX77693=m
+CONFIG_REGULATOR_MAX77826=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_MP8859=m
+CONFIG_REGULATOR_MT6311=m
+CONFIG_REGULATOR_MT6315=m
+CONFIG_REGULATOR_MT6323=m
+CONFIG_REGULATOR_MT6331=m
+CONFIG_REGULATOR_MT6332=m
+CONFIG_REGULATOR_MT6357=m
+CONFIG_REGULATOR_MT6358=m
+CONFIG_REGULATOR_MT6359=m
+CONFIG_REGULATOR_MT6360=m
+CONFIG_REGULATOR_MT6370=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PALMAS=m
+CONFIG_REGULATOR_PCA9450=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PV88060=m
+CONFIG_REGULATOR_PV88080=m
+CONFIG_REGULATOR_PV88090=m
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_QCOM_USB_VBUS=m
+CONFIG_REGULATOR_RC5T583=m
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RT4803=m
+CONFIG_REGULATOR_RT4831=m
+CONFIG_REGULATOR_RT5033=m
+CONFIG_REGULATOR_RT5120=m
+CONFIG_REGULATOR_RT5190A=m
+CONFIG_REGULATOR_RT5739=m
+CONFIG_REGULATOR_RT5759=m
+CONFIG_REGULATOR_RT6160=m
+CONFIG_REGULATOR_RT6190=m
+CONFIG_REGULATOR_RT6245=m
+CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTMV20=m
+CONFIG_REGULATOR_RTQ6752=m
+CONFIG_REGULATOR_SKY81452=m
+CONFIG_REGULATOR_SLG51000=m
+CONFIG_REGULATOR_SY7636A=m
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65086=m
+CONFIG_REGULATOR_TPS65090=m
+CONFIG_REGULATOR_TPS65132=m
+CONFIG_REGULATOR_TPS6524X=m
+CONFIG_REGULATOR_TPS6586X=m
+CONFIG_REGULATOR_TPS65910=m
+CONFIG_REGULATOR_TPS65912=m
+CONFIG_REGULATOR_TPS68470=m
+CONFIG_REGULATOR_TWL4030=m
+CONFIG_REGULATOR_WM831X=m
+CONFIG_REGULATOR_WM8350=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_WM8994=m
+CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_RC_CORE=m
+CONFIG_LIRC=y
+CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_IR_ENE=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_TOY=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_RC_XBOX_DVD=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_CEC_PIN=y
+
+#
+# CEC support
+#
+CONFIG_MEDIA_CEC_RC=y
+# CONFIG_CEC_PIN_ERROR_INJ is not set
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_CEC_CH7322=m
+CONFIG_CEC_CROS_EC=m
+CONFIG_CEC_GPIO=m
+CONFIG_CEC_SECO=m
+CONFIG_CEC_SECO_RC=y
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+# end of CEC support
+
+CONFIG_MEDIA_SUPPORT=m
+# CONFIG_MEDIA_SUPPORT_FILTER is not set
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+
+#
+# Media device types
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+CONFIG_MEDIA_TEST_SUPPORT=y
+# end of Media device types
+
+#
+# Media core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_DVB_CORE=m
+# end of Media core support
+
+#
+# Video4Linux options
+#
+CONFIG_VIDEO_V4L2_I2C=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_V4L2_ASYNC=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+# end of Video4Linux options
+
+#
+# Media controller options
+#
+CONFIG_MEDIA_CONTROLLER_DVB=y
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
+# end of Media controller options
+
+#
+# Digital TV options
+#
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+# end of Digital TV options
+
+#
+# Media drivers
+#
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_GSPCA=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_AS102=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_ZD1301=m
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_CXUSB_ANALOG=y
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_STA2X11_VIP=m
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=m
+# CONFIG_VIDEO_ZORAN is not set
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_DT3155=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+# CONFIG_VIDEO_FB_IVTV_FORCE_PAT is not set
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_COBALT=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7134_GO7007=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_DM1105=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_VIDEO_IPU3_CIO2=m
+CONFIG_CIO2_BRIDGE=y
+CONFIG_RADIO_ADAPTERS=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_RADIO_SI4713=m
+CONFIG_RADIO_SI476X=m
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_WL1273=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_MA901=m
+CONFIG_USB_MR800=m
+CONFIG_USB_RAREMONO=m
+CONFIG_RADIO_SI470X=m
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_USB_SI4713=m
+CONFIG_PLATFORM_SI4713=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_WL128X=m
+CONFIG_V4L_RADIO_ISA_DRIVERS=y
+CONFIG_RADIO_AZTECH=m
+CONFIG_RADIO_CADET=m
+CONFIG_RADIO_GEMTEK=m
+CONFIG_RADIO_ISA=m
+CONFIG_RADIO_MIROPCM20=m
+CONFIG_RADIO_RTRACK=m
+CONFIG_RADIO_RTRACK2=m
+CONFIG_RADIO_SF16FMI=m
+CONFIG_RADIO_SF16FMR2=m
+CONFIG_RADIO_TERRATEC=m
+CONFIG_RADIO_TRUST=m
+CONFIG_RADIO_TYPHOON=m
+CONFIG_RADIO_ZOLTRIX=m
+CONFIG_MEDIA_PLATFORM_DRIVERS=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SDR_PLATFORM_DRIVERS=y
+CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+
+#
+# Allegro DVT media platform drivers
+#
+
+#
+# Amlogic media platform drivers
+#
+
+#
+# Amphion drivers
+#
+
+#
+# Aspeed media platform drivers
+#
+
+#
+# Atmel media platform drivers
+#
+
+#
+# Cadence media platform drivers
+#
+CONFIG_VIDEO_CADENCE_CSI2RX=m
+CONFIG_VIDEO_CADENCE_CSI2TX=m
+
+#
+# Chips&Media media platform drivers
+#
+
+#
+# Intel media platform drivers
+#
+
+#
+# Marvell media platform drivers
+#
+CONFIG_VIDEO_CAFE_CCIC=m
+
+#
+# Mediatek media platform drivers
+#
+
+#
+# Microchip Technology, Inc. media platform drivers
+#
+
+#
+# NVidia media platform drivers
+#
+
+#
+# NXP media platform drivers
+#
+
+#
+# Qualcomm media platform drivers
+#
+
+#
+# Renesas media platform drivers
+#
+
+#
+# Rockchip media platform drivers
+#
+
+#
+# Samsung media platform drivers
+#
+
+#
+# STMicroelectronics media platform drivers
+#
+
+#
+# Sunxi media platform drivers
+#
+
+#
+# Texas Instruments drivers
+#
+
+#
+# Verisilicon media platform drivers
+#
+
+#
+# VIA media platform drivers
+#
+CONFIG_VIDEO_VIA_CAMERA=m
+
+#
+# Xilinx media platform drivers
+#
+
+#
+# MMC/SDIO DVB adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIM2M=m
+CONFIG_VIDEO_VICODEC=m
+# CONFIG_VIDEO_VIMC is not set
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_CEC=y
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+# CONFIG_VIDEO_VISL is not set
+# CONFIG_DVB_TEST_DRIVERS is not set
+
+#
+# FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_TTPCI_EEPROM=m
+CONFIG_UVC_COMMON=m
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+CONFIG_SMS_SIANO_DEBUGFS=y
+CONFIG_VIDEO_V4L2_TPG=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+# end of Media drivers
+
+#
+# Media ancillary drivers
+#
+CONFIG_MEDIA_ATTACH=y
+
+#
+# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
+#
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_APTINA_PLL=m
+CONFIG_VIDEO_CCS_PLL=m
+CONFIG_VIDEO_AR0521=m
+CONFIG_VIDEO_HI556=m
+CONFIG_VIDEO_HI846=m
+CONFIG_VIDEO_HI847=m
+CONFIG_VIDEO_IMX208=m
+CONFIG_VIDEO_IMX214=m
+CONFIG_VIDEO_IMX219=m
+CONFIG_VIDEO_IMX258=m
+CONFIG_VIDEO_IMX274=m
+CONFIG_VIDEO_IMX290=m
+CONFIG_VIDEO_IMX296=m
+CONFIG_VIDEO_IMX319=m
+CONFIG_VIDEO_IMX355=m
+CONFIG_VIDEO_MAX9271_LIB=m
+CONFIG_VIDEO_MT9M001=m
+CONFIG_VIDEO_MT9M111=m
+CONFIG_VIDEO_MT9P031=m
+CONFIG_VIDEO_MT9T112=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
+CONFIG_VIDEO_MT9V111=m
+CONFIG_VIDEO_OG01A1B=m
+CONFIG_VIDEO_OV02A10=m
+CONFIG_VIDEO_OV08D10=m
+CONFIG_VIDEO_OV08X40=m
+CONFIG_VIDEO_OV13858=m
+CONFIG_VIDEO_OV13B10=m
+CONFIG_VIDEO_OV2640=m
+CONFIG_VIDEO_OV2659=m
+CONFIG_VIDEO_OV2680=m
+CONFIG_VIDEO_OV2685=m
+CONFIG_VIDEO_OV2740=m
+CONFIG_VIDEO_OV4689=m
+CONFIG_VIDEO_OV5647=m
+CONFIG_VIDEO_OV5648=m
+CONFIG_VIDEO_OV5670=m
+CONFIG_VIDEO_OV5675=m
+CONFIG_VIDEO_OV5693=m
+CONFIG_VIDEO_OV5695=m
+CONFIG_VIDEO_OV6650=m
+CONFIG_VIDEO_OV7251=m
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_OV772X=m
+CONFIG_VIDEO_OV7740=m
+CONFIG_VIDEO_OV8856=m
+CONFIG_VIDEO_OV8858=m
+CONFIG_VIDEO_OV8865=m
+CONFIG_VIDEO_OV9640=m
+CONFIG_VIDEO_OV9650=m
+CONFIG_VIDEO_OV9734=m
+CONFIG_VIDEO_RDACM20=m
+CONFIG_VIDEO_RDACM21=m
+CONFIG_VIDEO_RJ54N1=m
+CONFIG_VIDEO_S5C73M3=m
+CONFIG_VIDEO_S5K5BAF=m
+CONFIG_VIDEO_S5K6A3=m
+CONFIG_VIDEO_CCS=m
+CONFIG_VIDEO_ET8EK8=m
+# end of Camera sensor devices
+
+#
+# Lens drivers
+#
+CONFIG_VIDEO_AD5820=m
+CONFIG_VIDEO_AK7375=m
+CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9768=m
+CONFIG_VIDEO_DW9807_VCM=m
+# end of Lens drivers
+
+#
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_LM3560=m
+CONFIG_VIDEO_LM3646=m
+# end of Flash devices
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+CONFIG_VIDEO_TDA1997X=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_WM8775=m
+# end of Audio decoders, processors and mixers
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+# end of RDS decoders
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_ADV7604=m
+CONFIG_VIDEO_ADV7604_CEC=y
+CONFIG_VIDEO_ADV7842=m
+CONFIG_VIDEO_ADV7842_CEC=y
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_ML86V7667=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TC358743=m
+CONFIG_VIDEO_TC358743_CEC=y
+CONFIG_VIDEO_TC358746=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_TW9910=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+# end of Video decoders
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_ADV7511_CEC=y
+CONFIG_VIDEO_AK881X=m
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_THS8200=m
+# end of Video encoders
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+# end of Video improvement chips
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+# end of Audio/Video compression chips
+
+#
+# SDR tuner chips
+#
+CONFIG_SDR_MAX2175=m
+# end of SDR tuner chips
+
+#
+# Miscellaneous helper chips
+#
+CONFIG_VIDEO_I2C=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_ST_MIPID02=m
+CONFIG_VIDEO_THS7303=m
+# end of Miscellaneous helper chips
+
+#
+# Media SPI Adapters
+#
+CONFIG_CXD2880_SPI_DRV=m
+CONFIG_VIDEO_GS1662=m
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_XC5000=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_TDA10071=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_GP8PSK_FE=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_RTL2832_SDR=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_CXD2880=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_STV0297=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_VES1820=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_MXL692=m
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+CONFIG_DVB_S921=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_MN88443X=m
+CONFIG_DVB_TC90522=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_A8293=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_HELENE=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBH29=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_DRX39XYJ=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+# end of Customise DVB Frontends
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Media ancillary drivers
+
+#
+# Graphics support
+#
+CONFIG_APERTURE_HELPERS=y
+CONFIG_VIDEO_CMDLINE=y
+CONFIG_VIDEO_NOMODESET=y
+CONFIG_AGP=y
+CONFIG_AGP_ALI=m
+CONFIG_AGP_ATI=m
+CONFIG_AGP_AMD=y
+CONFIG_AGP_AMD64=y
+CONFIG_AGP_INTEL=y
+CONFIG_AGP_NVIDIA=y
+CONFIG_AGP_SIS=m
+CONFIG_AGP_SWORKS=m
+CONFIG_AGP_VIA=y
+CONFIG_AGP_EFFICEON=m
+CONFIG_INTEL_GTT=y
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DBI=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
+# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_DISPLAY_HELPER=m
+CONFIG_DRM_DISPLAY_DP_HELPER=y
+CONFIG_DRM_DISPLAY_HDCP_HELPER=y
+CONFIG_DRM_DISPLAY_HDMI_HELPER=y
+# CONFIG_DRM_DP_AUX_CHARDEV is not set
+# CONFIG_DRM_DP_CEC is not set
+CONFIG_DRM_TTM=m
+CONFIG_DRM_BUDDY=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_TTM_HELPER=m
+CONFIG_DRM_GEM_DMA_HELPER=m
+CONFIG_DRM_GEM_SHMEM_HELPER=m
+CONFIG_DRM_SUBALLOC_HELPER=m
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_I2C_NXP_TDA9950=m
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_USERPTR is not set
+CONFIG_DRM_AMDGPU=m
+# CONFIG_DRM_AMDGPU_SI is not set
+# CONFIG_DRM_AMDGPU_CIK is not set
+CONFIG_DRM_AMDGPU_USERPTR=y
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+# CONFIG_DRM_AMD_ACP is not set
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+CONFIG_DRM_AMD_DC_FP=y
+# CONFIG_DEBUG_KERNEL_DC is not set
+CONFIG_DRM_AMD_SECURE_DISPLAY=y
+# end of Display Engine Configuration
+
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+# CONFIG_NOUVEAU_DEBUG_PUSH is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_FORCE_PROBE=""
+CONFIG_DRM_I915_CAPTURE_ERROR=y
+CONFIG_DRM_I915_COMPRESS_ERROR=y
+CONFIG_DRM_I915_USERPTR=y
+
+#
+# drm/i915 Debugging
+#
+# CONFIG_DRM_I915_WERROR is not set
+# CONFIG_DRM_I915_DEBUG is not set
+# CONFIG_DRM_I915_DEBUG_MMIO is not set
+# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
+# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
+# CONFIG_DRM_I915_DEBUG_GUC is not set
+# CONFIG_DRM_I915_SELFTEST is not set
+# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
+# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
+# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+# end of drm/i915 Debugging
+
+#
+# drm/i915 Profile Guided Optimisation
+#
+CONFIG_DRM_I915_REQUEST_TIMEOUT=20000
+CONFIG_DRM_I915_FENCE_TIMEOUT=10000
+CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
+CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
+CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE=7500
+CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
+CONFIG_DRM_I915_STOP_TIMEOUT=100
+CONFIG_DRM_I915_TIMESLICE_DURATION=1
+# end of drm/i915 Profile Guided Optimisation
+
+CONFIG_DRM_VGEM=m
+# CONFIG_DRM_VKMS is not set
+CONFIG_DRM_VMWGFX=m
+# CONFIG_DRM_VMWGFX_MKSSTATS is not set
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+# CONFIG_DRM_MGAG200 is not set
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_VIRTIO_GPU_KMS=y
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_PANEL_AUO_A030JTN01=m
+CONFIG_DRM_PANEL_ORISETECH_OTA5601A=m
+# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
+CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_ANALOGIX_DP=m
+# end of Display Interface Bridges
+
+# CONFIG_DRM_ETNAVIV is not set
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_GM12U320=m
+CONFIG_DRM_PANEL_MIPI_DBI=m
+# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_TINYDRM_HX8357D=m
+CONFIG_TINYDRM_ILI9163=m
+CONFIG_TINYDRM_ILI9225=m
+CONFIG_TINYDRM_ILI9341=m
+CONFIG_TINYDRM_ILI9486=m
+CONFIG_TINYDRM_MI0283QT=m
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
+CONFIG_TINYDRM_ST7735R=m
+CONFIG_DRM_XEN=y
+CONFIG_DRM_XEN_FRONTEND=m
+CONFIG_DRM_VBOXVIDEO=m
+CONFIG_DRM_GUD=m
+CONFIG_DRM_SSD130X=m
+CONFIG_DRM_SSD130X_I2C=m
+CONFIG_DRM_SSD130X_SPI=m
+CONFIG_DRM_HYPERV=m
+# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+CONFIG_DRM_PRIVACY_SCREEN=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+CONFIG_FB_BACKLIGHT=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+CONFIG_FB_PM2_FIFO_DISCONNECT=y
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
+CONFIG_FB_ARC=m
+CONFIG_FB_ASILIANT=y
+CONFIG_FB_IMSTT=y
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_OPENCORES=m
+CONFIG_FB_S1D13XXX=m
+# CONFIG_FB_NVIDIA is not set
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_I740=m
+CONFIG_FB_I810=m
+# CONFIG_FB_I810_GTF is not set
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+# CONFIG_FB_ATY_GENERIC_LCD is not set
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+# CONFIG_FB_SAVAGE_ACCEL is not set
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+# CONFIG_FB_3DFX_I2C is not set
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+CONFIG_FB_IBM_GXT4500=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=m
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_HYPERV=m
+CONFIG_FB_SIMPLE=y
+CONFIG_FB_SSD1307=m
+CONFIG_FB_SM712=m
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI922X=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+CONFIG_LCD_OTM3225A=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_KTD253=m
+CONFIG_BACKLIGHT_KTZ8866=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_DA903X=m
+CONFIG_BACKLIGHT_DA9052=m
+CONFIG_BACKLIGHT_MAX8925=m
+CONFIG_BACKLIGHT_MT6370=m
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_QCOM_WLED=m
+CONFIG_BACKLIGHT_RT4831=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_WM831X=m
+CONFIG_BACKLIGHT_ADP5520=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_88PM860X=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_BACKLIGHT_AAT2870=m
+CONFIG_BACKLIGHT_LM3630A=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_LP855X=m
+CONFIG_BACKLIGHT_LP8788=m
+CONFIG_BACKLIGHT_PANDORA=m
+CONFIG_BACKLIGHT_SKY81452=m
+CONFIG_BACKLIGHT_AS3711=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+CONFIG_BACKLIGHT_ARCXCNN=m
+CONFIG_BACKLIGHT_RAVE_SP=m
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_MDA_CONSOLE=m
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+# end of Graphics support
+
+CONFIG_DRM_ACCEL=y
+CONFIG_DRM_ACCEL_QAIC=m
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_CTL_FAST_LOOKUP=y
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_CTL_INPUT_VALIDATION=y
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_CTL_LED=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL4_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_OPL4_LIB_SEQ=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+CONFIG_SND_PCSP=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_WSS_LIB=m
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB8_DSP=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_ISA=y
+CONFIG_SND_ADLIB=m
+CONFIG_SND_AD1816A=m
+CONFIG_SND_AD1848=m
+CONFIG_SND_ALS100=m
+CONFIG_SND_AZT1605=m
+CONFIG_SND_AZT2316=m
+CONFIG_SND_AZT2320=m
+CONFIG_SND_CMI8328=m
+CONFIG_SND_CMI8330=m
+CONFIG_SND_CS4231=m
+CONFIG_SND_CS4236=m
+CONFIG_SND_ES1688=m
+CONFIG_SND_ES18XX=m
+CONFIG_SND_SC6000=m
+CONFIG_SND_GUSCLASSIC=m
+CONFIG_SND_GUSEXTREME=m
+CONFIG_SND_GUSMAX=m
+CONFIG_SND_INTERWAVE=m
+CONFIG_SND_INTERWAVE_STB=m
+CONFIG_SND_JAZZ16=m
+CONFIG_SND_OPL3SA2=m
+CONFIG_SND_OPTI92X_AD1848=m
+CONFIG_SND_OPTI92X_CS4231=m
+CONFIG_SND_OPTI93X=m
+CONFIG_SND_MIRO=m
+CONFIG_SND_SB8=m
+CONFIG_SND_SB16=m
+CONFIG_SND_SBAWE=m
+CONFIG_SND_SBAWE_SEQ=m
+CONFIG_SND_SB16_CSP=y
+CONFIG_SND_SSCAPE=m
+CONFIG_SND_WAVEFRONT=m
+CONFIG_SND_MSND_PINNACLE=m
+CONFIG_SND_MSND_CLASSIC=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SIS7019=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_GENERIC_LEDS=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_SCODEC_CS35L41=m
+CONFIG_SND_HDA_CS_DSP_CONTROLS=m
+CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CS8409=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y
+# CONFIG_SND_HDA_CTL_DEV_ID is not set
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_EXT_CORE=m
+CONFIG_SND_HDA_PREALLOC_SIZE=0
+CONFIG_SND_INTEL_NHLT=y
+CONFIG_SND_INTEL_DSP_CONFIG=m
+CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_FIREWIRE_MOTU=m
+CONFIG_SND_FIREFACE=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ACPI=m
+CONFIG_SND_SOC_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=m
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_AMD_ST_ES8336_MACH=m
+CONFIG_SND_SOC_AMD_ACP3x=m
+CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
+CONFIG_SND_SOC_AMD_RENOIR=m
+CONFIG_SND_SOC_AMD_RENOIR_MACH=m
+CONFIG_SND_SOC_AMD_ACP5x=m
+CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
+CONFIG_SND_SOC_AMD_ACP6x=m
+CONFIG_SND_SOC_AMD_YC_MACH=m
+CONFIG_SND_AMD_ACP_CONFIG=m
+CONFIG_SND_SOC_AMD_ACP_COMMON=m
+CONFIG_SND_SOC_AMD_ACP_PDM=m
+CONFIG_SND_SOC_AMD_ACP_I2S=m
+CONFIG_SND_SOC_AMD_ACP_PCM=m
+CONFIG_SND_SOC_AMD_ACP_PCI=m
+CONFIG_SND_AMD_ASOC_RENOIR=m
+CONFIG_SND_AMD_ASOC_REMBRANDT=m
+CONFIG_SND_SOC_AMD_MACH_COMMON=m
+CONFIG_SND_SOC_AMD_LEGACY_MACH=m
+CONFIG_SND_SOC_AMD_SOF_MACH=m
+CONFIG_SND_SOC_AMD_RPL_ACP6x=m
+CONFIG_SND_SOC_AMD_PS=m
+CONFIG_SND_SOC_AMD_PS_MACH=m
+CONFIG_SND_ATMEL_SOC=m
+CONFIG_SND_BCM63XX_I2S_WHISTLER=m
+CONFIG_SND_DESIGNWARE_I2S=m
+# CONFIG_SND_DESIGNWARE_PCM is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+CONFIG_SND_SOC_FSL_ASRC=m
+CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_MQS=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_SPDIF=m
+CONFIG_SND_SOC_FSL_ESAI=m
+CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_FSL_EASRC=m
+CONFIG_SND_SOC_FSL_XCVR=m
+CONFIG_SND_SOC_FSL_UTILS=m
+CONFIG_SND_SOC_FSL_RPMSG=m
+CONFIG_SND_SOC_IMX_AUDMUX=m
+# end of SoC Audio for Freescale CPUs
+
+CONFIG_SND_I2S_HI6210_I2S=m
+# CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
+CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_CATPT=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
+CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SKL=m
+CONFIG_SND_SOC_INTEL_APL=m
+CONFIG_SND_SOC_INTEL_KBL=m
+CONFIG_SND_SOC_INTEL_GLK=m
+CONFIG_SND_SOC_INTEL_CNL=m
+CONFIG_SND_SOC_INTEL_CFL=m
+CONFIG_SND_SOC_INTEL_CML_H=m
+CONFIG_SND_SOC_INTEL_CML_LP=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
+CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
+CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_INTEL_AVS=m
+
+#
+# Intel AVS Machine drivers
+#
+
+#
+# Available DSP configurations
+#
+CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
+# end of Intel AVS Machine drivers
+
+CONFIG_SND_SOC_INTEL_MACH=y
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_REALTEK_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_CIRRUS_COMMON=m
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_WM5102_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m
+CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m
+CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI_DEV=m
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_ACPI_DEV=m
+CONFIG_SND_SOC_SOF_DEBUG_PROBES=m
+CONFIG_SND_SOC_SOF_CLIENT=m
+# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
+CONFIG_SND_SOC_SOF=m
+CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
+CONFIG_SND_SOC_SOF_IPC3=y
+CONFIG_SND_SOC_SOF_INTEL_IPC4=y
+CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m
+CONFIG_SND_SOC_SOF_AMD_COMMON=m
+CONFIG_SND_SOC_SOF_AMD_RENOIR=m
+CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
+CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
+CONFIG_SND_SOC_SOF_INTEL_COMMON=m
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+CONFIG_SND_SOC_SOF_BROADWELL=m
+CONFIG_SND_SOC_SOF_MERRIFIELD=m
+CONFIG_SND_SOC_SOF_INTEL_SKL=m
+CONFIG_SND_SOC_SOF_SKYLAKE=m
+CONFIG_SND_SOC_SOF_KABYLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_APL=m
+CONFIG_SND_SOC_SOF_APOLLOLAKE=m
+CONFIG_SND_SOC_SOF_GEMINILAKE=m
+CONFIG_SND_SOC_SOF_INTEL_CNL=m
+CONFIG_SND_SOC_SOF_CANNONLAKE=m
+CONFIG_SND_SOC_SOF_COFFEELAKE=m
+CONFIG_SND_SOC_SOF_COMETLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_ICL=m
+CONFIG_SND_SOC_SOF_ICELAKE=m
+CONFIG_SND_SOC_SOF_JASPERLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_TGL=m
+CONFIG_SND_SOC_SOF_TIGERLAKE=m
+CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
+CONFIG_SND_SOC_SOF_ALDERLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_MTL=m
+CONFIG_SND_SOC_SOF_METEORLAKE=m
+CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_MLINK=m
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_HDA_PROBES=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_XTENSA=m
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+CONFIG_SND_SOC_XILINX_I2S=m
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
+CONFIG_SND_SOC_XTFPGA_I2S=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+CONFIG_SND_SOC_ARIZONA=m
+CONFIG_SND_SOC_WM_ADSP=m
+CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1372=m
+CONFIG_SND_SOC_ADAU1372_I2C=m
+CONFIG_SND_SOC_ADAU1372_SPI=m
+CONFIG_SND_SOC_ADAU1701=m
+CONFIG_SND_SOC_ADAU17X1=m
+CONFIG_SND_SOC_ADAU1761=m
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_ADAU7118=m
+CONFIG_SND_SOC_ADAU7118_HW=m
+CONFIG_SND_SOC_ADAU7118_I2C=m
+CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4118=m
+CONFIG_SND_SOC_AK4375=m
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK4554=m
+CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK5386=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88395_LIB=m
+CONFIG_SND_SOC_AW88395=m
+CONFIG_SND_SOC_BD28623=m
+CONFIG_SND_SOC_BT_SCO=m
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS35L33=m
+CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
+CONFIG_SND_SOC_CS35L36=m
+CONFIG_SND_SOC_CS35L41_LIB=m
+CONFIG_SND_SOC_CS35L41=m
+CONFIG_SND_SOC_CS35L41_SPI=m
+CONFIG_SND_SOC_CS35L41_I2C=m
+CONFIG_SND_SOC_CS35L45=m
+CONFIG_SND_SOC_CS35L45_SPI=m
+CONFIG_SND_SOC_CS35L45_I2C=m
+CONFIG_SND_SOC_CS35L56=m
+CONFIG_SND_SOC_CS35L56_SHARED=m
+CONFIG_SND_SOC_CS35L56_I2C=m
+CONFIG_SND_SOC_CS35L56_SPI=m
+CONFIG_SND_SOC_CS42L42_CORE=m
+CONFIG_SND_SOC_CS42L42=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
+CONFIG_SND_SOC_CS42L52=m
+CONFIG_SND_SOC_CS42L56=m
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS42L83=m
+CONFIG_SND_SOC_CS4234=m
+CONFIG_SND_SOC_CS4265=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
+CONFIG_SND_SOC_CS4271_SPI=m
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_CS43130=m
+CONFIG_SND_SOC_CS4341=m
+CONFIG_SND_SOC_CS4349=m
+CONFIG_SND_SOC_CS53L30=m
+CONFIG_SND_SOC_CX2072X=m
+CONFIG_SND_SOC_DA7213=m
+CONFIG_SND_SOC_DA7219=m
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES7241=m
+CONFIG_SND_SOC_ES8316=m
+CONFIG_SND_SOC_ES8326=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+CONFIG_SND_SOC_GTM601=m
+CONFIG_SND_SOC_HDAC_HDMI=m
+CONFIG_SND_SOC_HDAC_HDA=m
+CONFIG_SND_SOC_HDA=m
+CONFIG_SND_SOC_ICS43432=m
+CONFIG_SND_SOC_IDT821034=m
+CONFIG_SND_SOC_INNO_RK3036=m
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98357A=m
+CONFIG_SND_SOC_MAX98504=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98520=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX98373_I2C=m
+CONFIG_SND_SOC_MAX98390=m
+CONFIG_SND_SOC_MAX98396=m
+CONFIG_SND_SOC_MAX9860=m
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
+CONFIG_SND_SOC_PCM1681=m
+CONFIG_SND_SOC_PCM1789=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM179X_SPI=m
+CONFIG_SND_SOC_PCM186X=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_PCM3060=m
+CONFIG_SND_SOC_PCM3060_I2C=m
+CONFIG_SND_SOC_PCM3060_SPI=m
+CONFIG_SND_SOC_PCM3168A=m
+CONFIG_SND_SOC_PCM3168A_I2C=m
+CONFIG_SND_SOC_PCM3168A_SPI=m
+CONFIG_SND_SOC_PCM5102A=m
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_PCM512x_SPI=m
+CONFIG_SND_SOC_PEB2466=m
+# CONFIG_SND_SOC_RK3328 is not set
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RL6347A=m
+CONFIG_SND_SOC_RT274=m
+CONFIG_SND_SOC_RT286=m
+CONFIG_SND_SOC_RT298=m
+CONFIG_SND_SOC_RT1011=m
+CONFIG_SND_SOC_RT1015=m
+CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1019=m
+CONFIG_SND_SOC_RT1308=m
+CONFIG_SND_SOC_RT5514=m
+CONFIG_SND_SOC_RT5514_SPI=m
+CONFIG_SND_SOC_RT5616=m
+CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+CONFIG_SND_SOC_RT5651=m
+CONFIG_SND_SOC_RT5659=m
+CONFIG_SND_SOC_RT5660=m
+CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5670=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_RT5682=m
+CONFIG_SND_SOC_RT5682_I2C=m
+CONFIG_SND_SOC_RT5682S=m
+CONFIG_SND_SOC_RT9120=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SI476X=m
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+CONFIG_SND_SOC_SIGMADSP_REGMAP=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SIMPLE_MUX=m
+CONFIG_SND_SOC_SMA1303=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SRC4XXX_I2C=m
+CONFIG_SND_SOC_SRC4XXX=m
+CONFIG_SND_SOC_SSM2305=m
+CONFIG_SND_SOC_SSM2518=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_SSM2602_SPI=m
+CONFIG_SND_SOC_SSM2602_I2C=m
+CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA350=m
+CONFIG_SND_SOC_STI_SAS=m
+CONFIG_SND_SOC_TAS2552=m
+CONFIG_SND_SOC_TAS2562=m
+CONFIG_SND_SOC_TAS2764=m
+CONFIG_SND_SOC_TAS2770=m
+CONFIG_SND_SOC_TAS2780=m
+CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TAS571X=m
+CONFIG_SND_SOC_TAS5720=m
+CONFIG_SND_SOC_TAS5805M=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TFA989X=m
+CONFIG_SND_SOC_TLV320ADC3XXX=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320AIC3X_I2C=m
+CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+CONFIG_SND_SOC_TLV320ADCX140=m
+CONFIG_SND_SOC_TS3A227E=m
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_TSCS454=m
+CONFIG_SND_SOC_UDA1334=m
+CONFIG_SND_SOC_WM5102=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8524=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8731_I2C=m
+CONFIG_SND_SOC_WM8731_SPI=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8782=m
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
+CONFIG_SND_SOC_WM8804_SPI=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8940=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8961=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_ZL38060=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SOC_MT6351=m
+CONFIG_SND_SOC_MT6358=m
+CONFIG_SND_SOC_MT6660=m
+CONFIG_SND_SOC_NAU8315=m
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
+CONFIG_SND_SOC_NAU8821=m
+CONFIG_SND_SOC_NAU8822=m
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_NAU8825=m
+CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SOC_LPASS_MACRO_COMMON=m
+CONFIG_SND_SOC_LPASS_WSA_MACRO=m
+CONFIG_SND_SOC_LPASS_VA_MACRO=m
+CONFIG_SND_SOC_LPASS_RX_MACRO=m
+CONFIG_SND_SOC_LPASS_TX_MACRO=m
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_X86=y
+CONFIG_HDMI_LPE_AUDIO=m
+CONFIG_SND_SYNTH_EMUX=m
+CONFIG_SND_XEN_FRONTEND=m
+CONFIG_SND_VIRTIO=m
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACCUTOUCH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EVISION=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_FT260=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_GLORIOUS=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_VIVALDI_COMMON=m
+CONFIG_HID_GOOGLE_HAMMER=m
+CONFIG_HID_VIVALDI=m
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_VIEWSONIC=m
+CONFIG_HID_VRC2=m
+CONFIG_HID_XIAOMI=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LETSKETCH=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_MEGAWORLD_FF=m
+CONFIG_HID_REDRAGON=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NINTENDO=m
+CONFIG_NINTENDO_FF=y
+CONFIG_HID_NTI=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_PLAYSTATION_FF=y
+CONFIG_HID_PXRC=m
+CONFIG_HID_RAZER=m
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_RETRODE=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SIGMAMICRO=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_STEAM_FF=y
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_TOPRE=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+CONFIG_HID_MCP2221=m
+# end of Special HID drivers
+
+#
+# HID-BPF support
+#
+CONFIG_HID_BPF=y
+# end of HID-BPF support
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+CONFIG_I2C_HID=m
+CONFIG_I2C_HID_ACPI=m
+CONFIG_I2C_HID_OF=m
+CONFIG_I2C_HID_CORE=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+CONFIG_USB_CONN_GPIO=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=y
+# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=y
+# CONFIG_USB_EHCI_FSL is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_MAX3421_HCD=m
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD_ISO=y
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_HCD_BCMA=m
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
+CONFIG_USB_XEN_HCD=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
+
+#
+# USB dual-mode controller drivers
+#
+CONFIG_USB_CDNS_SUPPORT=m
+CONFIG_USB_CDNS_HOST=y
+CONFIG_USB_CDNS3=m
+# CONFIG_USB_CDNS3_GADGET is not set
+# CONFIG_USB_CDNS3_HOST is not set
+CONFIG_USB_CDNS3_PCI_WRAP=m
+CONFIG_USB_CDNSP_PCI=m
+CONFIG_USB_CDNSP_GADGET=y
+CONFIG_USB_CDNSP_HOST=y
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+
+#
+# Platform Glue Layer
+#
+
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
+CONFIG_USB_DWC3_ULPI=y
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_HOST=y
+
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+CONFIG_USB_DWC2_PCI=m
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CHIPIDEA_MSM=m
+CONFIG_USB_CHIPIDEA_GENERIC=m
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1761_UDC=y
+# CONFIG_USB_ISP1760_HOST_ROLE is not set
+# CONFIG_USB_ISP1760_GADGET_ROLE is not set
+CONFIG_USB_ISP1760_DUAL_ROLE=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_UPD78F0730=m
+CONFIG_USB_SERIAL_XR=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HUB_USB251XB=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+CONFIG_USB_LINK_LAYER_TEST=m
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_TAHVO_USB=m
+CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y
+CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_GR_UDC=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_SNP_CORE=m
+# CONFIG_USB_M66592 is not set
+CONFIG_USB_BDC_UDC=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+CONFIG_USB_NET2272_DMA=y
+CONFIG_USB_NET2280=m
+CONFIG_USB_GOKU=m
+CONFIG_USB_EG20T=m
+CONFIG_USB_MAX3420_UDC=m
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_F_TCM=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+# CONFIG_USB_CONFIGFS_F_TCM is not set
+
+#
+# USB Gadget precomposed configurations
+#
+CONFIG_USB_ZERO=m
+CONFIG_USB_AUDIO=m
+CONFIG_GADGET_UAC1=y
+# CONFIG_GADGET_UAC1_LEGACY is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_GADGET_TARGET=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_NOKIA=m
+CONFIG_USB_G_ACM_MS=m
+# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+CONFIG_USB_RAW_GADGET=m
+# end of USB Gadget precomposed configurations
+
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_RT1711H=m
+CONFIG_TYPEC_MT6360=m
+CONFIG_TYPEC_TCPCI_MT6370=m
+CONFIG_TYPEC_TCPCI_MAXIM=m
+CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
+CONFIG_UCSI_ACPI=m
+CONFIG_UCSI_STM32G0=m
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_ANX7411=m
+CONFIG_TYPEC_RT1719=m
+CONFIG_TYPEC_HD3SS3220=m
+CONFIG_TYPEC_STUSB160X=m
+CONFIG_TYPEC_WUSB3801=m
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+CONFIG_TYPEC_MUX_FSA4480=m
+CONFIG_TYPEC_MUX_GPIO_SBU=m
+CONFIG_TYPEC_MUX_PI3USB30532=m
+CONFIG_TYPEC_MUX_INTEL_PMC=m
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
+
+#
+# USB Type-C Alternate Mode drivers
+#
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
+CONFIG_USB_ROLE_SWITCH=y
+CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+CONFIG_MMC_CRYPTO=y
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_F_SDH30=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_ALCOR=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SPI=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_USDHI6ROL0=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_HSQ=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+CONFIG_MMC_SDHCI_XENON=m
+CONFIG_SCSI_UFSHCD=m
+# CONFIG_SCSI_UFS_BSG is not set
+CONFIG_SCSI_UFS_CRYPTO=y
+CONFIG_SCSI_UFS_HPB=y
+CONFIG_SCSI_UFS_HWMON=y
+CONFIG_SCSI_UFSHCD_PCI=m
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MS_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_CLASS_MULTICOLOR=m
+# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+
+#
+# LED drivers
+#
+CONFIG_LEDS_88PM860X=m
+CONFIG_LEDS_APU=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_MT6323=m
+CONFIG_LEDS_NET48XX=m
+CONFIG_LEDS_WRAP=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP50XX=m
+CONFIG_LEDS_LP8788=m
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
+CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_WM831X_STATUS=m
+CONFIG_LEDS_WM8350=m
+CONFIG_LEDS_DA903X=m
+CONFIG_LEDS_DA9052=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2606MVV=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_ADP5520=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_MAX8997=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_OT200=m
+CONFIG_LEDS_MENF21BMC=m
+CONFIG_LEDS_IS31FL319X=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_MLXCPLD=m
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_USER=m
+CONFIG_LEDS_NIC78BX=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+CONFIG_LEDS_LM36274=m
+CONFIG_LEDS_TPS6105X=m
+
+#
+# Flash and Torch LED drivers
+#
+CONFIG_LEDS_AS3645A=m
+CONFIG_LEDS_LM3601X=m
+CONFIG_LEDS_MT6370_FLASH=m
+# CONFIG_LEDS_RT8515 is not set
+CONFIG_LEDS_SGM3140=m
+
+#
+# RGB LED drivers
+#
+CONFIG_LEDS_PWM_MULTICOLOR=m
+CONFIG_LEDS_MT6370_RGB=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+# CONFIG_LEDS_TRIGGER_MTD is not set
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
+CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
+CONFIG_LEDS_TRIGGER_TTY=m
+
+#
+# Simple LED drivers
+#
+CONFIG_LEDS_SIEMENS_SIMATIC_IPC=m
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_IRDMA=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_RTRS=m
+CONFIG_INFINIBAND_RTRS_CLIENT=m
+CONFIG_INFINIBAND_RTRS_SERVER=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+# CONFIG_EDAC_LEGACY_SYSFS is not set
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=m
+CONFIG_EDAC_GHES=y
+CONFIG_EDAC_AMD64=m
+CONFIG_EDAC_AMD76X=m
+CONFIG_EDAC_E7XXX=m
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82875P=m
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+CONFIG_EDAC_IE31200=m
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_I82860=m
+CONFIG_EDAC_R82600=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_88PM860X=m
+CONFIG_RTC_DRV_88PM80X=m
+CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABEOZ9=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_DS1307=m
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_LP8788=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_MAX8907=m
+CONFIG_RTC_DRV_MAX8925=m
+CONFIG_RTC_DRV_MAX8998=m
+CONFIG_RTC_DRV_MAX8997=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF85363=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_PALMAS=m
+CONFIG_RTC_DRV_TPS6586X=m
+CONFIG_RTC_DRV_TPS65910=m
+CONFIG_RTC_DRV_RC5T583=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_RV3032=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_SD3078=m
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1302=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
+CONFIG_RTC_DRV_RX6110=m
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_DA9052=m
+CONFIG_RTC_DRV_DA9055=m
+CONFIG_RTC_DRV_DA9063=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_WM831X=m
+CONFIG_RTC_DRV_WM8350=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_CROS_EC=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_FTRTC010=m
+CONFIG_RTC_DRV_PCAP=m
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MT6397=m
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+CONFIG_RTC_DRV_GOLDFISH=m
+CONFIG_RTC_DRV_WILCO_EC=m
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DMA_ACPI=y
+CONFIG_ALTERA_MSGDMA=m
+CONFIG_INTEL_IDMA64=m
+CONFIG_PCH_DMA=m
+CONFIG_PLX_DMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_XILINX_XDMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
+CONFIG_HSU_DMA=m
+CONFIG_SF_PDMA=m
+CONFIG_INTEL_LDMA=y
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+# CONFIG_UDMABUF is not set
+# CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
+# CONFIG_DMABUF_SELFTESTS is not set
+# CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
+# end of DMABUF options
+
+CONFIG_AUXDISPLAY=y
+CONFIG_CHARLCD=m
+CONFIG_LINEDISP=m
+CONFIG_HD44780_COMMON=m
+CONFIG_HD44780=m
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_IMG_ASCII_LCD=m
+CONFIG_HT16K33=m
+CONFIG_LCD2S=m
+CONFIG_PARPORT_PANEL=m
+CONFIG_PANEL_PARPORT=0
+CONFIG_PANEL_PROFILE=5
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_CHARLCD_BL_OFF is not set
+# CONFIG_CHARLCD_BL_ON is not set
+CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_PANEL=m
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_UIO_PRUSS=m
+CONFIG_UIO_MF624=m
+CONFIG_UIO_HV_GENERIC=m
+CONFIG_UIO_DFL=m
+CONFIG_VFIO=m
+CONFIG_VFIO_CONTAINER=y
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_NOIOMMU=y
+CONFIG_VFIO_VIRQFD=y
+CONFIG_VFIO_PCI_CORE=m
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VFIO_PCI_IGD=y
+CONFIG_MLX5_VFIO_PCI=m
+CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VMGENID=y
+CONFIG_VBOXGUEST=m
+CONFIG_NITRO_ENCLAVES=m
+CONFIG_VIRTIO_ANCHOR=y
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_PCI_LIB=y
+CONFIG_VIRTIO_PCI_LIB_LEGACY=y
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_PMEM=m
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+CONFIG_VDPA=m
+# CONFIG_VDPA_SIM is not set
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_MLX5_VDPA=y
+CONFIG_MLX5_VDPA_NET=m
+# CONFIG_MLX5_VDPA_STEERING_DEBUG is not set
+CONFIG_VP_VDPA=m
+CONFIG_ALIBABA_ENI_VDPA=m
+CONFIG_SNET_VDPA=m
+CONFIG_VHOST_IOTLB=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST_TASK=y
+CONFIG_VHOST=m
+CONFIG_VHOST_MENU=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_TIMER=y
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+# CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_XEN_PCI_STUB=y
+CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PVCALLS_FRONTEND=m
+# CONFIG_XEN_PVCALLS_BACKEND is not set
+CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_AUTO_XLATE=y
+CONFIG_XEN_ACPI=y
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
+CONFIG_XEN_GRANT_DMA_OPS=y
+CONFIG_XEN_VIRTIO=y
+# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
+# end of Xen driver support
+
+# CONFIG_GREYBUS is not set
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
+CONFIG_COMEDI_BOND=m
+CONFIG_COMEDI_TEST=m
+CONFIG_COMEDI_PARPORT=m
+CONFIG_COMEDI_SSV_DNP=m
+CONFIG_COMEDI_ISA_DRIVERS=y
+CONFIG_COMEDI_PCL711=m
+CONFIG_COMEDI_PCL724=m
+CONFIG_COMEDI_PCL726=m
+CONFIG_COMEDI_PCL730=m
+CONFIG_COMEDI_PCL812=m
+CONFIG_COMEDI_PCL816=m
+CONFIG_COMEDI_PCL818=m
+CONFIG_COMEDI_PCM3724=m
+CONFIG_COMEDI_AMPLC_DIO200_ISA=m
+CONFIG_COMEDI_AMPLC_PC236_ISA=m
+CONFIG_COMEDI_AMPLC_PC263_ISA=m
+CONFIG_COMEDI_RTI800=m
+CONFIG_COMEDI_RTI802=m
+CONFIG_COMEDI_DAC02=m
+CONFIG_COMEDI_DAS16M1=m
+CONFIG_COMEDI_DAS08_ISA=m
+CONFIG_COMEDI_DAS16=m
+CONFIG_COMEDI_DAS800=m
+CONFIG_COMEDI_DAS1800=m
+CONFIG_COMEDI_DAS6402=m
+CONFIG_COMEDI_DT2801=m
+CONFIG_COMEDI_DT2811=m
+CONFIG_COMEDI_DT2814=m
+CONFIG_COMEDI_DT2815=m
+CONFIG_COMEDI_DT2817=m
+CONFIG_COMEDI_DT282X=m
+CONFIG_COMEDI_DMM32AT=m
+CONFIG_COMEDI_FL512=m
+CONFIG_COMEDI_AIO_AIO12_8=m
+CONFIG_COMEDI_AIO_IIRO_16=m
+CONFIG_COMEDI_II_PCI20KC=m
+CONFIG_COMEDI_C6XDIGIO=m
+CONFIG_COMEDI_MPC624=m
+CONFIG_COMEDI_ADQ12B=m
+CONFIG_COMEDI_NI_AT_A2150=m
+CONFIG_COMEDI_NI_AT_AO=m
+CONFIG_COMEDI_NI_ATMIO=m
+CONFIG_COMEDI_NI_ATMIO16D=m
+CONFIG_COMEDI_NI_LABPC_ISA=m
+CONFIG_COMEDI_PCMAD=m
+CONFIG_COMEDI_PCMDA12=m
+CONFIG_COMEDI_PCMMIO=m
+CONFIG_COMEDI_PCMUIO=m
+CONFIG_COMEDI_MULTIQ3=m
+CONFIG_COMEDI_S526=m
+CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
+CONFIG_COMEDI_ADDI_APCI_1032=m
+CONFIG_COMEDI_ADDI_APCI_1500=m
+CONFIG_COMEDI_ADDI_APCI_1516=m
+CONFIG_COMEDI_ADDI_APCI_1564=m
+CONFIG_COMEDI_ADDI_APCI_16XX=m
+CONFIG_COMEDI_ADDI_APCI_2032=m
+CONFIG_COMEDI_ADDI_APCI_2200=m
+CONFIG_COMEDI_ADDI_APCI_3120=m
+CONFIG_COMEDI_ADDI_APCI_3501=m
+CONFIG_COMEDI_ADDI_APCI_3XXX=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1720=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
+CONFIG_COMEDI_ADV_PCI1760=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
+CONFIG_COMEDI_AMPLC_PCI224=m
+CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
+CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
+CONFIG_COMEDI_GSC_HPDI=m
+CONFIG_COMEDI_MF6X4=m
+CONFIG_COMEDI_ICP_MULTI=m
+CONFIG_COMEDI_DAQBOARD2000=m
+CONFIG_COMEDI_JR3_PCI=m
+CONFIG_COMEDI_KE_COUNTER=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+CONFIG_COMEDI_CB_PCIMDAS=m
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_ME4000=m
+CONFIG_COMEDI_ME_DAQ=m
+CONFIG_COMEDI_NI_6527=m
+CONFIG_COMEDI_NI_65XX=m
+CONFIG_COMEDI_NI_660X=m
+CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
+CONFIG_COMEDI_NI_PCIDIO=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_RTD520=m
+CONFIG_COMEDI_S626=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_CB_DAS16_CS=m
+CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_NI_DAQ_700_CS=m
+CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
+CONFIG_COMEDI_NI_LABPC_CS=m
+CONFIG_COMEDI_NI_MIO_CS=m
+CONFIG_COMEDI_QUATECH_DAQP_CS=m
+CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_NI_USB6501=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8254=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_8255_SA=m
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_ISADMA=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_ISADMA=m
+CONFIG_COMEDI_NI_TIO=m
+CONFIG_COMEDI_NI_ROUTING=m
+# CONFIG_COMEDI_TESTS is not set
+CONFIG_STAGING=y
+CONFIG_PRISM2_USB=m
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16203=m
+CONFIG_ADIS16240=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD7816=m
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+CONFIG_ADT7316=m
+CONFIG_ADT7316_SPI=m
+CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
+
+#
+# Direct Digital Synthesis
+#
+CONFIG_AD9832=m
+CONFIG_AD9834=m
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+CONFIG_FB_SM750=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_INTEL_ATOMISP=y
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_SP8870=m
+CONFIG_VIDEO_IPU3_IMGU=m
+# CONFIG_STAGING_MEDIA_DEPRECATED is not set
+CONFIG_LTE_GDM724X=m
+CONFIG_FB_TFT=m
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_HX8357D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SEPS525=m
+CONFIG_FB_TFT_SH1106=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1305=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7789V=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1611=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_MOST_COMPONENTS=m
+CONFIG_MOST_NET=m
+CONFIG_MOST_VIDEO=m
+CONFIG_MOST_I2C=m
+CONFIG_KS7010=m
+# CONFIG_PI433 is not set
+CONFIG_FIELDBUS_DEV=m
+CONFIG_QLGE=m
+CONFIG_VME_BUS=y
+
+#
+# VME Bridge Drivers
+#
+CONFIG_VME_TSI148=m
+# CONFIG_VME_FAKE is not set
+
+#
+# VME Device Drivers
+#
+CONFIG_VME_USER=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_ACPI=m
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
+CONFIG_CHROMEOS_TBMC=m
+CONFIG_CROS_EC=m
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_SPI=m
+CONFIG_CROS_EC_UART=m
+CONFIG_CROS_EC_LPC=m
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LIGHTBAR=m
+CONFIG_CROS_EC_DEBUGFS=m
+CONFIG_CROS_EC_SENSORHUB=m
+CONFIG_CROS_EC_SYSFS=m
+CONFIG_CROS_EC_TYPEC=m
+CONFIG_CROS_HPS_I2C=m
+CONFIG_CROS_USBPD_LOGGER=m
+CONFIG_CROS_USBPD_NOTIFY=m
+CONFIG_CHROMEOS_PRIVACY_SCREEN=m
+CONFIG_CROS_TYPEC_SWITCH=m
+CONFIG_WILCO_EC=m
+# CONFIG_WILCO_EC_DEBUGFS is not set
+CONFIG_WILCO_EC_EVENTS=m
+CONFIG_WILCO_EC_TELEMETRY=m
+# CONFIG_MELLANOX_PLATFORM is not set
+# CONFIG_SURFACE_PLATFORMS is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACPI_WMI=m
+CONFIG_WMI_BMOF=m
+CONFIG_HUAWEI_WMI=m
+CONFIG_MXM_WMI=m
+CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
+CONFIG_XIAOMI_WMI=m
+CONFIG_GIGABYTE_WMI=m
+CONFIG_YOGABOOK_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ACER_WIRELESS=m
+CONFIG_ACER_WMI=m
+CONFIG_AMD_PMF=m
+CONFIG_AMD_PMC=m
+CONFIG_ADV_SWBUTTON=m
+CONFIG_APPLE_GMUX=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_ASUS_WIRELESS=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_ASUS_TF103C_DOCK=m
+CONFIG_MERAKI_MX100=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
+CONFIG_X86_PLATFORM_DRIVERS_DELL=y
+CONFIG_ALIENWARE_WMI=m
+CONFIG_DCDBAS=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_RBU=m
+CONFIG_DELL_RBTN=m
+CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_WMI=y
+CONFIG_DELL_SMBIOS_SMM=y
+CONFIG_DELL_SMO8800=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_PRIVACY=y
+CONFIG_DELL_WMI_AIO=m
+CONFIG_DELL_WMI_DESCRIPTOR=m
+CONFIG_DELL_WMI_DDV=m
+CONFIG_DELL_WMI_LED=m
+CONFIG_DELL_WMI_SYSMAN=m
+CONFIG_AMILO_RFKILL=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_FUJITSU_TABLET=m
+CONFIG_GPD_POCKET_FAN=m
+CONFIG_X86_PLATFORM_DRIVERS_HP=y
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WMI=m
+CONFIG_TC1100_WMI=m
+CONFIG_WIRELESS_HOTKEY=m
+CONFIG_IBM_RTL=m
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_LENOVO_YMC=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+CONFIG_THINKPAD_ACPI_DEBUGFACILITIES=y
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_THINKPAD_LMI=m
+CONFIG_INTEL_ATOMISP2_PDX86=y
+CONFIG_INTEL_ATOMISP2_LED=m
+CONFIG_INTEL_SAR_INT1092=m
+CONFIG_INTEL_SKL_INT3472=m
+CONFIG_INTEL_PMC_CORE=y
+CONFIG_INTEL_PMT_CLASS=m
+CONFIG_INTEL_PMT_TELEMETRY=m
+CONFIG_INTEL_PMT_CRASHLOG=m
+CONFIG_INTEL_WMI=y
+CONFIG_INTEL_WMI_SBL_FW_UPDATE=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
+CONFIG_INTEL_HID_EVENT=m
+CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_INT0002_VGPIO=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_INTEL_BXTWC_PMIC_TMU=m
+CONFIG_INTEL_BYTCRC_PWRSRC=m
+CONFIG_INTEL_CHTDC_TI_PWRBTN=m
+CONFIG_INTEL_CHTWC_INT33FE=m
+CONFIG_INTEL_MRFLD_PWRBTN=m
+CONFIG_INTEL_PUNIT_IPC=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=m
+CONFIG_INTEL_VSEC=m
+CONFIG_MSI_EC=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_MSI_WMI=m
+CONFIG_PCENGINES_APU2=m
+CONFIG_BARCO_P50_GPIO=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
+CONFIG_TOSHIBA_WMI=m
+CONFIG_ACPI_CMPC=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_LG_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_SYSTEM76_ACPI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_SERIAL_MULTI_INSTANTIATE=m
+# CONFIG_MLX_PLATFORM is not set
+# CONFIG_TOUCHSCREEN_DMI is not set
+CONFIG_FW_ATTR_CLASS=m
+CONFIG_INTEL_IMR=y
+CONFIG_INTEL_IPS=m
+CONFIG_INTEL_SCU_IPC=y
+CONFIG_INTEL_SCU=y
+CONFIG_INTEL_SCU_PCI=y
+CONFIG_INTEL_SCU_PLATFORM=m
+CONFIG_INTEL_SCU_IPC_UTIL=m
+CONFIG_SIEMENS_SIMATIC_IPC=m
+CONFIG_WINMATE_FM07_KEYS=m
+CONFIG_P2SB=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+CONFIG_COMMON_CLK_WM831X=m
+CONFIG_LMK04832=m
+CONFIG_COMMON_CLK_MAX9485=m
+CONFIG_COMMON_CLK_SI5341=m
+CONFIG_COMMON_CLK_SI5351=m
+CONFIG_COMMON_CLK_SI544=m
+CONFIG_COMMON_CLK_CDCE706=m
+CONFIG_COMMON_CLK_TPS68470=m
+CONFIG_COMMON_CLK_CS2000_CP=m
+CONFIG_CLK_TWL6040=m
+CONFIG_COMMON_CLK_PALMAS=m
+CONFIG_COMMON_CLK_PWM=m
+CONFIG_XILINX_VCU=m
+# CONFIG_HWSPINLOCK is not set
+
+#
+# Clock Source drivers
+#
+CONFIG_CLKSRC_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+CONFIG_PCC=y
+CONFIG_ALTERA_MBOX=m
+CONFIG_IOMMU_IOVA=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_IOMMU_DMA=y
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+# CONFIG_INTEL_IOMMU_PERF_EVENTS is not set
+# CONFIG_IOMMUFD is not set
+CONFIG_HYPERV_IOMMU=y
+CONFIG_VIRTIO_IOMMU=m
+
+#
+# Remoteproc drivers
+#
+# CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+CONFIG_RPMSG=m
+# CONFIG_RPMSG_CHAR is not set
+# CONFIG_RPMSG_CTRL is not set
+CONFIG_RPMSG_NS=m
+CONFIG_RPMSG_QCOM_GLINK=m
+CONFIG_RPMSG_QCOM_GLINK_RPM=m
+CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
+# CONFIG_SOUNDWIRE is not set
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# fujitsu SoC drivers
+#
+# end of fujitsu SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# end of Enable LiteX SoC Builder specific drivers
+
+CONFIG_WPCM450_SOC=m
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_QMI_HELPERS=m
+# end of Qualcomm SoC drivers
+
+CONFIG_SOC_TI=y
+
+#
+# Xilinx SoC drivers
+#
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_AXP288=m
+CONFIG_EXTCON_FSA9480=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_INTEL_INT3496=m
+CONFIG_EXTCON_INTEL_CHT_WC=m
+CONFIG_EXTCON_INTEL_MRFLD=m
+CONFIG_EXTCON_MAX14577=m
+CONFIG_EXTCON_MAX3355=m
+CONFIG_EXTCON_MAX77693=m
+CONFIG_EXTCON_MAX77843=m
+CONFIG_EXTCON_MAX8997=m
+CONFIG_EXTCON_PALMAS=m
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_RT8973A=m
+CONFIG_EXTCON_SM5502=m
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_EXTCON_USBC_CROS_EC=m
+CONFIG_EXTCON_USBC_TUSB320=m
+CONFIG_MEMORY=y
+CONFIG_FPGA_DFL_EMIF=m
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_DMA=m
+CONFIG_IIO_BUFFER_DMAENGINE=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=m
+CONFIG_IIO_GTS_HELPER=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+CONFIG_IIO_SW_DEVICE=m
+CONFIG_IIO_SW_TRIGGER=m
+CONFIG_IIO_TRIGGERED_EVENT=m
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16201=m
+CONFIG_ADIS16209=m
+CONFIG_ADXL313=m
+CONFIG_ADXL313_I2C=m
+CONFIG_ADXL313_SPI=m
+CONFIG_ADXL355=m
+CONFIG_ADXL355_I2C=m
+CONFIG_ADXL355_SPI=m
+CONFIG_ADXL367=m
+CONFIG_ADXL367_SPI=m
+CONFIG_ADXL367_I2C=m
+CONFIG_ADXL372=m
+CONFIG_ADXL372_SPI=m
+CONFIG_ADXL372_I2C=m
+CONFIG_BMA220=m
+CONFIG_BMA400=m
+CONFIG_BMA400_I2C=m
+CONFIG_BMA400_SPI=m
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_BMI088_ACCEL=m
+CONFIG_BMI088_ACCEL_SPI=m
+CONFIG_DA280=m
+CONFIG_DA311=m
+CONFIG_DMARD06=m
+CONFIG_DMARD09=m
+CONFIG_DMARD10=m
+CONFIG_FXLS8962AF=m
+CONFIG_FXLS8962AF_I2C=m
+CONFIG_FXLS8962AF_SPI=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_IIO_KX022A=m
+CONFIG_IIO_KX022A_SPI=m
+CONFIG_IIO_KX022A_I2C=m
+CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
+CONFIG_KXSD9_I2C=m
+CONFIG_KXCJK1013=m
+CONFIG_MC3230=m
+CONFIG_MMA7455=m
+CONFIG_MMA7455_I2C=m
+CONFIG_MMA7455_SPI=m
+CONFIG_MMA7660=m
+CONFIG_MMA8452=m
+CONFIG_MMA9551_CORE=m
+CONFIG_MMA9551=m
+CONFIG_MMA9553=m
+CONFIG_MSA311=m
+CONFIG_MXC4005=m
+CONFIG_MXC6255=m
+CONFIG_SCA3000=m
+CONFIG_SCA3300=m
+CONFIG_STK8312=m
+CONFIG_STK8BA50=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD4130=m
+CONFIG_AD7091R5=m
+CONFIG_AD7124=m
+CONFIG_AD7192=m
+CONFIG_AD7266=m
+CONFIG_AD7280=m
+CONFIG_AD7291=m
+CONFIG_AD7292=m
+CONFIG_AD7298=m
+CONFIG_AD7476=m
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+CONFIG_AD7606_IFACE_SPI=m
+CONFIG_AD7766=m
+CONFIG_AD7768_1=m
+CONFIG_AD7780=m
+CONFIG_AD7791=m
+CONFIG_AD7793=m
+CONFIG_AD7887=m
+CONFIG_AD7923=m
+CONFIG_AD7949=m
+CONFIG_AD799X=m
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
+CONFIG_CC10001_ADC=m
+CONFIG_DA9150_GPADC=m
+CONFIG_DLN2_ADC=m
+CONFIG_ENVELOPE_DETECTOR=m
+CONFIG_HI8435=m
+CONFIG_HX711=m
+CONFIG_INA2XX_ADC=m
+CONFIG_INTEL_MRFLD_ADC=m
+CONFIG_LP8788_ADC=m
+CONFIG_LTC2471=m
+CONFIG_LTC2485=m
+CONFIG_LTC2496=m
+CONFIG_LTC2497=m
+CONFIG_MAX1027=m
+CONFIG_MAX11100=m
+CONFIG_MAX1118=m
+CONFIG_MAX11205=m
+CONFIG_MAX11410=m
+CONFIG_MAX1241=m
+CONFIG_MAX1363=m
+CONFIG_MAX9611=m
+CONFIG_MCP320X=m
+CONFIG_MCP3422=m
+CONFIG_MCP3911=m
+# CONFIG_MEDIATEK_MT6360_ADC is not set
+CONFIG_MEDIATEK_MT6370_ADC=m
+CONFIG_MEN_Z188_ADC=m
+CONFIG_MP2629_ADC=m
+CONFIG_NAU7802=m
+CONFIG_PALMAS_GPADC=m
+CONFIG_QCOM_VADC_COMMON=m
+CONFIG_QCOM_SPMI_IADC=m
+CONFIG_QCOM_SPMI_VADC=m
+CONFIG_QCOM_SPMI_ADC5=m
+CONFIG_RICHTEK_RTQ6056=m
+CONFIG_SD_ADC_MODULATOR=m
+CONFIG_TI_ADC081C=m
+CONFIG_TI_ADC0832=m
+CONFIG_TI_ADC084S021=m
+CONFIG_TI_ADC12138=m
+CONFIG_TI_ADC108S102=m
+CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADC161S626=m
+CONFIG_TI_ADS1015=m
+CONFIG_TI_ADS7924=m
+CONFIG_TI_ADS1100=m
+CONFIG_TI_ADS7950=m
+CONFIG_TI_ADS8344=m
+CONFIG_TI_ADS8688=m
+CONFIG_TI_ADS124S08=m
+CONFIG_TI_ADS131E08=m
+CONFIG_TI_AM335X_ADC=m
+CONFIG_TI_LMP92064=m
+CONFIG_TI_TLC4541=m
+CONFIG_TI_TSC2046=m
+CONFIG_TWL4030_MADC=m
+CONFIG_TWL6030_GPADC=m
+CONFIG_VF610_ADC=m
+CONFIG_VIPERBOARD_ADC=m
+CONFIG_XILINX_XADC=m
+# end of Analog to digital converters
+
+#
+# Analog to digital and digital to analog converters
+#
+CONFIG_AD74115=m
+CONFIG_AD74413R=m
+# end of Analog to digital and digital to analog converters
+
+#
+# Analog Front Ends
+#
+CONFIG_IIO_RESCALE=m
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+CONFIG_AD8366=m
+CONFIG_ADA4250=m
+CONFIG_HMC425=m
+# end of Amplifiers
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7150=m
+CONFIG_AD7746=m
+# end of Capacitance to digital converters
+
+#
+# Chemical Sensors
+#
+CONFIG_ATLAS_PH_SENSOR=m
+CONFIG_ATLAS_EZO_SENSOR=m
+CONFIG_BME680=m
+CONFIG_BME680_I2C=m
+CONFIG_BME680_SPI=m
+CONFIG_CCS811=m
+CONFIG_IAQCORE=m
+CONFIG_PMS7003=m
+CONFIG_SCD30_CORE=m
+CONFIG_SCD30_I2C=m
+CONFIG_SCD30_SERIAL=m
+CONFIG_SCD4X=m
+CONFIG_SENSIRION_SGP30=m
+CONFIG_SENSIRION_SGP40=m
+CONFIG_SPS30=m
+CONFIG_SPS30_I2C=m
+CONFIG_SPS30_SERIAL=m
+CONFIG_SENSEAIR_SUNRISE_CO2=m
+CONFIG_VZ89X=m
+# end of Chemical Sensors
+
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m
+CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+CONFIG_IIO_MS_SENSORS_I2C=m
+
+#
+# IIO SCMI Sensors
+#
+# end of IIO SCMI Sensors
+
+#
+# SSP Sensor Common
+#
+CONFIG_IIO_SSP_SENSORS_COMMONS=m
+CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+CONFIG_AD3552R=m
+CONFIG_AD5064=m
+CONFIG_AD5360=m
+CONFIG_AD5380=m
+CONFIG_AD5421=m
+CONFIG_AD5446=m
+CONFIG_AD5449=m
+CONFIG_AD5592R_BASE=m
+CONFIG_AD5592R=m
+CONFIG_AD5593R=m
+CONFIG_AD5504=m
+CONFIG_AD5624R_SPI=m
+CONFIG_LTC2688=m
+CONFIG_AD5686=m
+CONFIG_AD5686_SPI=m
+CONFIG_AD5696_I2C=m
+CONFIG_AD5755=m
+CONFIG_AD5758=m
+CONFIG_AD5761=m
+CONFIG_AD5764=m
+CONFIG_AD5766=m
+CONFIG_AD5770R=m
+CONFIG_AD5791=m
+CONFIG_AD7293=m
+CONFIG_AD7303=m
+CONFIG_AD8801=m
+CONFIG_DPOT_DAC=m
+CONFIG_DS4424=m
+CONFIG_LTC1660=m
+CONFIG_LTC2632=m
+CONFIG_M62332=m
+CONFIG_MAX517=m
+CONFIG_MAX5522=m
+CONFIG_MAX5821=m
+CONFIG_MCP4725=m
+CONFIG_MCP4922=m
+CONFIG_TI_DAC082S085=m
+CONFIG_TI_DAC5571=m
+CONFIG_TI_DAC7311=m
+CONFIG_TI_DAC7612=m
+CONFIG_VF610_DAC=m
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+CONFIG_IIO_SIMPLE_DUMMY=m
+# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
+# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
+
+#
+# Filters
+#
+# end of Filters
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+CONFIG_AD9523=m
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+CONFIG_ADF4350=m
+CONFIG_ADF4371=m
+CONFIG_ADF4377=m
+CONFIG_ADMV1013=m
+CONFIG_ADMV4420=m
+CONFIG_ADRF6780=m
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+CONFIG_ADIS16080=m
+CONFIG_ADIS16130=m
+CONFIG_ADIS16136=m
+CONFIG_ADIS16260=m
+CONFIG_ADXRS290=m
+CONFIG_ADXRS450=m
+CONFIG_BMG160=m
+CONFIG_BMG160_I2C=m
+CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_MPU3050=m
+CONFIG_MPU3050_I2C=m
+CONFIG_IIO_ST_GYRO_3AXIS=m
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
+CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+CONFIG_AFE4403=m
+CONFIG_AFE4404=m
+CONFIG_MAX30100=m
+CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+CONFIG_AM2315=m
+CONFIG_DHT11=m
+CONFIG_HDC100X=m
+CONFIG_HDC2010=m
+CONFIG_HID_SENSOR_HUMIDITY=m
+CONFIG_HTS221=m
+CONFIG_HTS221_I2C=m
+CONFIG_HTS221_SPI=m
+CONFIG_HTU21=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+CONFIG_ADIS16400=m
+CONFIG_ADIS16460=m
+CONFIG_ADIS16475=m
+CONFIG_ADIS16480=m
+CONFIG_BMI160=m
+CONFIG_BMI160_I2C=m
+CONFIG_BMI160_SPI=m
+CONFIG_BOSCH_BNO055=m
+CONFIG_BOSCH_BNO055_SERIAL=m
+CONFIG_BOSCH_BNO055_I2C=m
+CONFIG_FXOS8700=m
+CONFIG_FXOS8700_I2C=m
+CONFIG_FXOS8700_SPI=m
+CONFIG_KMX61=m
+CONFIG_INV_ICM42600=m
+CONFIG_INV_ICM42600_I2C=m
+CONFIG_INV_ICM42600_SPI=m
+CONFIG_INV_MPU6050_IIO=m
+CONFIG_INV_MPU6050_I2C=m
+CONFIG_INV_MPU6050_SPI=m
+CONFIG_IIO_ST_LSM6DSX=m
+CONFIG_IIO_ST_LSM6DSX_I2C=m
+CONFIG_IIO_ST_LSM6DSX_SPI=m
+CONFIG_IIO_ST_LSM6DSX_I3C=m
+CONFIG_IIO_ST_LSM9DS0=m
+CONFIG_IIO_ST_LSM9DS0_I2C=m
+CONFIG_IIO_ST_LSM9DS0_SPI=m
+# end of Inertial measurement units
+
+CONFIG_IIO_ADIS_LIB=m
+CONFIG_IIO_ADIS_LIB_BUFFER=y
+
+#
+# Light sensors
+#
+CONFIG_ACPI_ALS=m
+CONFIG_ADJD_S311=m
+CONFIG_ADUX1020=m
+CONFIG_AL3010=m
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+CONFIG_APDS9960=m
+CONFIG_AS73211=m
+CONFIG_BH1750=m
+CONFIG_BH1780=m
+CONFIG_CM32181=m
+CONFIG_CM3232=m
+CONFIG_CM3323=m
+CONFIG_CM3605=m
+CONFIG_CM36651=m
+CONFIG_IIO_CROS_EC_LIGHT_PROX=m
+CONFIG_GP2AP002=m
+CONFIG_GP2AP020A00F=m
+CONFIG_IQS621_ALS=m
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+CONFIG_ISL29125=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_JSA1212=m
+CONFIG_ROHM_BU27034=m
+CONFIG_RPR0521=m
+CONFIG_SENSORS_LM3533=m
+CONFIG_LTR501=m
+CONFIG_LTRF216A=m
+CONFIG_LV0104CS=m
+CONFIG_MAX44000=m
+CONFIG_MAX44009=m
+CONFIG_NOA1305=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
+CONFIG_SI1133=m
+CONFIG_SI1145=m
+CONFIG_STK3310=m
+CONFIG_ST_UVIS25=m
+CONFIG_ST_UVIS25_I2C=m
+CONFIG_ST_UVIS25_SPI=m
+CONFIG_TCS3414=m
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
+CONFIG_TSL2591=m
+CONFIG_TSL2772=m
+CONFIG_TSL4531=m
+CONFIG_US5182D=m
+CONFIG_VCNL4000=m
+CONFIG_VCNL4035=m
+CONFIG_VEML6030=m
+CONFIG_VEML6070=m
+CONFIG_VL6180=m
+CONFIG_ZOPT2201=m
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+CONFIG_AK8974=m
+CONFIG_AK8975=m
+CONFIG_AK09911=m
+CONFIG_BMC150_MAGN=m
+CONFIG_BMC150_MAGN_I2C=m
+CONFIG_BMC150_MAGN_SPI=m
+CONFIG_MAG3110=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_MMC35240=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+CONFIG_SENSORS_HMC5843_SPI=m
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
+CONFIG_TI_TMAG5273=m
+CONFIG_YAMAHA_YAS530=m
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+CONFIG_IIO_MUX=m
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_HRTIMER_TRIGGER=m
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_TIGHTLOOP_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
+
+#
+# Linear and angular position sensors
+#
+CONFIG_IQS624_POS=m
+CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
+# end of Linear and angular position sensors
+
+#
+# Digital potentiometers
+#
+CONFIG_AD5110=m
+CONFIG_AD5272=m
+CONFIG_DS1803=m
+CONFIG_MAX5432=m
+CONFIG_MAX5481=m
+CONFIG_MAX5487=m
+CONFIG_MCP4018=m
+CONFIG_MCP4131=m
+CONFIG_MCP4531=m
+CONFIG_MCP41010=m
+CONFIG_TPL0102=m
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+CONFIG_LMP91000=m
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+CONFIG_ABP060MG=m
+CONFIG_BMP280=m
+CONFIG_BMP280_I2C=m
+CONFIG_BMP280_SPI=m
+CONFIG_IIO_CROS_EC_BARO=m
+CONFIG_DLHL60D=m
+CONFIG_DPS310=m
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_HP03=m
+CONFIG_ICP10100=m
+CONFIG_MPL115=m
+CONFIG_MPL115_I2C=m
+CONFIG_MPL115_SPI=m
+CONFIG_MPL3115=m
+CONFIG_MS5611=m
+CONFIG_MS5611_I2C=m
+CONFIG_MS5611_SPI=m
+CONFIG_MS5637=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+CONFIG_T5403=m
+CONFIG_HP206C=m
+CONFIG_ZPA2326=m
+CONFIG_ZPA2326_I2C=m
+CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+CONFIG_AS3935=m
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+CONFIG_CROS_EC_MKBP_PROXIMITY=m
+CONFIG_ISL29501=m
+CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
+CONFIG_PING=m
+CONFIG_RFD77402=m
+CONFIG_SRF04=m
+CONFIG_SX_COMMON=m
+CONFIG_SX9310=m
+CONFIG_SX9324=m
+CONFIG_SX9360=m
+CONFIG_SX9500=m
+CONFIG_SRF08=m
+CONFIG_VCNL3020=m
+CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S90=m
+CONFIG_AD2S1200=m
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+CONFIG_IQS620AT_TEMP=m
+CONFIG_LTC2983=m
+CONFIG_MAXIM_THERMOCOUPLE=m
+CONFIG_HID_SENSOR_TEMP=m
+CONFIG_MLX90614=m
+CONFIG_MLX90632=m
+CONFIG_TMP006=m
+CONFIG_TMP007=m
+CONFIG_TMP117=m
+CONFIG_TSYS01=m
+CONFIG_TSYS02D=m
+CONFIG_MAX30208=m
+CONFIG_MAX31856=m
+CONFIG_MAX31865=m
+# end of Temperature sensors
+
+CONFIG_NTB=m
+CONFIG_NTB_MSI=y
+CONFIG_NTB_IDT=m
+CONFIG_NTB_EPF=m
+CONFIG_NTB_SWITCHTEC=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_PERF=m
+CONFIG_NTB_MSI_TEST=m
+CONFIG_NTB_TRANSPORT=m
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_DEBUG is not set
+CONFIG_PWM_CLK=m
+CONFIG_PWM_CRC=y
+CONFIG_PWM_CROS_EC=m
+CONFIG_PWM_DWC=m
+CONFIG_PWM_IQS620A=m
+CONFIG_PWM_LP3943=m
+CONFIG_PWM_LPSS=m
+CONFIG_PWM_LPSS_PCI=m
+CONFIG_PWM_LPSS_PLATFORM=m
+CONFIG_PWM_PCA9685=m
+CONFIG_PWM_TWL=m
+CONFIG_PWM_TWL_LED=m
+
+#
+# IRQ chip support
+#
+CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_SIMPLE=y
+CONFIG_RESET_TI_SYSCON=m
+CONFIG_RESET_TI_TPS380X=m
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PHY_MIPI_DPHY=y
+CONFIG_USB_LGM_PHY=m
+CONFIG_PHY_CAN_TRANSCEIVER=m
+
+#
+# PHY drivers for Broadcom platforms
+#
+CONFIG_BCM_KONA_USB2_PHY=m
+# end of PHY drivers for Broadcom platforms
+
+CONFIG_PHY_PXA_28NM_HSIC=m
+CONFIG_PHY_PXA_28NM_USB2=m
+CONFIG_PHY_CPCAP_USB=m
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_SAMSUNG_USB2=m
+CONFIG_PHY_TUSB1210=m
+CONFIG_PHY_INTEL_LGM_EMMC=m
+# end of PHY Subsystem
+
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL_CORE=m
+CONFIG_INTEL_RAPL=m
+CONFIG_IDLE_INJECT=y
+CONFIG_MCB=m
+CONFIG_MCB_PCI=m
+CONFIG_MCB_LPC=m
+
+#
+# Performance monitor support
+#
+# end of Performance monitor support
+
+CONFIG_RAS=y
+CONFIG_USB4=m
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# Android
+#
+# CONFIG_ANDROID_BINDER_IPC is not set
+# end of Android
+
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+CONFIG_NVDIMM_KEYS=y
+# CONFIG_NVDIMM_SECURITY_TEST is not set
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_CXL=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+
+#
+# Layout Types
+#
+# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
+# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
+# end of Layout Types
+
+CONFIG_NVMEM_RAVE_SP_EEPROM=m
+CONFIG_NVMEM_RMEM=m
+CONFIG_NVMEM_SPMI_SDAM=m
+
+#
+# HW tracing support
+#
+CONFIG_STM=m
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_HEARTBEAT=m
+CONFIG_STM_SOURCE_FTRACE=m
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_ACPI=m
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH_STH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
+CONFIG_FPGA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_BRIDGE=m
+CONFIG_ALTERA_FREEZE_BRIDGE=m
+CONFIG_XILINX_PR_DECOUPLER=m
+CONFIG_FPGA_REGION=m
+CONFIG_FPGA_DFL=m
+CONFIG_FPGA_DFL_FME=m
+CONFIG_FPGA_DFL_FME_MGR=m
+CONFIG_FPGA_DFL_FME_BRIDGE=m
+CONFIG_FPGA_DFL_FME_REGION=m
+CONFIG_FPGA_DFL_AFU=m
+CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000=m
+CONFIG_FPGA_DFL_PCI=m
+CONFIG_FPGA_M10_BMC_SEC_UPDATE=m
+CONFIG_FPGA_MGR_MICROCHIP_SPI=m
+CONFIG_FPGA_MGR_LATTICE_SYSCONFIG=m
+CONFIG_FPGA_MGR_LATTICE_SYSCONFIG_SPI=m
+CONFIG_TEE=m
+CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
+CONFIG_MUX_ADG792A=m
+CONFIG_MUX_ADGS1408=m
+CONFIG_MUX_GPIO=m
+# end of Multiplexer drivers
+
+CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set
+CONFIG_COUNTER=m
+CONFIG_INTEL_QEP=m
+CONFIG_INTERRUPT_CNT=m
+CONFIG_MOST=m
+CONFIG_MOST_USB_HDM=m
+CONFIG_MOST_CDEV=m
+CONFIG_MOST_SND=m
+# CONFIG_PECI is not set
+CONFIG_HTE=y
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+CONFIG_LEGACY_DIRECT_IO=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+# CONFIG_XFS_SUPPORT_ASCII_CI is not set
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
+# CONFIG_F2FS_FS_COMPRESSION is not set
+# CONFIG_F2FS_IOSTAT is not set
+CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_ZONEFS_FS=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+# CONFIG_EXPORTFS_BLOCK_OPS is not set
+CONFIG_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=y
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_NETFS_SUPPORT=m
+CONFIG_NETFS_STATS=y
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_DEBUG is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_ERROR_INJECTION is not set
+# CONFIG_CACHEFILES_ONDEMAND is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/EXFAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_DEFAULT_UTF8 is not set
+CONFIG_EXFAT_FS=m
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+# CONFIG_NTFS3_FS_POSIX_ACL is not set
+# end of DOS/FAT/EXFAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_PID_ARCH_STATUS=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=y
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+# CONFIG_JFFS2_CMODE_PRIORITY is not set
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_CMODE_FAVOURLZO=y
+CONFIG_UBIFS_FS=m
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
+CONFIG_UBIFS_ATIME_SUPPORT=y
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_SECURITY=y
+CONFIG_UBIFS_FS_AUTHENTICATION=y
+CONFIG_CRAMFS=m
+CONFIG_CRAMFS_BLOCKDEV=y
+# CONFIG_CRAMFS_MTD is not set
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_ZSTD is not set
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=m
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
+CONFIG_PSTORE_DEFLATE_COMPRESS=m
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
+# CONFIG_PSTORE_842_COMPRESS is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS is not set
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+# CONFIG_PSTORE_BLK is not set
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EROFS_FS=m
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+# CONFIG_EROFS_FS_ZIP is not set
+CONFIG_VBOXSF_FS=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFSD=m
+# CONFIG_NFSD_V2 is not set
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+# CONFIG_NFSD_BLOCKLAYOUT is not set
+# CONFIG_NFSD_SCSILAYOUT is not set
+# CONFIG_NFSD_FLEXFILELAYOUT is not set
+# CONFIG_NFSD_V4_2_INTER_SSC is not set
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y
+# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CEPH_FS_SECURITY_LABEL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS=m
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+CONFIG_IO_WQ=y
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_REQUEST_CACHE=y
+CONFIG_PERSISTENT_KEYRINGS=y
+CONFIG_TRUSTED_KEYS=y
+CONFIG_TRUSTED_KEYS_TPM=y
+CONFIG_ENCRYPTED_KEYS=y
+# CONFIG_USER_DECRYPTED_DATA is not set
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_INFINIBAND is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_SECURITY_PATH=y
+CONFIG_INTEL_TXT=y
+CONFIG_LSM_MMAP_MIN_ADDR=0
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
+CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
+CONFIG_SECURITY_SMACK=y
+# CONFIG_SECURITY_SMACK_BRINGUP is not set
+CONFIG_SECURITY_SMACK_NETFILTER=y
+# CONFIG_SECURITY_SMACK_APPEND_SIGNALS is not set
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+# CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set
+CONFIG_SECURITY_APPARMOR=y
+# CONFIG_SECURITY_APPARMOR_DEBUG is not set
+CONFIG_SECURITY_APPARMOR_INTROSPECT_POLICY=y
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+CONFIG_SECURITY_APPARMOR_EXPORT_BINARY=y
+CONFIG_SECURITY_APPARMOR_PARANOID_LOAD=y
+# CONFIG_SECURITY_LOADPIN is not set
+CONFIG_SECURITY_YAMA=y
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_INTEGRITY=y
+CONFIG_INTEGRITY_SIGNATURE=y
+CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
+CONFIG_INTEGRITY_TRUSTED_KEYRING=y
+CONFIG_INTEGRITY_AUDIT=y
+CONFIG_IMA=y
+CONFIG_IMA_MEASURE_PCR_IDX=10
+CONFIG_IMA_LSM_RULES=y
+CONFIG_IMA_NG_TEMPLATE=y
+# CONFIG_IMA_SIG_TEMPLATE is not set
+CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
+CONFIG_IMA_DEFAULT_HASH_SHA1=y
+# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set
+# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
+CONFIG_IMA_DEFAULT_HASH="sha1"
+# CONFIG_IMA_WRITE_POLICY is not set
+# CONFIG_IMA_READ_POLICY is not set
+CONFIG_IMA_APPRAISE=y
+# CONFIG_IMA_ARCH_POLICY is not set
+# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
+CONFIG_IMA_APPRAISE_BOOTPARAM=y
+# CONFIG_IMA_APPRAISE_MODSIG is not set
+CONFIG_IMA_TRUSTED_KEYRING=y
+CONFIG_IMA_BLACKLIST_KEYRING=y
+# CONFIG_IMA_LOAD_X509 is not set
+CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y
+CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y
+# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
+CONFIG_IMA_DISABLE_HTABLE=y
+CONFIG_EVM=y
+CONFIG_EVM_ATTR_FSUUID=y
+CONFIG_EVM_EXTRA_SMACK_XATTRS=y
+# CONFIG_EVM_ADD_XATTRS is not set
+# CONFIG_EVM_LOAD_X509 is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
+
+#
+# Kernel hardening options
+#
+CONFIG_GCC_PLUGIN_STRUCTLEAK=y
+
+#
+# Memory initialization
+#
+# CONFIG_INIT_STACK_NONE is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
+CONFIG_GCC_PLUGIN_STACKLEAK=y
+# CONFIG_GCC_PLUGIN_STACKLEAK_VERBOSE is not set
+CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
+# CONFIG_STACKLEAK_METRICS is not set
+CONFIG_STACKLEAK_RUNTIME_DISABLE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
+CONFIG_ZERO_CALL_USED_REGS=y
+# end of Memory initialization
+
+CONFIG_RANDSTRUCT_NONE=y
+# CONFIG_RANDSTRUCT_FULL is not set
+# CONFIG_RANDSTRUCT_PERFORMANCE is not set
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SKCIPHER=y
+CONFIG_CRYPTO_SKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_SIMD=m
+CONFIG_CRYPTO_ENGINE=m
+# end of Crypto core or helper
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+# end of Public-key cryptography
+
+#
+# Block ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_TI=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARIA=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_SM4_GENERIC=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+# end of Block ciphers
+
+#
+# Length-preserving ciphers and modes
+#
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_HCTR2=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XCTR=m
+CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_NHPOLY1305=m
+# end of Length-preserving ciphers and modes
+
+#
+# AEAD (authenticated encryption with associated data) ciphers
+#
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ESSIV=m
+# end of AEAD (authenticated encryption with associated data) ciphers
+
+#
+# Hashes, digests, and MACs
+#
+CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_POLYVAL=m
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_SM3_GENERIC=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_XXHASH=m
+# end of Hashes, digests, and MACs
+
+#
+# CRCs (cyclic redundancy checks)
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRC64_ROCKSOFT=y
+# end of CRCs (cyclic redundancy checks)
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=m
+# end of Compression
+
+#
+# Random number generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+CONFIG_CRYPTO_DRBG_HASH=y
+CONFIG_CRYPTO_DRBG_CTR=y
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_KDF800108_CTR=y
+# end of Random number generation
+
+#
+# Userspace interface
+#
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
+# CONFIG_CRYPTO_STATS is not set
+# end of Userspace interface
+
+CONFIG_CRYPTO_HASH_INFO=y
+
+#
+# Accelerated Cryptographic Algorithms for CPU (x86)
+#
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_SERPENT_SSE2_586=m
+CONFIG_CRYPTO_TWOFISH_586=m
+CONFIG_CRYPTO_CRC32C_INTEL=y
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+# end of Accelerated Cryptographic Algorithms for CPU (x86)
+
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=y
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_GEODE=m
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_SP_CCP=y
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
+CONFIG_CRYPTO_DEV_QAT=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_C3XXX=m
+CONFIG_CRYPTO_DEV_QAT_C62X=m
+CONFIG_CRYPTO_DEV_QAT_4XXX=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
+CONFIG_CRYPTO_DEV_QAT_C62XVF=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
+# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+# CONFIG_FIPS_SIGNATURE_SELFTEST is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_LINEAR_RANGES=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_PRIME_NUMBERS=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_UTILS=y
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_GF128MUL=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA1=y
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
+CONFIG_CRC_CCITT=y
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC64_ROCKSOFT=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=y
+# CONFIG_CRC4 is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+CONFIG_AUDIT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_842_COMPRESS=m
+CONFIG_842_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMMON=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_MICROLZMA=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_TEST=m
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_ZSTD=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_DMA_OPS=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_SWIOTLB=y
+CONFIG_DMA_CMA=y
+CONFIG_DMA_PERNUMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=0
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_CHECK_SIGNATURE=y
+# CONFIG_FORCE_NR_CPUS is not set
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_SIGNATURE=y
+CONFIG_DIMLIB=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_32=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+CONFIG_FONT_6x10=y
+# CONFIG_FONT_10x18 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+CONFIG_FONT_TER16x32=y
+CONFIG_FONT_6x8=y
+CONFIG_SG_POOL=y
+CONFIG_MEMREGION=y
+CONFIG_ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_STACKDEPOT=y
+CONFIG_SBITMAP=y
+CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
+# end of Library routines
+
+CONFIG_PLDMFW=y
+CONFIG_ASN1_ENCODER=y
+CONFIG_POLYNOMIAL=m
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+CONFIG_STACKTRACE_BUILD_ID=y
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
+CONFIG_SYMBOLIC_ERRNAME=y
+CONFIG_DEBUG_BUGVERBOSE=y
+# end of printk and dmesg options
+
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_AS_HAS_NON_CONST_LEB128=y
+CONFIG_DEBUG_INFO_NONE=y
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF5 is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_READABLE_ASM is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_VMLINUX_MAP is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+#
+# Generic Kernel Debugging Instruments
+#
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_KGDB=y
+CONFIG_KGDB_HONOUR_BLOCKLIST=y
+CONFIG_KGDB_SERIAL_CONSOLE=y
+# CONFIG_KGDB_TESTS is not set
+CONFIG_KGDB_LOW_LEVEL_TRAP=y
+CONFIG_KGDB_KDB=y
+CONFIG_KDB_DEFAULT_ENABLE=0x1
+CONFIG_KDB_KEYBOARD=y
+CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+CONFIG_ARCH_HAS_EARLY_DEBUG=y
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+CONFIG_HAVE_KCSAN_COMPILER=y
+# end of Generic Kernel Debugging Instruments
+
+#
+# Networking Debugging
+#
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
+# CONFIG_DEBUG_NET is not set
+# end of Networking Debugging
+
+#
+# Memory Debugging
+#
+CONFIG_PAGE_EXTENSION=y
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_PAGE_OWNER is not set
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_DEBUG_PAGE_REF is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
+CONFIG_ARCH_HAS_DEBUG_WX=y
+# CONFIG_DEBUG_WX is not set
+CONFIG_GENERIC_PTDUMP=y
+# CONFIG_PTDUMP_DEBUGFS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SHRINKER_DEBUG is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_SCHED_STACK_END_CHECK=y
+# CONFIG_DEBUG_VM is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_KMAP_LOCAL is not set
+CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
+# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
+CONFIG_HAVE_ARCH_KFENCE=y
+CONFIG_KFENCE=y
+CONFIG_KFENCE_SAMPLE_INTERVAL=0
+CONFIG_KFENCE_NUM_OBJECTS=255
+# CONFIG_KFENCE_DEFERRABLE is not set
+# CONFIG_KFENCE_STATIC_KEYS is not set
+CONFIG_KFENCE_STRESS_TEST_FAULTS=0
+# end of Memory Debugging
+
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Oops, Lockups and Hangs
+#
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+# CONFIG_WQ_WATCHDOG is not set
+# CONFIG_TEST_LOCKUP is not set
+# end of Debug Oops, Lockups and Hangs
+
+#
+# Scheduler Debugging
+#
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+# end of Scheduler Debugging
+
+# CONFIG_DEBUG_TIMEKEEPING is not set
+# CONFIG_DEBUG_PREEMPT is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_LOCK_TORTURE_TEST=m
+CONFIG_WW_MUTEX_SELFTEST=m
+# CONFIG_SCF_TORTURE_TEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+# CONFIG_NMI_CHECK_CPU is not set
+# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+
+#
+# Debug kernel data structures
+#
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# CONFIG_DEBUG_MAPLE_TREE is not set
+# end of Debug kernel data structures
+
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+CONFIG_TORTURE_TEST=m
+# CONFIG_RCU_SCALE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_REF_SCALE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
+# CONFIG_RCU_CPU_STALL_CPUTIME is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_DEBUG_CGROUP_REF is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_RETHOOK=y
+CONFIG_RETHOOK=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_NO_PATCHABLE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
+CONFIG_BUILDTIME_MCOUNT_SORT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_BOOTTIME_TRACING is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_FPROBE=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_STACK_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
+CONFIG_SCHED_TRACER=y
+# CONFIG_HWLAT_TRACER is not set
+# CONFIG_OSNOISE_TRACER is not set
+# CONFIG_TIMERLAT_TRACER is not set
+CONFIG_MMIOTRACE=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+# CONFIG_BPF_KPROBE_OVERRIDE is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
+CONFIG_SYNTH_EVENTS=y
+# CONFIG_USER_EVENTS is not set
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_TRACE_EVENT_INJECT is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+# CONFIG_MMIOTRACE_TEST is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_SYNTH_EVENT_GEN_TEST is not set
+# CONFIG_KPROBE_EVENT_GEN_TEST is not set
+# CONFIG_RV is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_SAMPLES is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+
+#
+# x86 Debugging
+#
+CONFIG_EARLY_PRINTK_USB=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_EARLY_PRINTK=y
+CONFIG_EARLY_PRINTK_DBGP=y
+# CONFIG_EARLY_PRINTK_USB_XDBC is not set
+# CONFIG_EFI_PGT_DUMP is not set
+# CONFIG_DEBUG_TLBFLUSH is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+# CONFIG_IO_DELAY_0X80 is not set
+CONFIG_IO_DELAY_0XED=y
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_DEBUG_ENTRY is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_DEBUG_IMR_SELFTEST is not set
+CONFIG_X86_DEBUG_FPU=y
+CONFIG_PUNIT_ATOM_DEBUG=m
+CONFIG_UNWINDER_FRAME_POINTER=y
+# end of x86 Debugging
+
+#
+# Kernel Testing and Coverage
+#
+# CONFIG_KUNIT is not set
+CONFIG_NOTIFIER_ERROR_INJECTION=m
+CONFIG_PM_NOTIFIER_ERROR_INJECT=m
+CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_TEST_DHRY is not set
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_MIN_HEAP is not set
+# CONFIG_TEST_DIV64 is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_TEST_REF_TRACKER is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+CONFIG_INTERVAL_TREE_TEST=m
+CONFIG_PERCPU_TEST=m
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+CONFIG_TEST_HEXDUMP=m
+# CONFIG_STRING_SELFTEST is not set
+CONFIG_TEST_STRING_HELPERS=m
+CONFIG_TEST_KSTRTOX=m
+CONFIG_TEST_PRINTF=m
+CONFIG_TEST_SCANF=m
+CONFIG_TEST_BITMAP=m
+CONFIG_TEST_UUID=m
+CONFIG_TEST_XARRAY=m
+# CONFIG_TEST_MAPLE_TREE is not set
+CONFIG_TEST_RHASHTABLE=m
+CONFIG_TEST_IDA=m
+CONFIG_TEST_PARMAN=m
+CONFIG_TEST_LKM=m
+CONFIG_TEST_BITOPS=m
+CONFIG_TEST_VMALLOC=m
+CONFIG_TEST_USER_COPY=m
+CONFIG_TEST_BPF=m
+CONFIG_TEST_BLACKHOLE_DEV=m
+CONFIG_FIND_BIT_BENCHMARK=m
+CONFIG_TEST_FIRMWARE=m
+# CONFIG_TEST_SYSCTL is not set
+CONFIG_TEST_UDELAY=m
+CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_TEST_DYNAMIC_DEBUG is not set
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+CONFIG_TEST_OBJAGG=m
+# CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_FREE_PAGES is not set
+# CONFIG_TEST_FPU is not set
+# CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set
+CONFIG_ARCH_USE_MEMTEST=y
+CONFIG_MEMTEST=y
+# CONFIG_HYPERV_TESTING is not set
+# end of Kernel Testing and Coverage
+
+#
+# Rust hacking
+#
+# end of Rust hacking
+# end of Kernel hacking
diff --git a/gnu/packages/aux-files/linux-libre/6.4-x86_64.conf b/gnu/packages/aux-files/linux-libre/6.4-x86_64.conf
new file mode 100644
index 0000000000..5abcfc6683
--- /dev/null
+++ b/gnu/packages/aux-files/linux-libre/6.4-x86_64.conf
@@ -0,0 +1,11837 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 6.4.2 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=110300
+CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23800
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23800
+CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
+CONFIG_PAHOLE_VERSION=0
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_TABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_WERROR is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_HAVE_KERNEL_ZSTD=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+# CONFIG_KERNEL_ZSTD is not set
+CONFIG_DEFAULT_INIT=""
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_WATCH_QUEUE=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_USELIB=y
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_IRQ_MSI_IOMMU=y
+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
+CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_INIT=y
+CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
+CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
+CONFIG_CONTEXT_TRACKING=y
+CONFIG_CONTEXT_TRACKING_IDLE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_CLOCKSOURCE_WATCHDOG_MAX_SKEW_US=100
+# end of Timers subsystem
+
+CONFIG_BPF=y
+CONFIG_HAVE_EBPF_JIT=y
+CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
+
+#
+# BPF subsystem
+#
+CONFIG_BPF_SYSCALL=y
+# CONFIG_BPF_JIT is not set
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
+# CONFIG_BPF_PRELOAD is not set
+# end of BPF subsystem
+
+CONFIG_PREEMPT_BUILD=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPTION=y
+CONFIG_PREEMPT_DYNAMIC=y
+CONFIG_SCHED_CORE=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+# CONFIG_PSI_DEFAULT_DISABLED is not set
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+CONFIG_PREEMPT_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_TASKS_RCU=y
+CONFIG_TASKS_RUDE_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKHEADERS is not set
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+# CONFIG_PRINTK_INDEX is not set
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_CC_HAS_INT128=y
+CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
+CONFIG_CC_NO_ARRAY_BOUNDS=y
+CONFIG_ARCH_SUPPORTS_INT128=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+# CONFIG_CGROUP_FAVOR_DYNMODS is not set
+CONFIG_MEMCG=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_SCHED_MM_CID=y
+CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_CGROUP_MISC=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_TIME_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
+CONFIG_BOOT_CONFIG=y
+# CONFIG_BOOT_CONFIG_FORCE is not set
+# CONFIG_BOOT_CONFIG_EMBED is not set
+CONFIG_INITRAMFS_PRESERVE_MTIME=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_LD_ORPHAN_WARN=y
+CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+CONFIG_SGETMASK_SYSCALL=y
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_SELFTEST is not set
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_GUEST_PERF_EVENTS=y
+# CONFIG_PC104 is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_64BIT=y
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=28
+CONFIG_ARCH_MMAP_RND_BITS_MAX=32
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_64_SMP=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_DYNAMIC_PHYSICAL_MASK=y
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
+
+#
+# Processor type and features
+#
+CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_X2APIC=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_GOLDFISH is not set
+# CONFIG_X86_CPU_RESCTRL is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
+CONFIG_X86_NUMACHIP=y
+# CONFIG_X86_VSMP is not set
+# CONFIG_X86_UV is not set
+# CONFIG_X86_GOLDFISH is not set
+# CONFIG_X86_INTEL_MID is not set
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_X86_AMD_PLATFORM_DEVICE=y
+CONFIG_IOSF_MBI=y
+CONFIG_IOSF_MBI_DEBUG=y
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_XXL=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_PARAVIRT_SPINLOCKS=y
+CONFIG_X86_HV_CALLBACK_VECTOR=y
+CONFIG_XEN=y
+CONFIG_XEN_PV=y
+CONFIG_XEN_512GB=y
+CONFIG_XEN_PV_SMP=y
+CONFIG_XEN_PV_DOM0=y
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_PVHVM_SMP=y
+CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_SAVE_RESTORE=y
+# CONFIG_XEN_DEBUG_FS is not set
+CONFIG_XEN_PVH=y
+CONFIG_XEN_DOM0=y
+CONFIG_XEN_PV_MSR_SAFE=y
+CONFIG_KVM_GUEST=y
+CONFIG_ARCH_CPUIDLE_HALTPOLL=y
+CONFIG_PVH=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_PARAVIRT_CLOCK=y
+CONFIG_JAILHOUSE_GUEST=y
+# CONFIG_ACRN_GUEST is not set
+CONFIG_INTEL_TDX_GUEST=y
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_IA32_FEAT_CTL=y
+CONFIG_X86_VMX_FEATURE_NAMES=y
+CONFIG_PROCESSOR_SELECT=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_HYGON=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_ZHAOXIN=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+CONFIG_BOOT_VESA_SUPPORT=y
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS_RANGE_BEGIN=2
+CONFIG_NR_CPUS_RANGE_END=512
+CONFIG_NR_CPUS_DEFAULT=64
+CONFIG_NR_CPUS=256
+CONFIG_SCHED_CLUSTER=y
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_MC_PRIO=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+# CONFIG_X86_MCELOG_LEGACY is not set
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+# CONFIG_X86_MCE_INJECT is not set
+
+#
+# Performance monitoring
+#
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
+CONFIG_PERF_EVENTS_INTEL_RAPL=y
+CONFIG_PERF_EVENTS_INTEL_CSTATE=y
+CONFIG_PERF_EVENTS_AMD_POWER=m
+CONFIG_PERF_EVENTS_AMD_UNCORE=m
+CONFIG_PERF_EVENTS_AMD_BRS=y
+# end of Performance monitoring
+
+CONFIG_X86_16BIT=y
+CONFIG_X86_ESPFIX64=y
+CONFIG_X86_VSYSCALL_EMULATION=y
+CONFIG_X86_IOPL_IOPERM=y
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+# CONFIG_MICROCODE_LATE_LOADING is not set
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+# CONFIG_X86_5LEVEL is not set
+CONFIG_X86_DIRECT_GBPAGES=y
+# CONFIG_X86_CPA_STATISTICS is not set
+CONFIG_X86_MEM_ENCRYPT=y
+# CONFIG_AMD_MEM_ENCRYPT is not set
+CONFIG_NUMA=y
+CONFIG_AMD_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=6
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_X86_PMEM_LEGACY_DEVICE=y
+CONFIG_X86_PMEM_LEGACY=y
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_X86_UMIP=y
+CONFIG_CC_HAS_IBT=y
+CONFIG_X86_KERNEL_IBT=y
+CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
+CONFIG_X86_SGX=y
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI_HANDOVER_PROTOCOL=y
+CONFIG_EFI_MIXED=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_RUNTIME_MAP=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+CONFIG_KEXEC_FILE=y
+CONFIG_ARCH_HAS_KEXEC_PURGATORY=y
+# CONFIG_KEXEC_SIG is not set
+CONFIG_CRASH_DUMP=y
+CONFIG_KEXEC_JUMP=y
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_X86_NEED_RELOCS=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_DYNAMIC_MEMORY_LAYOUT=y
+CONFIG_RANDOMIZE_MEMORY=y
+CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+CONFIG_ADDRESS_MASKING=y
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_LEGACY_VSYSCALL_XONLY is not set
+CONFIG_LEGACY_VSYSCALL_NONE=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_MODIFY_LDT_SYSCALL=y
+# CONFIG_STRICT_SIGALTSTACK_SIZE is not set
+CONFIG_HAVE_LIVEPATCH=y
+CONFIG_LIVEPATCH=y
+# end of Processor type and features
+
+CONFIG_CC_HAS_SLS=y
+CONFIG_CC_HAS_RETURN_THUNK=y
+CONFIG_CC_HAS_ENTRY_PADDING=y
+CONFIG_FUNCTION_PADDING_CFI=11
+CONFIG_FUNCTION_PADDING_BYTES=16
+CONFIG_CALL_PADDING=y
+CONFIG_HAVE_CALL_THUNKS=y
+CONFIG_CALL_THUNKS=y
+CONFIG_PREFIX_SYMBOLS=y
+CONFIG_SPECULATION_MITIGATIONS=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+CONFIG_RETPOLINE=y
+CONFIG_RETHUNK=y
+CONFIG_CPU_UNRET_ENTRY=y
+CONFIG_CALL_DEPTH_TRACKING=y
+# CONFIG_CALL_THUNKS_DEBUG is not set
+CONFIG_CPU_IBPB_ENTRY=y
+CONFIG_CPU_IBRS_ENTRY=y
+CONFIG_SLS=y
+CONFIG_ARCH_HAS_ADD_PAGES=y
+CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_USERSPACE_AUTOSLEEP is not set
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
+CONFIG_PM_CLK=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+# CONFIG_ENERGY_MODEL is not set
+CONFIG_ARCH_SUPPORTS_ACPI=y
+CONFIG_ACPI=y
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
+CONFIG_ACPI_TABLE_LIB=y
+# CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_SPCR_TABLE=y
+CONFIG_ACPI_FPDT=y
+CONFIG_ACPI_LPIT=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_TAD=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_PROCESSOR_CSTATE=y
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_CPPC_LIB=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_PLATFORM_PROFILE=m
+CONFIG_ACPI_CUSTOM_DSDT_FILE=""
+CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_HOTPLUG_IOAPIC=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+CONFIG_ACPI_BGRT=y
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_ACPI_NFIT=m
+# CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_HMAT=y
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HAVE_ACPI_APEI_NMI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
+# CONFIG_ACPI_APEI_ERST_DEBUG is not set
+CONFIG_ACPI_DPTF=y
+CONFIG_DPTF_POWER=m
+CONFIG_DPTF_PCH_FIVR=m
+CONFIG_ACPI_WATCHDOG=y
+CONFIG_ACPI_EXTLOG=m
+CONFIG_ACPI_ADXL=y
+CONFIG_ACPI_CONFIGFS=m
+CONFIG_ACPI_PFRUT=m
+CONFIG_ACPI_PCC=y
+CONFIG_ACPI_FFH=y
+# CONFIG_PMIC_OPREGION is not set
+CONFIG_TPS68470_PMIC_OPREGION=y
+CONFIG_ACPI_VIOT=y
+CONFIG_ACPI_PRMT=y
+CONFIG_X86_PM_TIMER=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=y
+CONFIG_X86_AMD_PSTATE=y
+# CONFIG_X86_AMD_PSTATE_UT is not set
+CONFIG_X86_ACPI_CPUFREQ=y
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_POWERNOW_K8=y
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=y
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+# end of CPU Frequency scaling
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE_GOV_TEO=y
+CONFIG_CPU_IDLE_GOV_HALTPOLL=y
+CONFIG_HALTPOLL_CPUIDLE=m
+# end of CPU Idle
+
+CONFIG_INTEL_IDLE=y
+# end of Power management and ACPI options
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_XEN=y
+CONFIG_MMCONF_FAM10H=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_ISA_BUS is not set
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+# end of Bus options (PCI etc.)
+
+#
+# Binary Emulations
+#
+CONFIG_IA32_EMULATION=y
+CONFIG_X86_X32_ABI=y
+CONFIG_COMPAT_32=y
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+# end of Binary Emulations
+
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_PFNCACHE=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_DIRTY_RING=y
+CONFIG_HAVE_KVM_DIRTY_RING_TSO=y
+CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_COMPAT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
+CONFIG_KVM_XFER_TO_GUEST_WORK=y
+CONFIG_HAVE_KVM_PM_NOTIFIER=y
+CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_WERROR=y
+CONFIG_KVM_INTEL=m
+CONFIG_X86_SGX_KVM=y
+CONFIG_KVM_AMD=m
+CONFIG_KVM_AMD_SEV=y
+CONFIG_KVM_SMM=y
+CONFIG_KVM_XEN=y
+CONFIG_KVM_EXTERNAL_WRITE_TRACKING=y
+CONFIG_AS_AVX512=y
+CONFIG_AS_SHA1_NI=y
+CONFIG_AS_SHA256_NI=y
+CONFIG_AS_TPAUSE=y
+CONFIG_AS_GFNI=y
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_HAVE_IMA_KEXEC=y
+CONFIG_HOTPLUG_SMT=y
+CONFIG_GENERIC_ENTRY=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+# CONFIG_STATIC_CALL_SELFTEST is not set
+CONFIG_OPTPROBES=y
+CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_KRETPROBE_ON_RETHOOK=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
+CONFIG_ARCH_WANTS_NO_INSTR=y
+CONFIG_HAVE_ASM_MODVERSIONS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_RUST=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_MMU_GATHER_TABLE_FREE=y
+CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
+CONFIG_MMU_GATHER_MERGE_VMAS=y
+CONFIG_MMU_LAZY_TLB_REFCOUNT=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_HAS_NMI_SAFE_THIS_CPU_OPS=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+CONFIG_HAVE_ARCH_STACKLEAK=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
+CONFIG_LTO_NONE=y
+CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
+CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
+CONFIG_HAVE_CONTEXT_TRACKING_USER=y
+CONFIG_HAVE_CONTEXT_TRACKING_USER_OFFSTACK=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PUD=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_HAVE_ARCH_HUGE_VMALLOC=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
+CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_HAVE_OBJTOOL=y
+CONFIG_HAVE_JUMP_LABEL_HACK=y
+CONFIG_HAVE_NOINSTR_HACK=y
+CONFIG_HAVE_NOINSTR_VALIDATION=y
+CONFIG_HAVE_UACCESS_VALIDATION=y
+CONFIG_HAVE_STACK_VALIDATION=y
+CONFIG_HAVE_RELIABLE_STACKTRACE=y
+CONFIG_ISA_BUS_API=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
+CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_ARCH_HAS_CC_PLATFORM=y
+CONFIG_HAVE_STATIC_CALL=y
+CONFIG_HAVE_STATIC_CALL_INLINE=y
+CONFIG_HAVE_PREEMPT_DYNAMIC=y
+CONFIG_HAVE_PREEMPT_DYNAMIC_CALL=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
+CONFIG_ARCH_HAS_ELFCORE_COMPAT=y
+CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y
+CONFIG_DYNAMIC_SIGFRAME=y
+CONFIG_HAVE_ARCH_NODE_DEV_GROUP=y
+CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_HAVE_GCC_PLUGINS=y
+CONFIG_GCC_PLUGINS=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_FUNCTION_ALIGNMENT_4B=y
+CONFIG_FUNCTION_ALIGNMENT_16B=y
+CONFIG_FUNCTION_ALIGNMENT=16
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_DEBUG is not set
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODULE_UNLOAD_TAINT_TRACKING is not set
+CONFIG_MODVERSIONS=y
+CONFIG_ASM_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS_NONE is not set
+CONFIG_MODULE_COMPRESS_GZIP=y
+# CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
+CONFIG_MODULE_DECOMPRESS=y
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+CONFIG_MODPROBE_PATH="/run/current-system/profile/bin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLOCK_LEGACY_AUTOLOAD=y
+CONFIG_BLK_RQ_ALLOC_TIME=y
+CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_CGROUP_PUNT_BIO=y
+CONFIG_BLK_DEV_BSG_COMMON=y
+CONFIG_BLK_ICQ=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_INTEGRITY_T10=y
+CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
+CONFIG_BLK_WBT=y
+CONFIG_BLK_WBT_MQ=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+CONFIG_BLK_CGROUP_FC_APPID=y
+CONFIG_BLK_CGROUP_IOCOST=y
+CONFIG_BLK_CGROUP_IOPRIO=y
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_DEBUG_FS_ZONED=y
+# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_INLINE_ENCRYPTION=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_ATARI_PARTITION=y
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+CONFIG_SGI_PARTITION=y
+CONFIG_ULTRIX_PARTITION=y
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+CONFIG_SYSV68_PARTITION=y
+CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
+CONFIG_BLK_MQ_STACKING=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_IOSCHED_BFQ=m
+# CONFIG_BFQ_GROUP_IOSCHED is not set
+# end of IO Schedulers
+
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
+CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
+CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_ZPOOL=y
+CONFIG_SWAP=y
+CONFIG_ZSWAP=y
+# CONFIG_ZSWAP_DEFAULT_ON is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+CONFIG_ZBUD=y
+CONFIG_Z3FOLD=m
+CONFIG_ZSMALLOC=y
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_ZSMALLOC_CHAIN_SIZE=8
+
+#
+# SLAB allocator options
+#
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLUB_TINY is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+# CONFIG_SLUB_STATS is not set
+CONFIG_SLUB_CPU_PARTIAL=y
+# end of SLAB allocator options
+
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SPARSEMEM=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_ARCH_WANT_OPTIMIZE_VMEMMAP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_NUMA_KEEP_MEMINFO=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_EXCLUSIVE_SYSTEM_RAM=y
+CONFIG_HAVE_BOOTMEM_INFO_NODE=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_MEMORY_HOTPLUG=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_MHP_MEMMAP_ON_MEMORY=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
+CONFIG_PAGE_REPORTING=y
+CONFIG_MIGRATION=y
+CONFIG_DEVICE_MIGRATION=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ARCH_WANTS_THP_SWAP=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_THP_SWAP=y
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_SYSFS=y
+CONFIG_CMA_AREAS=7
+CONFIG_MEM_SOFT_DIRTY=y
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+CONFIG_PAGE_IDLE_FLAG=y
+CONFIG_IDLE_PAGE_TRACKING=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_ARCH_HAS_ZONE_DMA_SET=y
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ZONE_DEVICE=y
+CONFIG_HMM_MIRROR=y
+CONFIG_GET_FREE_REGION=y
+# CONFIG_DEVICE_PRIVATE is not set
+CONFIG_VMAP_PFN=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+CONFIG_ARCH_HAS_PKEYS=y
+CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_TEST is not set
+# CONFIG_DMAPOOL_TEST is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_MAPPING_DIRTY_HELPERS=y
+CONFIG_SECRETMEM=y
+CONFIG_ANON_VMA_NAME=y
+CONFIG_USERFAULTFD=y
+CONFIG_HAVE_ARCH_USERFAULTFD_WP=y
+CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
+CONFIG_PTE_MARKER_UFFD_WP=y
+CONFIG_LRU_GEN=y
+# CONFIG_LRU_GEN_ENABLED is not set
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
+CONFIG_PER_VMA_LOCK=y
+CONFIG_LOCK_MM_AND_FIND_VMA=y
+
+#
+# Data Access Monitoring
+#
+CONFIG_DAMON=y
+CONFIG_DAMON_VADDR=y
+CONFIG_DAMON_PADDR=y
+CONFIG_DAMON_SYSFS=y
+# CONFIG_DAMON_DBGFS is not set
+CONFIG_DAMON_RECLAIM=y
+CONFIG_DAMON_LRU_SORT=y
+# end of Data Access Monitoring
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_WANT_COMPAT_NETLINK_MESSAGES=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_AF_UNIX_OOB=y
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+# CONFIG_TLS_DEVICE is not set
+# CONFIG_TLS_TOE is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_USER_COMPAT=m
+CONFIG_XFRM_INTERFACE=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+CONFIG_XFRM_STATISTICS=y
+CONFIG_XFRM_AH=m
+CONFIG_XFRM_ESP=m
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+# CONFIG_SMC is not set
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
+CONFIG_NET_HANDSHAKE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_ESP_OFFLOAD=m
+# CONFIG_INET_ESPINTCP is not set
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_TABLE_PERTURB_ORDER=16
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_RAW_DIAG=m
+# CONFIG_INET_DIAG_DESTROY is not set
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_ESP_OFFLOAD=m
+# CONFIG_INET6_ESPINTCP is not set
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
+# CONFIG_IPV6_RPL_LWTUNNEL is not set
+# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
+CONFIG_NETLABEL=y
+CONFIG_MPTCP=y
+CONFIG_INET_MPTCP_DIAG=m
+CONFIG_MPTCP_IPV6=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_EGRESS=y
+CONFIG_NETFILTER_SKIP_EGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_BPF_LINK=y
+CONFIG_NETFILTER_NETLINK_HOOK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_NETLINK_OSF=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_SYSLOG=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CONNTRACK_OVS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NF_NAT_OVS=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XTABLES_COMPAT=y
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_TWOS=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_CRYPTO=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_BRIDGE_MRP=y
+CONFIG_BRIDGE_CFM=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_NONE=m
+CONFIG_NET_DSA_TAG_AR9331=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_LEGACY=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_HELLCREEK=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_OCELOT=m
+CONFIG_NET_DSA_TAG_OCELOT_8021Q=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_RTL4_A=m
+CONFIG_NET_DSA_TAG_RTL8_4=m
+CONFIG_NET_DSA_TAG_RZN1_A5PSW=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
+CONFIG_NET_DSA_TAG_XRS700X=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_MQPRIO_LIB=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_SCH_ETS=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_SAMPLE=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_MPLS=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_ACT_CT=m
+CONFIG_NET_ACT_GATE=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+# CONFIG_NET_TC_SKB_EXT is not set
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_BATMAN_V is not set
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VSOCKETS_LOOPBACK=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+CONFIG_HSR=m
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_QRTR=m
+CONFIG_QRTR_SMD=m
+CONFIG_QRTR_TUN=m
+CONFIG_QRTR_MHI=m
+CONFIG_NET_NCSI=y
+# CONFIG_NCSI_OEM_CMD_GET_MAC is not set
+# CONFIG_NCSI_OEM_CMD_KEEP_PHY is not set
+CONFIG_PCPU_DEV_REFCNT=y
+CONFIG_MAX_SKB_FRAGS=17
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+# CONFIG_BPF_STREAM_PARSER is not set
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_DROP_MONITOR=m
+# end of Network testing
+# end of Networking options
+
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+# end of AX.25 network device drivers
+
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+CONFIG_CAN_J1939=m
+CONFIG_CAN_ISOTP=m
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_LE_L2CAP_ECRED=y
+CONFIG_BT_6LOWPAN=m
+# CONFIG_BT_LEDS is not set
+CONFIG_BT_MSFTEXT=y
+CONFIG_BT_AOSPEXT=y
+CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_SELFTEST is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_MTK=m
+CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
+CONFIG_BT_HCIBTUSB_POLL_SYNC=y
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_MTK=y
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_NOKIA=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_RTL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIUART_MRVL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBCM4377=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
+CONFIG_BT_HCIRSI=m
+CONFIG_BT_VIRTIO=m
+CONFIG_BT_NXPUART=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_INJECT_RX_DELAY is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+# CONFIG_RXKAD is not set
+# CONFIG_RXPERF is not set
+CONFIG_AF_KCM=m
+CONFIG_STREAM_PARSER=y
+CONFIG_MCTP=y
+CONFIG_MCTP_FLOWS=y
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+CONFIG_CFG80211_DEBUGFS=y
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_DEBUGFS=y
+CONFIG_MAC80211_MESSAGE_TRACING=y
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_RFKILL=y
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_FD=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_XEN=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=m
+CONFIG_NFC_NCI_UART=m
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_TRF7970A=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_VIRTUAL_NCI=m
+CONFIG_NFC_FDP=m
+CONFIG_NFC_FDP_I2C=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_PN532_UART=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_I2C=m
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
+CONFIG_NFC_MRVL_SPI=m
+CONFIG_NFC_ST21NFCA=m
+CONFIG_NFC_ST21NFCA_I2C=m
+CONFIG_NFC_ST_NCI=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+CONFIG_NFC_S3FWRN5=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_NFC_S3FWRN82_UART=m
+CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_NET_SELFTESTS=y
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_PAGE_POOL_STATS=y
+CONFIG_FAILOVER=y
+CONFIG_ETHTOOL_NETLINK=y
+
+#
+# Device Drivers
+#
+CONFIG_HAVE_EISA=y
+# CONFIG_EISA is not set
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_PCIE_DPC=y
+CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_EDR is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+# CONFIG_PCI_PF_STUB is not set
+CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_PCI_ATS=y
+CONFIG_PCI_DOE=y
+CONFIG_PCI_LOCKLESS_CONFIG=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_LABEL=y
+CONFIG_PCI_HYPERV=m
+# CONFIG_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+CONFIG_HOTPLUG_PCI_SHPC=y
+
+#
+# PCI controller drivers
+#
+CONFIG_VMD=m
+CONFIG_PCI_HYPERV_INTERFACE=m
+
+#
+# Cadence-based PCIe controllers
+#
+# end of Cadence-based PCIe controllers
+
+#
+# DesignWare-based PCIe controllers
+#
+# CONFIG_PCI_MESON is not set
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+# end of DesignWare-based PCIe controllers
+
+#
+# Mobiveil-based PCIe controllers
+#
+# end of Mobiveil-based PCIe controllers
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
+CONFIG_CXL_BUS=m
+CONFIG_CXL_PCI=m
+# CONFIG_CXL_MEM_RAW_COMMANDS is not set
+CONFIG_CXL_ACPI=m
+CONFIG_CXL_PMEM=m
+CONFIG_CXL_MEM=m
+CONFIG_CXL_PORT=m
+CONFIG_CXL_SUSPEND=y
+CONFIG_CXL_REGION=y
+# CONFIG_CXL_REGION_INVALIDATION_TEST is not set
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_TSI721=m
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
+# CONFIG_RAPIDIO_DEBUG is not set
+CONFIG_RAPIDIO_ENUM_BASIC=m
+CONFIG_RAPIDIO_CHMAN=m
+CONFIG_RAPIDIO_MPORT_CDEV=m
+
+#
+# RapidIO Switch drivers
+#
+CONFIG_RAPIDIO_CPS_XX=m
+CONFIG_RAPIDIO_CPS_GEN2=m
+CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
+
+#
+# Generic Driver Options
+#
+CONFIG_AUXILIARY_BUS=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEVTMPFS_SAFE=y
+# CONFIG_STANDALONE is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_DEBUG=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_FW_LOADER_SYSFS=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_LOADER_COMPRESS_XZ=y
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+CONFIG_FW_CACHE=y
+CONFIG_FW_UPLOAD=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_HMEM_REPORTING=y
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_SYS_HYPERVISOR=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_SOC_BUS=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_W1=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SOUNDWIRE=m
+CONFIG_REGMAP_SOUNDWIRE_MBQ=m
+CONFIG_REGMAP_SCCB=m
+CONFIG_REGMAP_I3C=m
+CONFIG_REGMAP_SPI_AVMM=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+# CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=m
+CONFIG_MHI_BUS_EP=m
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# end of ARM System Control and Management Interface Protocol
+
+CONFIG_EDD=y
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+CONFIG_FW_CFG_SYSFS=m
+# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
+CONFIG_SYSFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_FW_CS_DSP=m
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=m
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
+CONFIG_EFI_SOFT_RESERVE=y
+CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_BOOTLOADER_CONTROL=m
+# CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+CONFIG_EFI_DEV_PATH_PARSER=y
+CONFIG_APPLE_PROPERTIES=y
+CONFIG_RESET_ATTACK_MITIGATION=y
+# CONFIG_EFI_RCI2_TABLE is not set
+# CONFIG_EFI_DISABLE_PCI_DMA is not set
+CONFIG_EFI_EARLYCON=y
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
+# CONFIG_EFI_DISABLE_RUNTIME is not set
+CONFIG_EFI_COCO_SECRET=y
+# end of EFI (Extensible Firmware Interface) Support
+
+CONFIG_UEFI_CPER=y
+CONFIG_UEFI_CPER_X86=y
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_GNSS=m
+CONFIG_GNSS_SERIAL=m
+CONFIG_GNSS_MTK_SERIAL=m
+CONFIG_GNSS_SIRF_SERIAL=m
+CONFIG_GNSS_UBX_SERIAL=m
+CONFIG_GNSS_USB=m
+CONFIG_MTD=m
+# CONFIG_MTD_TESTS is not set
+
+#
+# Partition parsers
+#
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+
+#
+# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK.
+#
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_PHYSMAP_GPIO_ADDR=y
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+# CONFIG_MTD_PMC551_BUGFIX is not set
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+CONFIG_MTD_DATAFLASH_OTP=y
+CONFIG_MTD_MCHP23K256=m
+CONFIG_MTD_MCHP48L640=m
+CONFIG_MTD_SST25L=m
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
+# end of Self-contained MTD device drivers
+
+#
+# NAND
+#
+CONFIG_MTD_NAND_CORE=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+# CONFIG_MTD_ONENAND_OTP is not set
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_RAW_NAND=m
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_MXIC=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_NAND_ARASAN=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_SPI_NAND=m
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
+CONFIG_MTD_NAND_ECC_MXIC=y
+# end of ECC engine support
+# end of NAND
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set
+CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_FASTMAP=y
+CONFIG_MTD_UBI_GLUEBI=m
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_HYPERBUS=m
+# CONFIG_OF is not set
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
+CONFIG_CDROM=y
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+# CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_ZRAM_MULTI_COMP=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_VIRTIO_BLK=y
+CONFIG_BLK_DEV_RBD=m
+# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLK_DEV_RNBD=y
+CONFIG_BLK_DEV_RNBD_CLIENT=m
+CONFIG_BLK_DEV_RNBD_SERVER=m
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+# CONFIG_NVME_MULTIPATH is not set
+# CONFIG_NVME_VERBOSE_ERRORS is not set
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+# CONFIG_NVME_AUTH is not set
+CONFIG_NVME_TARGET=m
+# CONFIG_NVME_TARGET_PASSTHRU is not set
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+CONFIG_NVME_TARGET_FCLOOP=m
+CONFIG_NVME_TARGET_TCP=m
+# CONFIG_NVME_TARGET_AUTH is not set
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_DUMMY_IRQ=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_SMPRO_ERRMON=m
+CONFIG_SMPRO_MISC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_LATTICE_ECP3_CONFIG=m
+CONFIG_SRAM=y
+CONFIG_DW_XDATA_PCIE=m
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_XILINX_SDFEC=m
+CONFIG_MISC_RTSX=m
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_EEPROM_IDT_89HPESX=m
+CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+# CONFIG_INTEL_MEI is not set
+# CONFIG_INTEL_MEI_ME is not set
+# CONFIG_INTEL_MEI_TXE is not set
+# CONFIG_INTEL_MEI_HDCP is not set
+# CONFIG_INTEL_MEI_PXP is not set
+CONFIG_VMWARE_VMCI=m
+CONFIG_GENWQE=m
+CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
+CONFIG_ECHO=m
+CONFIG_BCM_VK=m
+CONFIG_BCM_VK_TTY=y
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_UACCE=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+CONFIG_GP_PCI1XXXX=m
+# end of Misc devices
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_COMMON=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
+CONFIG_AIC7XXX_RESET_DELAY_MS=5000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=5000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
+CONFIG_SCSI_MYRB=m
+CONFIG_SCSI_MYRS=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_FDOMAIN=m
+CONFIG_SCSI_FDOMAIN_PCI=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+CONFIG_SCSI_IPR_DUMP=y
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+# CONFIG_TCM_QLA2XXX_DEBUG is not set
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_QEDI=m
+CONFIG_QEDF=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_EFCT=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_ATA=y
+CONFIG_SATA_HOST=y
+CONFIG_PATA_TIMINGS=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_FORCE=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_DWC=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_DWC=m
+# CONFIG_SATA_DWC_OLD_DMA is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3_DMA is not set
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=m
+CONFIG_PATA_PARPORT=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PATA_PARPORT_ATEN=m
+CONFIG_PATA_PARPORT_BPCK=m
+CONFIG_PATA_PARPORT_BPCK6=m
+CONFIG_PATA_PARPORT_COMM=m
+CONFIG_PATA_PARPORT_DSTR=m
+CONFIG_PATA_PARPORT_FIT2=m
+CONFIG_PATA_PARPORT_FIT3=m
+CONFIG_PATA_PARPORT_EPAT=m
+CONFIG_PATA_PARPORT_EPATC8=y
+CONFIG_PATA_PARPORT_EPIA=m
+CONFIG_PATA_PARPORT_FRIQ=m
+CONFIG_PATA_PARPORT_FRPW=m
+CONFIG_PATA_PARPORT_KBIC=m
+CONFIG_PATA_PARPORT_KTTI=m
+CONFIG_PATA_PARPORT_ON20=m
+CONFIG_PATA_PARPORT_ON26=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_WRITECACHE=m
+# CONFIG_DM_EBS is not set
+CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_HST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+# CONFIG_DM_INIT is not set
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_ZONED=m
+CONFIG_DM_AUDIT=y
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_REMOTE_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+CONFIG_FUSION_LOGGING=y
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=m
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
+CONFIG_EQUALIZER=m
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_GTP=m
+CONFIG_AMT=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
+CONFIG_TUN=y
+CONFIG_TAP=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=y
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+CONFIG_VSOCKMON=m
+CONFIG_MHI_NET=m
+CONFIG_SUNGEM_PHY=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+CONFIG_CAIF_DRIVERS=y
+CONFIG_CAIF_TTY=m
+CONFIG_CAIF_VIRTIO=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_B53=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_B53_SERDES=m
+CONFIG_NET_DSA_BCM_SF2=m
+# CONFIG_NET_DSA_LOOP is not set
+CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m
+CONFIG_NET_DSA_LANTIQ_GSWIP=m
+CONFIG_NET_DSA_MT7530=m
+CONFIG_NET_DSA_MT7530_MDIO=m
+CONFIG_NET_DSA_MT7530_MMIO=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_PTP=y
+CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI=m
+CONFIG_NET_DSA_MV88E6XXX=m
+# CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_MSCC_FELIX_DSA_LIB=m
+CONFIG_NET_DSA_MSCC_OCELOT_EXT=m
+CONFIG_NET_DSA_MSCC_SEVILLE=m
+CONFIG_NET_DSA_AR9331=m
+CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT=y
+CONFIG_NET_DSA_SJA1105=m
+CONFIG_NET_DSA_SJA1105_PTP=y
+# CONFIG_NET_DSA_SJA1105_TAS is not set
+CONFIG_NET_DSA_XRS700X=m
+CONFIG_NET_DSA_XRS700X_I2C=m
+CONFIG_NET_DSA_XRS700X_MDIO=m
+CONFIG_NET_DSA_REALTEK=m
+# CONFIG_NET_DSA_REALTEK_MDIO is not set
+# CONFIG_NET_DSA_REALTEK_SMI is not set
+CONFIG_NET_DSA_REALTEK_RTL8365MB=m
+CONFIG_NET_DSA_REALTEK_RTL8366RB=m
+CONFIG_NET_DSA_SMSC_LAN9303=m
+CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
+CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
+CONFIG_NET_DSA_VITESSE_VSC73XX=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_SLICOSS=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_AMD_XGBE=m
+# CONFIG_AMD_XGBE_DCB is not set
+CONFIG_AMD_XGBE_HAVE_ECC=y
+CONFIG_PDS_CORE=m
+CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ASIX=y
+CONFIG_SPI_AX88796C=m
+CONFIG_SPI_AX88796C_COMPRESSION=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_CX_ECAT=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+# CONFIG_SYSTEMPORT is not set
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+# CONFIG_BNXT_DCB is not set
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+CONFIG_MACB_PCI=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=m
+CONFIG_LIQUIDIO=m
+CONFIG_LIQUIDIO_VF=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_CHELSIO_INLINE_CRYPTO=y
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+# CONFIG_NET_VENDOR_CORTINA is not set
+CONFIG_NET_VENDOR_DAVICOM=y
+CONFIG_DM9051=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_ENGLEDER=y
+CONFIG_TSNEP=m
+# CONFIG_TSNEP_SELFTESTS is not set
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_FUNGIBLE=y
+CONFIG_FUN_CORE=m
+CONFIG_FUN_ETH=m
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_GVE=m
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_HINIC=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_E1000E_HWTS=y
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBE_DCB=y
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+CONFIG_IAVF=m
+CONFIG_I40EVF=m
+CONFIG_ICE=m
+CONFIG_ICE_SWITCHDEV=y
+CONFIG_ICE_HWTS=y
+CONFIG_FM10K=m
+CONFIG_IGC=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_ADI=y
+CONFIG_ADIN1110=m
+CONFIG_NET_VENDOR_LITEX=y
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_OCTEON_EP=m
+CONFIG_PRESTERA=m
+CONFIG_PRESTERA_PCI=m
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+# CONFIG_MLX5_FPGA is not set
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_BRIDGE=y
+CONFIG_MLX5_CORE_EN_DCB=y
+# CONFIG_MLX5_CORE_IPOIB is not set
+CONFIG_MLX5_EN_MACSEC=y
+CONFIG_MLX5_EN_IPSEC=y
+CONFIG_MLX5_SW_STEERING=y
+CONFIG_MLX5_SF=y
+CONFIG_MLX5_SF_MANAGER=y
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_CORE_THERMAL=y
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_I2C=m
+CONFIG_MLXSW_SPECTRUM=m
+CONFIG_MLXSW_SPECTRUM_DCB=y
+CONFIG_MLXSW_MINIMAL=m
+CONFIG_MLXFW=m
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ENCX24J600=m
+CONFIG_LAN743X=m
+# CONFIG_VCAP is not set
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_MSCC_OCELOT_SWITCH_LIB=m
+CONFIG_NET_VENDOR_MICROSOFT=y
+CONFIG_MICROSOFT_MANA=m
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+# CONFIG_NFP_APP_FLOWER is not set
+CONFIG_NFP_APP_ABM_NIC=y
+CONFIG_NFP_NET_IPSEC=y
+# CONFIG_NFP_DEBUG is not set
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_ETHOC=m
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_PENSANDO=y
+CONFIG_IONIC=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_RDMA=y
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_QCOM_EMAC=m
+CONFIG_RMNET=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_ROCKER=m
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_SFC_SIENA=m
+CONFIG_SFC_SIENA_MTD=y
+CONFIG_SFC_SIENA_MCDI_MON=y
+CONFIG_SFC_SIENA_SRIOV=y
+CONFIG_SFC_SIENA_MCDI_LOGGING=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_INTEL=m
+CONFIG_DWMAC_LOONGSON=m
+# CONFIG_STMMAC_PCI is not set
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+CONFIG_DWC_XLGMAC=m
+CONFIG_DWC_XLGMAC_PCI=m
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VERTEXCOM=y
+CONFIG_MSE102X=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WANGXUN=y
+CONFIG_LIBWX=m
+CONFIG_NGBE=m
+CONFIG_TXGBE=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+# CONFIG_WIZNET_W5100_SPI is not set
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_EMACLITE=m
+CONFIG_XILINX_AXI_EMAC=m
+CONFIG_XILINX_LL_TEMAC=m
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+CONFIG_SKFP=m
+# CONFIG_HIPPI is not set
+CONFIG_NET_SB1000=m
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
+CONFIG_FIXED_PHY=y
+CONFIG_SFP=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+CONFIG_ADIN_PHY=m
+CONFIG_ADIN1100_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM84881_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
+CONFIG_MEDIATEK_GE_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_T1S_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MOTORCOMM_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_CBTX_PHY=m
+CONFIG_NXP_C45_TJA11XX_PHY=m
+CONFIG_NXP_TJA11XX_PHY=m
+CONFIG_NCN26000_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_DP83TD510_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_PSE_CONTROLLER=y
+CONFIG_PSE_REGULATOR=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_VXCAN=m
+CONFIG_CAN_NETLINK=y
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_RX_OFFLOAD=y
+CONFIG_CAN_CAN327=m
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_CAN_KVASER_PCIEFD=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
+CONFIG_CAN_CC770_PLATFORM=m
+CONFIG_CAN_CTUCANFD=m
+CONFIG_CAN_CTUCANFD_PCI=m
+CONFIG_CAN_IFI_CANFD=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_M_CAN_PCI=m
+CONFIG_CAN_M_CAN_PLATFORM=m
+CONFIG_CAN_M_CAN_TCAN4X5X=m
+CONFIG_CAN_PEAK_PCIEFD=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_EMS_PCMCIA=m
+CONFIG_CAN_F81601=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_PEAK_PCMCIA=m
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_SJA1000_ISA=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+
+#
+# CAN SPI interfaces
+#
+CONFIG_CAN_HI311X=m
+CONFIG_CAN_MCP251X=m
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY is not set
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB=m
+CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+CONFIG_CAN_MCBA_USB=m
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+# CONFIG_CAN_DEBUG_DEVICES is not set
+
+#
+# MCTP Device Drivers
+#
+CONFIG_MCTP_SERIAL=m
+CONFIG_MCTP_TRANSPORT_I2C=m
+# end of MCTP Device Drivers
+
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_FWNODE_MDIO=y
+CONFIG_ACPI_MDIO=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MVUSB=m
+CONFIG_MDIO_MSCC_MIIM=m
+CONFIG_MDIO_THUNDER=m
+
+#
+# MDIO Multiplexers
+#
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+CONFIG_PCS_LYNX=m
+CONFIG_PCS_MTK_LYNXI=m
+CONFIG_PCS_ALTERA_TSE=m
+# end of PCS device drivers
+
+CONFIG_PLIP=m
+CONFIG_PPP=y
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=y
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8153_ECM=m
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_COMMON_DEBUG=y
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+CONFIG_ATH9K_DEBUGFS=y
+CONFIG_ATH9K_STATION_STATISTICS=y
+# CONFIG_ATH9K_DYNACK is not set
+CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_PCI_NO_EEPROM=m
+CONFIG_ATH9K_HTC=m
+CONFIG_ATH9K_HTC_DEBUGFS=y
+CONFIG_ATH9K_HWRNG=y
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+# CONFIG_CARL9170_DEBUGFS is not set
+CONFIG_CARL9170_WPC=y
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_TRACING=y
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_SDIO=m
+CONFIG_ATH10K_USB=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_SPECTRAL is not set
+CONFIG_ATH10K_TRACING=y
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_DEBUGFS is not set
+# CONFIG_ATH11K_TRACING is not set
+CONFIG_ATH12K=m
+# CONFIG_ATH12K_DEBUG is not set
+# CONFIG_ATH12K_TRACING is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+# CONFIG_B43_SDIO is not set
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMSMAC_LEDS=y
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+CONFIG_BRCM_TRACING=y
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_AIRO_CS=m
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_IWLEGACY_DEBUGFS=y
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEBUGFS=y
+CONFIG_IWLWIFI_DEVICE_TRACING=y
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
+CONFIG_P54_LEDS=y
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+# CONFIG_MT76x0U is not set
+# CONFIG_MT76x0E is not set
+# CONFIG_MT76x2E is not set
+# CONFIG_MT76x2U is not set
+# CONFIG_MT7603E is not set
+# CONFIG_MT7615E is not set
+# CONFIG_MT7663U is not set
+# CONFIG_MT7663S is not set
+# CONFIG_MT7915E is not set
+# CONFIG_MT7921E is not set
+# CONFIG_MT7921S is not set
+# CONFIG_MT7921U is not set
+# CONFIG_MT7996E is not set
+CONFIG_WLAN_VENDOR_MICROCHIP=y
+CONFIG_WILC1000=m
+CONFIG_WILC1000_SDIO=m
+CONFIG_WILC1000_SPI=m
+# CONFIG_WILC1000_HW_OOB_INTR is not set
+CONFIG_WLAN_VENDOR_PURELIFI=y
+CONFIG_PLFXLC=m
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_LIB_DEBUGFS is not set
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_SDIO=m
+CONFIG_RTW88_USB=m
+CONFIG_RTW88_8822B=m
+CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723D=m
+CONFIG_RTW88_8821C=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822BS=m
+CONFIG_RTW88_8822BU=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8822CS=m
+CONFIG_RTW88_8822CU=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8723DU=m
+CONFIG_RTW88_8821CE=m
+CONFIG_RTW88_8821CS=m
+CONFIG_RTW88_8821CU=m
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
+CONFIG_RTW89=m
+CONFIG_RTW89_CORE=m
+CONFIG_RTW89_PCI=m
+CONFIG_RTW89_8852A=m
+CONFIG_RTW89_8852B=m
+CONFIG_RTW89_8852C=m
+CONFIG_RTW89_8852AE=m
+CONFIG_RTW89_8852BE=m
+CONFIG_RTW89_8852CE=m
+# CONFIG_RTW89_DEBUGMSG is not set
+# CONFIG_RTW89_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+# CONFIG_RSI_DEBUGFS is not set
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_SILABS=y
+CONFIG_WFX=m
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_VIRT_WIFI=m
+CONFIG_WAN=y
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+CONFIG_HDLC_X25=m
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+CONFIG_PC300TOO=m
+CONFIG_FARSYNC=m
+CONFIG_LAPBETHER=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+CONFIG_IEEE802154_MRF24J40=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_CA8210=m
+# CONFIG_IEEE802154_CA8210_DEBUGFS is not set
+CONFIG_IEEE802154_MCR20A=m
+# CONFIG_IEEE802154_HWSIM is not set
+
+#
+# Wireless WAN
+#
+CONFIG_WWAN=y
+# CONFIG_WWAN_DEBUGFS is not set
+# CONFIG_WWAN_HWSIM is not set
+CONFIG_MHI_WWAN_CTRL=m
+CONFIG_MHI_WWAN_MBIM=m
+CONFIG_RPMSG_WWAN_CTRL=m
+CONFIG_IOSM=m
+CONFIG_MTK_T7XX=m
+# end of Wireless WAN
+
+CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
+CONFIG_USB4_NET=m
+CONFIG_HYPERV_NET=m
+CONFIG_NETDEVSIM=m
+CONFIG_NET_FAILOVER=y
+CONFIG_ISDN=y
+CONFIG_ISDN_CAPI=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_HDLC=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+CONFIG_INPUT_VIVALDIFMAP=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADC=m
+CONFIG_KEYBOARD_ADP5520=m
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_APPLESPI=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+CONFIG_KEYBOARD_DLINK_DIR685=m
+CONFIG_KEYBOARD_LKKBD=m
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_PINEPHONE=m
+CONFIG_KEYBOARD_SAMSUNG=m
+CONFIG_KEYBOARD_STOWAWAY=m
+CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_IQS62X=m
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
+CONFIG_KEYBOARD_TWL4030=m
+CONFIG_KEYBOARD_XTKBD=m
+CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_KEYBOARD_MTK_PMIC=m
+CONFIG_KEYBOARD_CYPRESS_SF=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_PS2_SMBUS=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADC=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_JOYSTICK_PSXPAD_SPI=m
+# CONFIG_JOYSTICK_PSXPAD_SPI_FF is not set
+CONFIG_JOYSTICK_PXRC=m
+CONFIG_JOYSTICK_QWIIC=m
+CONFIG_JOYSTICK_FSIA6B=m
+CONFIG_JOYSTICK_SENSEHAT=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_88PM860X=m
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ADC=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_BU21029=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
+CONFIG_TOUCHSCREEN_CY8CTMA140=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP5=m
+CONFIG_TOUCHSCREEN_DA9034=m
+CONFIG_TOUCHSCREEN_DA9052=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_EXC3000=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_HIDEEP=m
+CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
+CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_ILITEK=m
+CONFIG_TOUCHSCREEN_S6SY761=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_EKTF2127=m
+CONFIG_TOUCHSCREEN_ELAN=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
+CONFIG_TOUCHSCREEN_MSG2638=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS=m
+CONFIG_TOUCHSCREEN_IMAGIS=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM831X=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
+CONFIG_TOUCHSCREEN_PCAP=m
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_STMFTS=m
+CONFIG_TOUCHSCREEN_SUR40=m
+CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZET6223=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_ZINITIX=m
+CONFIG_TOUCHSCREEN_HIMAX_HX83112B=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_88PM860X_ONKEY=m
+CONFIG_INPUT_88PM80X_ONKEY=m
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_ARIZONA_HAPTICS=m
+CONFIG_INPUT_ATC260X_ONKEY=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77693_HAPTIC=m
+CONFIG_INPUT_MAX8925_ONKEY=m
+CONFIG_INPUT_MAX8997_HAPTIC=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GPIO_BEEPER=m
+CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_TWL4030_PWRBUTTON=m
+CONFIG_INPUT_TWL4030_VIBRA=m
+CONFIG_INPUT_TWL6040_VIBRA=m
+CONFIG_INPUT_UINPUT=y
+CONFIG_INPUT_PALMAS_PWRBUTTON=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_INPUT_PWM_VIBRA=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_DA7280_HAPTICS=m
+CONFIG_INPUT_DA9052_ONKEY=m
+CONFIG_INPUT_DA9055_ONKEY=m
+CONFIG_INPUT_DA9063_ONKEY=m
+CONFIG_INPUT_WM831X_ON=m
+CONFIG_INPUT_PCAP=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IBM_PANEL=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_IQS269A=m
+CONFIG_INPUT_IQS626A=m
+CONFIG_INPUT_IQS7222=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_INPUT_RAVE_SP_PWRBUTTON=m
+CONFIG_INPUT_RT5120_PWRKEY=m
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+# CONFIG_RMI4_F34 is not set
+CONFIG_RMI4_F3A=y
+# CONFIG_RMI4_F54 is not set
+CONFIG_RMI4_F55=y
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
+CONFIG_SERIO_GPIO_PS2=m
+CONFIG_USERIO=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=0
+# CONFIG_LEGACY_TIOCSTI is not set
+CONFIG_LDISC_AUTOLOAD=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
+# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
+# CONFIG_SERIAL_8250_FINTEK is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCILIB=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=m
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_MEN_MCB=m
+CONFIG_SERIAL_8250_NR_UARTS=48
+CONFIG_SERIAL_8250_RUNTIME_UARTS=32
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_PCI1XXXX=m
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_DWLIB=y
+CONFIG_SERIAL_8250_DFL=m
+CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_8250_LPSS=m
+CONFIG_SERIAL_8250_MID=m
+CONFIG_SERIAL_8250_PERICOM=m
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_KGDB_NMI=y
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_MAX310X=y
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_CONSOLE_POLL=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_LANTIQ=m
+CONFIG_SERIAL_SCCNXP=y
+CONFIG_SERIAL_SCCNXP_CONSOLE=y
+CONFIG_SERIAL_SC16IS7XX_CORE=m
+CONFIG_SERIAL_SC16IS7XX=m
+CONFIG_SERIAL_SC16IS7XX_I2C=y
+CONFIG_SERIAL_SC16IS7XX_SPI=y
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_FSL_LINFLEXUART=m
+CONFIG_SERIAL_MEN_Z135=m
+# CONFIG_SERIAL_SPRD is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+CONFIG_IPWIRELESS=m
+CONFIG_N_GSM=m
+CONFIG_NOZOMI=m
+CONFIG_NULL_TTY=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_RPMSG_TTY=m
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+CONFIG_TTY_PRINTK=y
+CONFIG_TTY_PRINTK_LEVEL=6
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DMI_DECODE=y
+CONFIG_IPMI_PLAT_DATA=y
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_IPMB=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_SSIF_IPMI_BMC=m
+CONFIG_IPMB_DEVICE_INTERFACE=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_BA431=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_APPLICOM=m
+CONFIG_MWAVE=m
+CONFIG_DEVMEM=y
+CONFIG_NVRAM=m
+CONFIG_DEVPORT=y
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=y
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TIS_CORE=y
+CONFIG_TCG_TIS=y
+CONFIG_TCG_TIS_SPI=m
+# CONFIG_TCG_TIS_SPI_CR50 is not set
+CONFIG_TCG_TIS_I2C=m
+# CONFIG_TCG_TIS_I2C_CR50 is not set
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_XEN=m
+CONFIG_TCG_CRB=y
+CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TCG_TIS_ST33ZP24_SPI=m
+CONFIG_TELCLOCK=m
+CONFIG_XILLYBUS_CLASS=m
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+CONFIG_XILLYUSB=m
+# end of Character devices
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_CCGX_UCSI=m
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_CHT_WC=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_CBUS_GPIO=m
+CONFIG_I2C_DESIGNWARE_CORE=y
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EMEV2=m
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+CONFIG_I2C_KEMPLD=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
+CONFIG_I2C_CP2615=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PCI1XXXX=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_MLXCPLD=m
+CONFIG_I2C_CROS_EC_TUNNEL=m
+CONFIG_I2C_VIRTIO=m
+# end of I2C Hardware Bus support
+
+CONFIG_I2C_STUB=m
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+# CONFIG_I2C_SLAVE_TESTUNIT is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+CONFIG_I3C=m
+CONFIG_CDNS_I3C_MASTER=m
+CONFIG_DW_I3C_MASTER=m
+CONFIG_SVC_I3C_MASTER=m
+# CONFIG_MIPI_I3C_HCI is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ALTERA=m
+CONFIG_SPI_ALTERA_CORE=m
+CONFIG_SPI_ALTERA_DFL=m
+CONFIG_SPI_AXI_SPI_ENGINE=m
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_CADENCE=m
+CONFIG_SPI_DESIGNWARE=m
+# CONFIG_SPI_DW_DMA is not set
+CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_DW_MMIO=m
+CONFIG_SPI_DLN2=m
+CONFIG_SPI_GPIO=m
+# CONFIG_SPI_INTEL_PCI is not set
+# CONFIG_SPI_INTEL_PLATFORM is not set
+CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_MICROCHIP_CORE=m
+CONFIG_SPI_MICROCHIP_CORE_QSPI=m
+CONFIG_SPI_LANTIQ_SSC=m
+CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_PCI1XXXX=m
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+CONFIG_SPI_SC18IS602=m
+CONFIG_SPI_SIFIVE=m
+CONFIG_SPI_MXIC=m
+CONFIG_SPI_XCOMM=m
+# CONFIG_SPI_XILINX is not set
+CONFIG_SPI_ZYNQMP_GQSPI=m
+CONFIG_SPI_AMD=m
+
+#
+# SPI Multiplexer support
+#
+CONFIG_SPI_MUX=m
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+# CONFIG_SPI_LOOPBACK_TEST is not set
+CONFIG_SPI_TLE62X0=m
+# CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
+CONFIG_SPMI=m
+# CONFIG_SPMI_HISI3670 is not set
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=m
+CONFIG_PTP_1588_CLOCK_OPTIONAL=m
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_IDT82P33=m
+CONFIG_PTP_1588_CLOCK_IDTCM=m
+# CONFIG_PTP_1588_CLOCK_VMW is not set
+CONFIG_PTP_1588_CLOCK_OCP=m
+CONFIG_PTP_DFL_TOD=m
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_CY8C95X0=m
+# CONFIG_PINCTRL_DA9062 is not set
+CONFIG_PINCTRL_MCP23S08_I2C=m
+CONFIG_PINCTRL_MCP23S08_SPI=m
+CONFIG_PINCTRL_MCP23S08=m
+CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_MADERA=m
+
+#
+# Intel pinctrl drivers
+#
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_LYNXPOINT=m
+CONFIG_PINCTRL_INTEL=y
+CONFIG_PINCTRL_ALDERLAKE=m
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_DENVERTON=m
+CONFIG_PINCTRL_ELKHARTLAKE=m
+CONFIG_PINCTRL_EMMITSBURG=m
+CONFIG_PINCTRL_GEMINILAKE=m
+CONFIG_PINCTRL_ICELAKE=m
+CONFIG_PINCTRL_JASPERLAKE=m
+CONFIG_PINCTRL_LAKEFIELD=m
+CONFIG_PINCTRL_LEWISBURG=m
+CONFIG_PINCTRL_METEORLAKE=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_TIGERLAKE=m
+# end of Intel pinctrl drivers
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_REGMAP=m
+CONFIG_GPIO_MAX730X=m
+CONFIG_GPIO_IDIO_16=m
+
+#
+# Memory mapped GPIO drivers
+#
+CONFIG_GPIO_AMDPT=m
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_EXAR=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_ICH=m
+CONFIG_GPIO_MB86S7X=m
+CONFIG_GPIO_MENZ127=m
+CONFIG_GPIO_TANGIER=m
+CONFIG_GPIO_VX855=m
+CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
+
+#
+# Port-mapped I/O GPIO drivers
+#
+CONFIG_GPIO_F7188X=m
+CONFIG_GPIO_IT87=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_SCH311X=m
+CONFIG_GPIO_WINBOND=m
+CONFIG_GPIO_WS16C48=m
+# end of Port-mapped I/O GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_FXL6408=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCA9570=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_ADP5520=m
+CONFIG_GPIO_ARIZONA=m
+CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_CRYSTAL_COVE=m
+CONFIG_GPIO_DA9052=m
+CONFIG_GPIO_DA9055=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_ELKHARTLAKE=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_KEMPLD=m
+CONFIG_GPIO_LP3943=m
+CONFIG_GPIO_LP873X=m
+CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_PALMAS=y
+CONFIG_GPIO_RC5T583=y
+CONFIG_GPIO_TPS65086=m
+CONFIG_GPIO_TPS6586X=y
+CONFIG_GPIO_TPS65910=y
+CONFIG_GPIO_TPS65912=m
+CONFIG_GPIO_TPS68470=m
+CONFIG_GPIO_TQMX86=m
+CONFIG_GPIO_TWL4030=m
+CONFIG_GPIO_TWL6040=m
+CONFIG_GPIO_WHISKEY_COVE=m
+CONFIG_GPIO_WM831X=m
+CONFIG_GPIO_WM8350=m
+CONFIG_GPIO_WM8994=m
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_AMD8111=m
+CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_PCI_IDIO_16=m
+CONFIG_GPIO_PCIE_IDIO_24=m
+CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+CONFIG_GPIO_MAX3191X=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MC33880=m
+CONFIG_GPIO_PISOSR=m
+CONFIG_GPIO_XRA1403=m
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_LATCH=m
+# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_VIRTIO=m
+# CONFIG_GPIO_SIM is not set
+# end of Virtual GPIO drivers
+
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_GPIO=m
+CONFIG_W1_MASTER_SGI=m
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2405=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2408_READBACK=y
+CONFIG_W1_SLAVE_DS2413=m
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2430=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2438=m
+CONFIG_W1_SLAVE_DS250X=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_ATC260X=m
+# CONFIG_POWER_RESET_MT6323 is not set
+CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_RESET_TPS65086=y
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_GENERIC_ADC_BATTERY=m
+CONFIG_IP5XXX_POWER=m
+CONFIG_MAX8925_POWER=m
+CONFIG_WM831X_BACKUP=m
+CONFIG_WM831X_POWER=m
+CONFIG_WM8350_POWER=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_88PM860X=m
+CONFIG_CHARGER_ADP5061=m
+CONFIG_BATTERY_CW2015=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+# CONFIG_BATTERY_SAMSUNG_SDI is not set
+CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_SBS=m
+CONFIG_MANAGER_SBS=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+CONFIG_BATTERY_DA9030=m
+CONFIG_BATTERY_DA9052=m
+CONFIG_CHARGER_DA9150=m
+CONFIG_BATTERY_DA9150=m
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+CONFIG_AXP288_CHARGER=m
+CONFIG_AXP288_FUEL_GAUGE=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_BATTERY_MAX1721X=m
+CONFIG_BATTERY_TWL4030_MADC=m
+CONFIG_CHARGER_88PM860X=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_BATTERY_RX51=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_TWL4030=m
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_LP8788=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_CHARGER_MANAGER=y
+CONFIG_CHARGER_LT3651=m
+CONFIG_CHARGER_LTC4162L=m
+CONFIG_CHARGER_MAX14577=m
+CONFIG_CHARGER_MAX77693=m
+CONFIG_CHARGER_MAX77976=m
+CONFIG_CHARGER_MAX8997=m
+CONFIG_CHARGER_MAX8998=m
+CONFIG_CHARGER_MP2629=m
+CONFIG_CHARGER_MT6360=m
+CONFIG_CHARGER_MT6370=m
+CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ2515X=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_BQ25980=m
+CONFIG_CHARGER_BQ256XX=m
+CONFIG_CHARGER_SMB347=m
+CONFIG_CHARGER_TPS65090=m
+CONFIG_BATTERY_GAUGE_LTC2941=m
+CONFIG_BATTERY_GOLDFISH=m
+CONFIG_BATTERY_RT5033=m
+CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_RT9467=m
+CONFIG_CHARGER_RT9471=m
+CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_CROS_PCHG=m
+CONFIG_CHARGER_BD99954=m
+CONFIG_CHARGER_WILCO=m
+CONFIG_BATTERY_SURFACE=m
+CONFIG_CHARGER_SURFACE=m
+CONFIG_BATTERY_UG3105=m
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_SMPRO=m
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM1177=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_AHT10=m
+CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
+CONFIG_SENSORS_AS370=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_AXI_FAN_CONTROL=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORSAIR_CPRO=m
+CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_DRIVETEMP=y
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DELL_SMM=m
+# CONFIG_I8K is not set
+CONFIG_SENSORS_DA9052_ADC=m
+CONFIG_SENSORS_DA9055=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2947=m
+CONFIG_SENSORS_LTC2947_I2C=m
+CONFIG_SENSORS_LTC2947_SPI=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC2992=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX127=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX31730=m
+CONFIG_SENSORS_MAX31760=m
+CONFIG_SENSORS_MAX6620=m
+CONFIG_SENSORS_MAX6621=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MC34VR500=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_TC654=m
+CONFIG_SENSORS_TPS23861=m
+CONFIG_SENSORS_MENF21BMC_HWMON=m
+CONFIG_SENSORS_MR75203=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775_CORE=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT6775_I2C=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_NZXT_KRAKEN2=m
+CONFIG_SENSORS_NZXT_SMART2=m
+CONFIG_SENSORS_OCC_P8_I2C=m
+CONFIG_SENSORS_OCC=m
+CONFIG_SENSORS_OXP=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ACBEL_FSG032=m
+CONFIG_SENSORS_ADM1266=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_BEL_PFE=m
+CONFIG_SENSORS_BPA_RS600=m
+CONFIG_SENSORS_DELTA_AHE50DC_FAN=m
+CONFIG_SENSORS_FSP_3Y=m
+CONFIG_SENSORS_IBM_CFFPS=m
+CONFIG_SENSORS_DPS920AB=m
+CONFIG_SENSORS_INSPUR_IPSPS=m
+CONFIG_SENSORS_IR35221=m
+CONFIG_SENSORS_IR36021=m
+CONFIG_SENSORS_IR38064=m
+CONFIG_SENSORS_IR38064_REGULATOR=y
+CONFIG_SENSORS_IRPS5401=m
+CONFIG_SENSORS_ISL68137=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LM25066_REGULATOR=y
+CONFIG_SENSORS_LT7182S=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_LTC2978_REGULATOR=y
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX15301=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX16601=m
+CONFIG_SENSORS_MAX20730=m
+CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX31785=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_MP2888=m
+CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP5023=m
+CONFIG_SENSORS_MPQ7932_REGULATOR=y
+CONFIG_SENSORS_MPQ7932=m
+CONFIG_SENSORS_PIM4328=m
+CONFIG_SENSORS_PLI1209BC=m
+CONFIG_SENSORS_PLI1209BC_REGULATOR=y
+CONFIG_SENSORS_PM6764TR=m
+CONFIG_SENSORS_PXE1610=m
+CONFIG_SENSORS_Q54SJ108A2=m
+CONFIG_SENSORS_STPDDC60=m
+CONFIG_SENSORS_TDA38640=m
+CONFIG_SENSORS_TDA38640_REGULATOR=y
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_TPS53679=m
+CONFIG_SENSORS_TPS546D24=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_XDPE152=m
+CONFIG_SENSORS_XDPE122=m
+CONFIG_SENSORS_XDPE122_REGULATOR=y
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SBTSI=m
+CONFIG_SENSORS_SBRMI=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHT4x=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SY7636A=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC2305=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_STTS751=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_INA238=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_TC74=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP108=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_TMP464=m
+CONFIG_SENSORS_TMP513=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_WM831X=m
+CONFIG_SENSORS_WM8350=m
+CONFIG_SENSORS_XGENE=m
+CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_ASUS_WMI=m
+CONFIG_SENSORS_ASUS_EC=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_NETLINK=y
+# CONFIG_THERMAL_STATISTICS is not set
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_ACPI=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_DEVFREQ_THERMAL=y
+CONFIG_THERMAL_EMULATION=y
+
+#
+# Intel thermal drivers
+#
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_INTEL_TCC=y
+CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
+CONFIG_INTEL_SOC_DTS_THERMAL=m
+
+#
+# ACPI INT340X thermal drivers
+#
+CONFIG_INT340X_THERMAL=m
+CONFIG_ACPI_THERMAL_REL=m
+CONFIG_INT3406_THERMAL=m
+CONFIG_PROC_THERMAL_MMIO_RAPL=m
+# end of ACPI INT340X thermal drivers
+
+CONFIG_INTEL_BXT_PMIC_THERMAL=m
+CONFIG_INTEL_PCH_THERMAL=m
+CONFIG_INTEL_TCC_COOLING=m
+CONFIG_INTEL_HFI_THERMAL=y
+# end of Intel thermal drivers
+
+CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT=y
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_DA9052_WATCHDOG=m
+CONFIG_DA9055_WATCHDOG=m
+CONFIG_DA9063_WATCHDOG=m
+CONFIG_DA9062_WATCHDOG=m
+CONFIG_MENF21BMC_WATCHDOG=m
+CONFIG_MENZ069_WATCHDOG=m
+CONFIG_WDAT_WDT=m
+CONFIG_WM831X_WATCHDOG=m
+CONFIG_WM8350_WATCHDOG=m
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_RAVE_SP_WATCHDOG=m
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_TWL4030_WATCHDOG=m
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ADVANTECH_EC_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_EBC_C384_WDT=m
+CONFIG_EXAR_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_KEMPLD_WDT=m
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_TQMX86_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_NI903X_WDT=m
+CONFIG_NIC7018_WDT=m
+CONFIG_SIEMENS_SIMATIC_IPC_WDT=m
+CONFIG_MEN_A21_WDT=m
+CONFIG_XEN_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+# CONFIG_SSB_PCMCIAHOST is not set
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_HOST_SOC=y
+CONFIG_BCMA_DRIVER_PCI=y
+CONFIG_BCMA_SFLASH=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+CONFIG_MFD_AS3711=y
+CONFIG_MFD_SMPRO=m
+CONFIG_PMIC_ADP5520=y
+CONFIG_MFD_AAT2870_CORE=y
+CONFIG_MFD_BCM590XX=m
+CONFIG_MFD_BD9571MWV=m
+CONFIG_MFD_AXP20X=m
+CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_MADERA=m
+CONFIG_MFD_MADERA_I2C=m
+CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
+# CONFIG_MFD_CS47L35 is not set
+# CONFIG_MFD_CS47L85 is not set
+# CONFIG_MFD_CS47L90 is not set
+# CONFIG_MFD_CS47L92 is not set
+CONFIG_PMIC_DA903X=y
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
+CONFIG_MFD_DA9052_I2C=y
+CONFIG_MFD_DA9055=y
+CONFIG_MFD_DA9062=m
+CONFIG_MFD_DA9063=y
+CONFIG_MFD_DA9150=m
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_MFD_MP2629=m
+CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+CONFIG_INTEL_SOC_PMIC=y
+CONFIG_INTEL_SOC_PMIC_BXTWC=m
+CONFIG_INTEL_SOC_PMIC_CHTWC=y
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_MRFLD=m
+CONFIG_MFD_INTEL_LPSS=m
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_PMC_BXT=m
+CONFIG_MFD_IQS62X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_KEMPLD=m
+CONFIG_MFD_88PM800=m
+CONFIG_MFD_88PM805=m
+CONFIG_MFD_88PM860X=y
+CONFIG_MFD_MAX14577=y
+CONFIG_MFD_MAX77693=y
+CONFIG_MFD_MAX77843=y
+CONFIG_MFD_MAX8907=m
+CONFIG_MFD_MAX8925=y
+CONFIG_MFD_MAX8997=y
+CONFIG_MFD_MAX8998=y
+CONFIG_MFD_MT6360=m
+CONFIG_MFD_MT6370=m
+CONFIG_MFD_MT6397=m
+CONFIG_MFD_MENF21BMC=m
+CONFIG_MFD_OCELOT=m
+CONFIG_EZX_PCAP=y
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_MFD_SY7636A=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RT4831=m
+CONFIG_MFD_RT5033=m
+CONFIG_MFD_RT5120=m
+CONFIG_MFD_RC5T583=y
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SIMPLE_MFD_I2C=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_SKY81452=m
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
+CONFIG_MFD_LP8788=y
+CONFIG_MFD_TI_LMU=m
+CONFIG_MFD_PALMAS=y
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65086=m
+CONFIG_MFD_TPS65090=y
+CONFIG_MFD_TI_LP873X=m
+CONFIG_MFD_TPS6586X=y
+CONFIG_MFD_TPS65910=y
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
+CONFIG_MFD_TPS65912_SPI=y
+CONFIG_TWL4030_CORE=y
+CONFIG_MFD_TWL4030_AUDIO=y
+CONFIG_TWL6040_CORE=y
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+CONFIG_MFD_TQMX86=m
+CONFIG_MFD_VX855=m
+CONFIG_MFD_ARIZONA=m
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_ARIZONA_SPI=m
+CONFIG_MFD_CS47L24=y
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+CONFIG_MFD_WM8997=y
+CONFIG_MFD_WM8998=y
+CONFIG_MFD_WM8400=y
+CONFIG_MFD_WM831X=y
+CONFIG_MFD_WM831X_I2C=y
+CONFIG_MFD_WM831X_SPI=y
+CONFIG_MFD_WM8350=y
+CONFIG_MFD_WM8350_I2C=y
+CONFIG_MFD_WM8994=m
+CONFIG_MFD_ATC260X=m
+CONFIG_MFD_ATC260X_I2C=m
+CONFIG_RAVE_SP_CORE=m
+CONFIG_MFD_INTEL_M10_BMC_CORE=m
+CONFIG_MFD_INTEL_M10_BMC_SPI=m
+CONFIG_MFD_INTEL_M10_BMC_PMCI=m
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_88PG86X=m
+CONFIG_REGULATOR_88PM800=m
+CONFIG_REGULATOR_88PM8607=m
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_AAT2870=m
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AS3711=m
+CONFIG_REGULATOR_ATC260X=m
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BCM590XX=m
+CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_DA903X=m
+CONFIG_REGULATOR_DA9052=m
+CONFIG_REGULATOR_DA9055=m
+CONFIG_REGULATOR_DA9062=m
+CONFIG_REGULATOR_DA9210=m
+CONFIG_REGULATOR_DA9211=m
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LM363X=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_LP8788=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_LTC3676=m
+CONFIG_REGULATOR_MAX14577=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8893=m
+CONFIG_REGULATOR_MAX8907=m
+CONFIG_REGULATOR_MAX8925=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MAX8997=m
+CONFIG_REGULATOR_MAX8998=m
+CONFIG_REGULATOR_MAX20086=m
+CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX77693=m
+CONFIG_REGULATOR_MAX77826=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_MP8859=m
+CONFIG_REGULATOR_MT6311=m
+CONFIG_REGULATOR_MT6315=m
+CONFIG_REGULATOR_MT6323=m
+CONFIG_REGULATOR_MT6331=m
+CONFIG_REGULATOR_MT6332=m
+CONFIG_REGULATOR_MT6357=m
+CONFIG_REGULATOR_MT6358=m
+CONFIG_REGULATOR_MT6359=m
+CONFIG_REGULATOR_MT6360=m
+CONFIG_REGULATOR_MT6370=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PALMAS=m
+CONFIG_REGULATOR_PCA9450=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PV88060=m
+CONFIG_REGULATOR_PV88080=m
+CONFIG_REGULATOR_PV88090=m
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_QCOM_USB_VBUS=m
+CONFIG_REGULATOR_RC5T583=m
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RT4803=m
+CONFIG_REGULATOR_RT4831=m
+CONFIG_REGULATOR_RT5033=m
+CONFIG_REGULATOR_RT5120=m
+CONFIG_REGULATOR_RT5190A=m
+CONFIG_REGULATOR_RT5739=m
+CONFIG_REGULATOR_RT5759=m
+CONFIG_REGULATOR_RT6160=m
+CONFIG_REGULATOR_RT6190=m
+CONFIG_REGULATOR_RT6245=m
+CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTMV20=m
+CONFIG_REGULATOR_RTQ6752=m
+CONFIG_REGULATOR_SKY81452=m
+CONFIG_REGULATOR_SLG51000=m
+CONFIG_REGULATOR_SY7636A=m
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65086=m
+CONFIG_REGULATOR_TPS65090=m
+CONFIG_REGULATOR_TPS65132=m
+CONFIG_REGULATOR_TPS6524X=m
+CONFIG_REGULATOR_TPS6586X=m
+CONFIG_REGULATOR_TPS65910=m
+CONFIG_REGULATOR_TPS65912=m
+CONFIG_REGULATOR_TPS68470=m
+CONFIG_REGULATOR_TWL4030=m
+CONFIG_REGULATOR_WM831X=m
+CONFIG_REGULATOR_WM8350=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_WM8994=m
+CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_RC_CORE=m
+CONFIG_LIRC=y
+CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_IR_ENE=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_TOY=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_RC_XBOX_DVD=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_CEC_PIN=y
+
+#
+# CEC support
+#
+CONFIG_MEDIA_CEC_RC=y
+# CONFIG_CEC_PIN_ERROR_INJ is not set
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_CEC_CH7322=m
+CONFIG_CEC_CROS_EC=m
+CONFIG_CEC_GPIO=m
+CONFIG_CEC_SECO=m
+CONFIG_CEC_SECO_RC=y
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+# end of CEC support
+
+CONFIG_MEDIA_SUPPORT=m
+# CONFIG_MEDIA_SUPPORT_FILTER is not set
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+
+#
+# Media device types
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+CONFIG_MEDIA_TEST_SUPPORT=y
+# end of Media device types
+
+#
+# Media core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_DVB_CORE=m
+# end of Media core support
+
+#
+# Video4Linux options
+#
+CONFIG_VIDEO_V4L2_I2C=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_V4L2_ASYNC=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+# end of Video4Linux options
+
+#
+# Media controller options
+#
+CONFIG_MEDIA_CONTROLLER_DVB=y
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
+# end of Media controller options
+
+#
+# Digital TV options
+#
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+# end of Digital TV options
+
+#
+# Media drivers
+#
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_GSPCA=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_AS102=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_ZD1301=m
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_CXUSB_ANALOG=y
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=m
+# CONFIG_VIDEO_ZORAN is not set
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_DT3155=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+# CONFIG_VIDEO_FB_IVTV_FORCE_PAT is not set
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_COBALT=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7134_GO7007=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_DM1105=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_VIDEO_IPU3_CIO2=m
+CONFIG_CIO2_BRIDGE=y
+CONFIG_RADIO_ADAPTERS=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_RADIO_SI4713=m
+CONFIG_RADIO_SI476X=m
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_MA901=m
+CONFIG_USB_MR800=m
+CONFIG_USB_RAREMONO=m
+CONFIG_RADIO_SI470X=m
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_USB_SI4713=m
+CONFIG_PLATFORM_SI4713=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_WL128X=m
+CONFIG_MEDIA_PLATFORM_DRIVERS=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SDR_PLATFORM_DRIVERS=y
+CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+
+#
+# Allegro DVT media platform drivers
+#
+
+#
+# Amlogic media platform drivers
+#
+
+#
+# Amphion drivers
+#
+
+#
+# Aspeed media platform drivers
+#
+
+#
+# Atmel media platform drivers
+#
+
+#
+# Cadence media platform drivers
+#
+CONFIG_VIDEO_CADENCE_CSI2RX=m
+CONFIG_VIDEO_CADENCE_CSI2TX=m
+
+#
+# Chips&Media media platform drivers
+#
+
+#
+# Intel media platform drivers
+#
+
+#
+# Marvell media platform drivers
+#
+CONFIG_VIDEO_CAFE_CCIC=m
+
+#
+# Mediatek media platform drivers
+#
+
+#
+# Microchip Technology, Inc. media platform drivers
+#
+
+#
+# NVidia media platform drivers
+#
+
+#
+# NXP media platform drivers
+#
+
+#
+# Qualcomm media platform drivers
+#
+
+#
+# Renesas media platform drivers
+#
+
+#
+# Rockchip media platform drivers
+#
+
+#
+# Samsung media platform drivers
+#
+
+#
+# STMicroelectronics media platform drivers
+#
+
+#
+# Sunxi media platform drivers
+#
+
+#
+# Texas Instruments drivers
+#
+
+#
+# Verisilicon media platform drivers
+#
+
+#
+# VIA media platform drivers
+#
+CONFIG_VIDEO_VIA_CAMERA=m
+
+#
+# Xilinx media platform drivers
+#
+
+#
+# MMC/SDIO DVB adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIM2M=m
+CONFIG_VIDEO_VICODEC=m
+# CONFIG_VIDEO_VIMC is not set
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_CEC=y
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+# CONFIG_VIDEO_VISL is not set
+# CONFIG_DVB_TEST_DRIVERS is not set
+
+#
+# FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_TTPCI_EEPROM=m
+CONFIG_UVC_COMMON=m
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+CONFIG_SMS_SIANO_DEBUGFS=y
+CONFIG_VIDEO_V4L2_TPG=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+# end of Media drivers
+
+#
+# Media ancillary drivers
+#
+CONFIG_MEDIA_ATTACH=y
+
+#
+# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
+#
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_APTINA_PLL=m
+CONFIG_VIDEO_CCS_PLL=m
+CONFIG_VIDEO_AR0521=m
+CONFIG_VIDEO_HI556=m
+CONFIG_VIDEO_HI846=m
+CONFIG_VIDEO_HI847=m
+CONFIG_VIDEO_IMX208=m
+CONFIG_VIDEO_IMX214=m
+CONFIG_VIDEO_IMX219=m
+CONFIG_VIDEO_IMX258=m
+CONFIG_VIDEO_IMX274=m
+CONFIG_VIDEO_IMX290=m
+CONFIG_VIDEO_IMX296=m
+CONFIG_VIDEO_IMX319=m
+CONFIG_VIDEO_IMX355=m
+CONFIG_VIDEO_MAX9271_LIB=m
+CONFIG_VIDEO_MT9M001=m
+CONFIG_VIDEO_MT9M111=m
+CONFIG_VIDEO_MT9P031=m
+CONFIG_VIDEO_MT9T112=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
+CONFIG_VIDEO_MT9V111=m
+CONFIG_VIDEO_OG01A1B=m
+CONFIG_VIDEO_OV02A10=m
+CONFIG_VIDEO_OV08D10=m
+CONFIG_VIDEO_OV08X40=m
+CONFIG_VIDEO_OV13858=m
+CONFIG_VIDEO_OV13B10=m
+CONFIG_VIDEO_OV2640=m
+CONFIG_VIDEO_OV2659=m
+CONFIG_VIDEO_OV2680=m
+CONFIG_VIDEO_OV2685=m
+CONFIG_VIDEO_OV2740=m
+CONFIG_VIDEO_OV4689=m
+CONFIG_VIDEO_OV5647=m
+CONFIG_VIDEO_OV5648=m
+CONFIG_VIDEO_OV5670=m
+CONFIG_VIDEO_OV5675=m
+CONFIG_VIDEO_OV5693=m
+CONFIG_VIDEO_OV5695=m
+CONFIG_VIDEO_OV6650=m
+CONFIG_VIDEO_OV7251=m
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_OV772X=m
+CONFIG_VIDEO_OV7740=m
+CONFIG_VIDEO_OV8856=m
+CONFIG_VIDEO_OV8858=m
+CONFIG_VIDEO_OV8865=m
+CONFIG_VIDEO_OV9640=m
+CONFIG_VIDEO_OV9650=m
+CONFIG_VIDEO_OV9734=m
+CONFIG_VIDEO_RDACM20=m
+CONFIG_VIDEO_RDACM21=m
+CONFIG_VIDEO_RJ54N1=m
+CONFIG_VIDEO_S5C73M3=m
+CONFIG_VIDEO_S5K5BAF=m
+CONFIG_VIDEO_S5K6A3=m
+CONFIG_VIDEO_CCS=m
+CONFIG_VIDEO_ET8EK8=m
+# end of Camera sensor devices
+
+#
+# Lens drivers
+#
+CONFIG_VIDEO_AD5820=m
+CONFIG_VIDEO_AK7375=m
+CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9768=m
+CONFIG_VIDEO_DW9807_VCM=m
+# end of Lens drivers
+
+#
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_LM3560=m
+CONFIG_VIDEO_LM3646=m
+# end of Flash devices
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+CONFIG_VIDEO_TDA1997X=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_WM8775=m
+# end of Audio decoders, processors and mixers
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+# end of RDS decoders
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_ADV7604=m
+CONFIG_VIDEO_ADV7604_CEC=y
+CONFIG_VIDEO_ADV7842=m
+CONFIG_VIDEO_ADV7842_CEC=y
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_ML86V7667=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TC358743=m
+CONFIG_VIDEO_TC358743_CEC=y
+CONFIG_VIDEO_TC358746=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_TW9910=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+# end of Video decoders
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_ADV7511_CEC=y
+CONFIG_VIDEO_AK881X=m
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_THS8200=m
+# end of Video encoders
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+# end of Video improvement chips
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+# end of Audio/Video compression chips
+
+#
+# SDR tuner chips
+#
+CONFIG_SDR_MAX2175=m
+# end of SDR tuner chips
+
+#
+# Miscellaneous helper chips
+#
+CONFIG_VIDEO_I2C=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_ST_MIPID02=m
+CONFIG_VIDEO_THS7303=m
+# end of Miscellaneous helper chips
+
+#
+# Media SPI Adapters
+#
+CONFIG_CXD2880_SPI_DRV=m
+CONFIG_VIDEO_GS1662=m
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_XC5000=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_TDA10071=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_GP8PSK_FE=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_RTL2832_SDR=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_CXD2880=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_STV0297=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_VES1820=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_MXL692=m
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+CONFIG_DVB_S921=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_MN88443X=m
+CONFIG_DVB_TC90522=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_A8293=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_HELENE=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBH29=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_DRX39XYJ=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+# end of Customise DVB Frontends
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Media ancillary drivers
+
+#
+# Graphics support
+#
+CONFIG_APERTURE_HELPERS=y
+CONFIG_VIDEO_CMDLINE=y
+CONFIG_VIDEO_NOMODESET=y
+CONFIG_AGP=y
+CONFIG_AGP_AMD64=y
+CONFIG_AGP_INTEL=y
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=y
+CONFIG_INTEL_GTT=y
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DBI=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
+# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_DISPLAY_HELPER=m
+CONFIG_DRM_DISPLAY_DP_HELPER=y
+CONFIG_DRM_DISPLAY_HDCP_HELPER=y
+CONFIG_DRM_DISPLAY_HDMI_HELPER=y
+# CONFIG_DRM_DP_AUX_CHARDEV is not set
+# CONFIG_DRM_DP_CEC is not set
+CONFIG_DRM_TTM=m
+CONFIG_DRM_BUDDY=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_TTM_HELPER=m
+CONFIG_DRM_GEM_DMA_HELPER=m
+CONFIG_DRM_GEM_SHMEM_HELPER=m
+CONFIG_DRM_SUBALLOC_HELPER=m
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_I2C_NXP_TDA9950=m
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_USERPTR is not set
+CONFIG_DRM_AMDGPU=m
+# CONFIG_DRM_AMDGPU_SI is not set
+# CONFIG_DRM_AMDGPU_CIK is not set
+CONFIG_DRM_AMDGPU_USERPTR=y
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+# CONFIG_DRM_AMD_ACP is not set
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+CONFIG_DRM_AMD_DC_FP=y
+# CONFIG_DEBUG_KERNEL_DC is not set
+CONFIG_DRM_AMD_SECURE_DISPLAY=y
+# end of Display Engine Configuration
+
+CONFIG_HSA_AMD=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+# CONFIG_NOUVEAU_DEBUG_PUSH is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_FORCE_PROBE=""
+CONFIG_DRM_I915_CAPTURE_ERROR=y
+CONFIG_DRM_I915_COMPRESS_ERROR=y
+CONFIG_DRM_I915_USERPTR=y
+CONFIG_DRM_I915_GVT_KVMGT=m
+
+#
+# drm/i915 Debugging
+#
+# CONFIG_DRM_I915_WERROR is not set
+# CONFIG_DRM_I915_DEBUG is not set
+# CONFIG_DRM_I915_DEBUG_MMIO is not set
+# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
+# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
+# CONFIG_DRM_I915_DEBUG_GUC is not set
+# CONFIG_DRM_I915_SELFTEST is not set
+# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
+# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
+# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+# end of drm/i915 Debugging
+
+#
+# drm/i915 Profile Guided Optimisation
+#
+CONFIG_DRM_I915_REQUEST_TIMEOUT=20000
+CONFIG_DRM_I915_FENCE_TIMEOUT=10000
+CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
+CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
+CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE=7500
+CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
+CONFIG_DRM_I915_STOP_TIMEOUT=100
+CONFIG_DRM_I915_TIMESLICE_DURATION=1
+# end of drm/i915 Profile Guided Optimisation
+
+CONFIG_DRM_I915_GVT=y
+CONFIG_DRM_VGEM=m
+# CONFIG_DRM_VKMS is not set
+CONFIG_DRM_VMWGFX=m
+# CONFIG_DRM_VMWGFX_MKSSTATS is not set
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+# CONFIG_DRM_MGAG200 is not set
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_VIRTIO_GPU_KMS=y
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_PANEL_AUO_A030JTN01=m
+CONFIG_DRM_PANEL_ORISETECH_OTA5601A=m
+# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
+CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_ANALOGIX_DP=m
+# end of Display Interface Bridges
+
+# CONFIG_DRM_ETNAVIV is not set
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_GM12U320=m
+CONFIG_DRM_PANEL_MIPI_DBI=m
+# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_TINYDRM_HX8357D=m
+CONFIG_TINYDRM_ILI9163=m
+CONFIG_TINYDRM_ILI9225=m
+CONFIG_TINYDRM_ILI9341=m
+CONFIG_TINYDRM_ILI9486=m
+CONFIG_TINYDRM_MI0283QT=m
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
+CONFIG_TINYDRM_ST7735R=m
+CONFIG_DRM_XEN=y
+CONFIG_DRM_XEN_FRONTEND=m
+CONFIG_DRM_VBOXVIDEO=m
+CONFIG_DRM_GUD=m
+CONFIG_DRM_SSD130X=m
+CONFIG_DRM_SSD130X_I2C=m
+CONFIG_DRM_SSD130X_SPI=m
+CONFIG_DRM_HYPERV=m
+# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+CONFIG_DRM_PRIVACY_SCREEN=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+CONFIG_FB_BACKLIGHT=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+CONFIG_FB_PM2_FIFO_DISCONNECT=y
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
+CONFIG_FB_ARC=m
+CONFIG_FB_ASILIANT=y
+CONFIG_FB_IMSTT=y
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_OPENCORES=m
+CONFIG_FB_S1D13XXX=m
+# CONFIG_FB_NVIDIA is not set
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_I740=m
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+# CONFIG_FB_ATY_GENERIC_LCD is not set
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+# CONFIG_FB_SAVAGE_ACCEL is not set
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+# CONFIG_FB_3DFX_I2C is not set
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_SM501=m
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+CONFIG_FB_IBM_GXT4500=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=m
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_HYPERV=m
+CONFIG_FB_SIMPLE=y
+CONFIG_FB_SSD1307=m
+CONFIG_FB_SM712=m
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI922X=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+CONFIG_LCD_OTM3225A=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_KTD253=m
+CONFIG_BACKLIGHT_KTZ8866=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_DA903X=m
+CONFIG_BACKLIGHT_DA9052=m
+CONFIG_BACKLIGHT_MAX8925=m
+CONFIG_BACKLIGHT_MT6370=m
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_QCOM_WLED=m
+CONFIG_BACKLIGHT_RT4831=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_WM831X=m
+CONFIG_BACKLIGHT_ADP5520=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_88PM860X=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_BACKLIGHT_AAT2870=m
+CONFIG_BACKLIGHT_LM3630A=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_LP855X=m
+CONFIG_BACKLIGHT_LP8788=m
+CONFIG_BACKLIGHT_PANDORA=m
+CONFIG_BACKLIGHT_SKY81452=m
+CONFIG_BACKLIGHT_AS3711=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+CONFIG_BACKLIGHT_ARCXCNN=m
+CONFIG_BACKLIGHT_RAVE_SP=m
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+# end of Graphics support
+
+CONFIG_DRM_ACCEL=y
+CONFIG_DRM_ACCEL_HABANALABS=m
+CONFIG_DRM_ACCEL_IVPU=m
+CONFIG_DRM_ACCEL_QAIC=m
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_CTL_FAST_LOOKUP=y
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_CTL_INPUT_VALIDATION=y
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_CTL_LED=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+CONFIG_SND_PCSP=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_GENERIC_LEDS=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_SCODEC_CS35L41=m
+CONFIG_SND_HDA_CS_DSP_CONTROLS=m
+CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CS8409=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y
+# CONFIG_SND_HDA_CTL_DEV_ID is not set
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_EXT_CORE=m
+CONFIG_SND_HDA_PREALLOC_SIZE=0
+CONFIG_SND_INTEL_NHLT=y
+CONFIG_SND_INTEL_DSP_CONFIG=m
+CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_FIREWIRE_MOTU=m
+CONFIG_SND_FIREFACE=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ACPI=m
+CONFIG_SND_SOC_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=m
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_AMD_ST_ES8336_MACH=m
+CONFIG_SND_SOC_AMD_ACP3x=m
+CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
+CONFIG_SND_SOC_AMD_RENOIR=m
+CONFIG_SND_SOC_AMD_RENOIR_MACH=m
+CONFIG_SND_SOC_AMD_ACP5x=m
+CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
+CONFIG_SND_SOC_AMD_ACP6x=m
+CONFIG_SND_SOC_AMD_YC_MACH=m
+CONFIG_SND_AMD_ACP_CONFIG=m
+CONFIG_SND_SOC_AMD_ACP_COMMON=m
+CONFIG_SND_SOC_AMD_ACP_PDM=m
+CONFIG_SND_SOC_AMD_ACP_I2S=m
+CONFIG_SND_SOC_AMD_ACP_PCM=m
+CONFIG_SND_SOC_AMD_ACP_PCI=m
+CONFIG_SND_AMD_ASOC_RENOIR=m
+CONFIG_SND_AMD_ASOC_REMBRANDT=m
+CONFIG_SND_SOC_AMD_MACH_COMMON=m
+CONFIG_SND_SOC_AMD_LEGACY_MACH=m
+CONFIG_SND_SOC_AMD_SOF_MACH=m
+CONFIG_SND_SOC_AMD_RPL_ACP6x=m
+CONFIG_SND_SOC_AMD_PS=m
+CONFIG_SND_SOC_AMD_PS_MACH=m
+CONFIG_SND_ATMEL_SOC=m
+CONFIG_SND_BCM63XX_I2S_WHISTLER=m
+CONFIG_SND_DESIGNWARE_I2S=m
+# CONFIG_SND_DESIGNWARE_PCM is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+CONFIG_SND_SOC_FSL_ASRC=m
+CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_MQS=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_SPDIF=m
+CONFIG_SND_SOC_FSL_ESAI=m
+CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_FSL_EASRC=m
+CONFIG_SND_SOC_FSL_XCVR=m
+CONFIG_SND_SOC_FSL_UTILS=m
+CONFIG_SND_SOC_FSL_RPMSG=m
+CONFIG_SND_SOC_IMX_AUDMUX=m
+# end of SoC Audio for Freescale CPUs
+
+CONFIG_SND_I2S_HI6210_I2S=m
+# CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
+CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_CATPT=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
+CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SKL=m
+CONFIG_SND_SOC_INTEL_APL=m
+CONFIG_SND_SOC_INTEL_KBL=m
+CONFIG_SND_SOC_INTEL_GLK=m
+CONFIG_SND_SOC_INTEL_CNL=m
+CONFIG_SND_SOC_INTEL_CFL=m
+CONFIG_SND_SOC_INTEL_CML_H=m
+CONFIG_SND_SOC_INTEL_CML_LP=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
+CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
+CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_INTEL_AVS=m
+
+#
+# Intel AVS Machine drivers
+#
+
+#
+# Available DSP configurations
+#
+CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
+# end of Intel AVS Machine drivers
+
+CONFIG_SND_SOC_INTEL_MACH=y
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_REALTEK_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_CIRRUS_COMMON=m
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_WM5102_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m
+CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m
+CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI_DEV=m
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_ACPI_DEV=m
+CONFIG_SND_SOC_SOF_DEBUG_PROBES=m
+CONFIG_SND_SOC_SOF_CLIENT=m
+# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
+CONFIG_SND_SOC_SOF=m
+CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
+CONFIG_SND_SOC_SOF_IPC3=y
+CONFIG_SND_SOC_SOF_INTEL_IPC4=y
+CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m
+CONFIG_SND_SOC_SOF_AMD_COMMON=m
+CONFIG_SND_SOC_SOF_AMD_RENOIR=m
+CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
+CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
+CONFIG_SND_SOC_SOF_INTEL_COMMON=m
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+CONFIG_SND_SOC_SOF_BROADWELL=m
+CONFIG_SND_SOC_SOF_MERRIFIELD=m
+CONFIG_SND_SOC_SOF_INTEL_SKL=m
+CONFIG_SND_SOC_SOF_SKYLAKE=m
+CONFIG_SND_SOC_SOF_KABYLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_APL=m
+CONFIG_SND_SOC_SOF_APOLLOLAKE=m
+CONFIG_SND_SOC_SOF_GEMINILAKE=m
+CONFIG_SND_SOC_SOF_INTEL_CNL=m
+CONFIG_SND_SOC_SOF_CANNONLAKE=m
+CONFIG_SND_SOC_SOF_COFFEELAKE=m
+CONFIG_SND_SOC_SOF_COMETLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_ICL=m
+CONFIG_SND_SOC_SOF_ICELAKE=m
+CONFIG_SND_SOC_SOF_JASPERLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_TGL=m
+CONFIG_SND_SOC_SOF_TIGERLAKE=m
+CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
+CONFIG_SND_SOC_SOF_ALDERLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_MTL=m
+CONFIG_SND_SOC_SOF_METEORLAKE=m
+CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_MLINK=m
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_HDA_PROBES=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
+CONFIG_SND_SOC_SOF_XTENSA=m
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+CONFIG_SND_SOC_XILINX_I2S=m
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
+CONFIG_SND_SOC_XTFPGA_I2S=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+CONFIG_SND_SOC_ARIZONA=m
+CONFIG_SND_SOC_WM_ADSP=m
+CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1372=m
+CONFIG_SND_SOC_ADAU1372_I2C=m
+CONFIG_SND_SOC_ADAU1372_SPI=m
+CONFIG_SND_SOC_ADAU1701=m
+CONFIG_SND_SOC_ADAU17X1=m
+CONFIG_SND_SOC_ADAU1761=m
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_ADAU7118=m
+CONFIG_SND_SOC_ADAU7118_HW=m
+CONFIG_SND_SOC_ADAU7118_I2C=m
+CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4118=m
+CONFIG_SND_SOC_AK4375=m
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK4554=m
+CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK5386=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88395_LIB=m
+CONFIG_SND_SOC_AW88395=m
+CONFIG_SND_SOC_BD28623=m
+CONFIG_SND_SOC_BT_SCO=m
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS35L33=m
+CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
+CONFIG_SND_SOC_CS35L36=m
+CONFIG_SND_SOC_CS35L41_LIB=m
+CONFIG_SND_SOC_CS35L41=m
+CONFIG_SND_SOC_CS35L41_SPI=m
+CONFIG_SND_SOC_CS35L41_I2C=m
+CONFIG_SND_SOC_CS35L45=m
+CONFIG_SND_SOC_CS35L45_SPI=m
+CONFIG_SND_SOC_CS35L45_I2C=m
+CONFIG_SND_SOC_CS35L56=m
+CONFIG_SND_SOC_CS35L56_SHARED=m
+CONFIG_SND_SOC_CS35L56_I2C=m
+CONFIG_SND_SOC_CS35L56_SPI=m
+CONFIG_SND_SOC_CS35L56_SDW=m
+CONFIG_SND_SOC_CS42L42_CORE=m
+CONFIG_SND_SOC_CS42L42=m
+CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
+CONFIG_SND_SOC_CS42L52=m
+CONFIG_SND_SOC_CS42L56=m
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS42L83=m
+CONFIG_SND_SOC_CS4234=m
+CONFIG_SND_SOC_CS4265=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
+CONFIG_SND_SOC_CS4271_SPI=m
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_CS43130=m
+CONFIG_SND_SOC_CS4341=m
+CONFIG_SND_SOC_CS4349=m
+CONFIG_SND_SOC_CS53L30=m
+CONFIG_SND_SOC_CX2072X=m
+CONFIG_SND_SOC_DA7213=m
+CONFIG_SND_SOC_DA7219=m
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES7241=m
+CONFIG_SND_SOC_ES8316=m
+CONFIG_SND_SOC_ES8326=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+CONFIG_SND_SOC_GTM601=m
+CONFIG_SND_SOC_HDAC_HDMI=m
+CONFIG_SND_SOC_HDAC_HDA=m
+CONFIG_SND_SOC_HDA=m
+CONFIG_SND_SOC_ICS43432=m
+CONFIG_SND_SOC_IDT821034=m
+CONFIG_SND_SOC_INNO_RK3036=m
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98357A=m
+CONFIG_SND_SOC_MAX98504=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98520=m
+CONFIG_SND_SOC_MAX98363=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX98373_I2C=m
+CONFIG_SND_SOC_MAX98373_SDW=m
+CONFIG_SND_SOC_MAX98390=m
+CONFIG_SND_SOC_MAX98396=m
+CONFIG_SND_SOC_MAX9860=m
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
+CONFIG_SND_SOC_PCM1681=m
+CONFIG_SND_SOC_PCM1789=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM179X_SPI=m
+CONFIG_SND_SOC_PCM186X=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_PCM3060=m
+CONFIG_SND_SOC_PCM3060_I2C=m
+CONFIG_SND_SOC_PCM3060_SPI=m
+CONFIG_SND_SOC_PCM3168A=m
+CONFIG_SND_SOC_PCM3168A_I2C=m
+CONFIG_SND_SOC_PCM3168A_SPI=m
+CONFIG_SND_SOC_PCM5102A=m
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_PCM512x_SPI=m
+CONFIG_SND_SOC_PEB2466=m
+# CONFIG_SND_SOC_RK3328 is not set
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RL6347A=m
+CONFIG_SND_SOC_RT274=m
+CONFIG_SND_SOC_RT286=m
+CONFIG_SND_SOC_RT298=m
+CONFIG_SND_SOC_RT1011=m
+CONFIG_SND_SOC_RT1015=m
+CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1019=m
+CONFIG_SND_SOC_RT1308=m
+CONFIG_SND_SOC_RT1308_SDW=m
+CONFIG_SND_SOC_RT1316_SDW=m
+CONFIG_SND_SOC_RT1318_SDW=m
+CONFIG_SND_SOC_RT5514=m
+CONFIG_SND_SOC_RT5514_SPI=m
+CONFIG_SND_SOC_RT5616=m
+CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+CONFIG_SND_SOC_RT5651=m
+CONFIG_SND_SOC_RT5659=m
+CONFIG_SND_SOC_RT5660=m
+CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5670=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_RT5682=m
+CONFIG_SND_SOC_RT5682_I2C=m
+CONFIG_SND_SOC_RT5682_SDW=m
+CONFIG_SND_SOC_RT5682S=m
+CONFIG_SND_SOC_RT700=m
+CONFIG_SND_SOC_RT700_SDW=m
+CONFIG_SND_SOC_RT711=m
+CONFIG_SND_SOC_RT711_SDW=m
+CONFIG_SND_SOC_RT711_SDCA_SDW=m
+CONFIG_SND_SOC_RT712_SDCA_SDW=m
+CONFIG_SND_SOC_RT712_SDCA_DMIC_SDW=m
+CONFIG_SND_SOC_RT715=m
+CONFIG_SND_SOC_RT715_SDW=m
+CONFIG_SND_SOC_RT715_SDCA_SDW=m
+CONFIG_SND_SOC_RT9120=m
+CONFIG_SND_SOC_SDW_MOCKUP=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SI476X=m
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+CONFIG_SND_SOC_SIGMADSP_REGMAP=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SIMPLE_MUX=m
+CONFIG_SND_SOC_SMA1303=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SRC4XXX_I2C=m
+CONFIG_SND_SOC_SRC4XXX=m
+CONFIG_SND_SOC_SSM2305=m
+CONFIG_SND_SOC_SSM2518=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_SSM2602_SPI=m
+CONFIG_SND_SOC_SSM2602_I2C=m
+CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA350=m
+CONFIG_SND_SOC_STI_SAS=m
+CONFIG_SND_SOC_TAS2552=m
+CONFIG_SND_SOC_TAS2562=m
+CONFIG_SND_SOC_TAS2764=m
+CONFIG_SND_SOC_TAS2770=m
+CONFIG_SND_SOC_TAS2780=m
+CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TAS571X=m
+CONFIG_SND_SOC_TAS5720=m
+CONFIG_SND_SOC_TAS5805M=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TFA989X=m
+CONFIG_SND_SOC_TLV320ADC3XXX=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320AIC3X_I2C=m
+CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+CONFIG_SND_SOC_TLV320ADCX140=m
+CONFIG_SND_SOC_TS3A227E=m
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_TSCS454=m
+CONFIG_SND_SOC_UDA1334=m
+CONFIG_SND_SOC_WCD_MBHC=m
+CONFIG_SND_SOC_WCD938X=m
+CONFIG_SND_SOC_WCD938X_SDW=m
+CONFIG_SND_SOC_WM5102=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8524=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8731_I2C=m
+CONFIG_SND_SOC_WM8731_SPI=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8782=m
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
+CONFIG_SND_SOC_WM8804_SPI=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8940=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8961=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_WSA881X=m
+CONFIG_SND_SOC_WSA883X=m
+CONFIG_SND_SOC_ZL38060=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SOC_MT6351=m
+CONFIG_SND_SOC_MT6358=m
+CONFIG_SND_SOC_MT6660=m
+CONFIG_SND_SOC_NAU8315=m
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
+CONFIG_SND_SOC_NAU8821=m
+CONFIG_SND_SOC_NAU8822=m
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_NAU8825=m
+CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SOC_LPASS_MACRO_COMMON=m
+CONFIG_SND_SOC_LPASS_WSA_MACRO=m
+CONFIG_SND_SOC_LPASS_VA_MACRO=m
+CONFIG_SND_SOC_LPASS_RX_MACRO=m
+CONFIG_SND_SOC_LPASS_TX_MACRO=m
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_X86=y
+CONFIG_HDMI_LPE_AUDIO=m
+CONFIG_SND_SYNTH_EMUX=m
+CONFIG_SND_XEN_FRONTEND=m
+CONFIG_SND_VIRTIO=m
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACCUTOUCH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EVISION=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_FT260=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_GLORIOUS=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_VIVALDI_COMMON=m
+CONFIG_HID_GOOGLE_HAMMER=m
+CONFIG_HID_VIVALDI=m
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_VIEWSONIC=m
+CONFIG_HID_VRC2=m
+CONFIG_HID_XIAOMI=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LETSKETCH=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_MEGAWORLD_FF=m
+CONFIG_HID_REDRAGON=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NINTENDO=m
+CONFIG_NINTENDO_FF=y
+CONFIG_HID_NTI=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_PLAYSTATION_FF=y
+CONFIG_HID_PXRC=m
+CONFIG_HID_RAZER=m
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_RETRODE=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SIGMAMICRO=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_STEAM_FF=y
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_TOPRE=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+CONFIG_HID_MCP2221=m
+# end of Special HID drivers
+
+#
+# HID-BPF support
+#
+CONFIG_HID_BPF=y
+# end of HID-BPF support
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+CONFIG_I2C_HID=m
+CONFIG_I2C_HID_ACPI=m
+CONFIG_I2C_HID_OF=m
+CONFIG_I2C_HID_CORE=m
+
+#
+# Intel ISH HID support
+#
+CONFIG_INTEL_ISH_HID=m
+# CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set
+# end of Intel ISH HID support
+
+#
+# AMD SFH HID Support
+#
+CONFIG_AMD_SFH_HID=m
+# end of AMD SFH HID Support
+
+#
+# Surface System Aggregator Module HID support
+#
+CONFIG_SURFACE_HID=m
+CONFIG_SURFACE_KBD=m
+# end of Surface System Aggregator Module HID support
+
+CONFIG_SURFACE_HID_CORE=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+CONFIG_USB_CONN_GPIO=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=y
+# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=y
+# CONFIG_USB_EHCI_FSL is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_MAX3421_HCD=m
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD_ISO=y
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_HCD_BCMA=m
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
+CONFIG_USB_XEN_HCD=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
+
+#
+# USB dual-mode controller drivers
+#
+CONFIG_USB_CDNS_SUPPORT=m
+CONFIG_USB_CDNS_HOST=y
+CONFIG_USB_CDNS3=m
+# CONFIG_USB_CDNS3_GADGET is not set
+# CONFIG_USB_CDNS3_HOST is not set
+CONFIG_USB_CDNS3_PCI_WRAP=m
+CONFIG_USB_CDNSP_PCI=m
+CONFIG_USB_CDNSP_GADGET=y
+CONFIG_USB_CDNSP_HOST=y
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+
+#
+# Platform Glue Layer
+#
+
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
+CONFIG_USB_DWC3_ULPI=y
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_HOST=y
+
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+CONFIG_USB_DWC2_PCI=m
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CHIPIDEA_MSM=m
+CONFIG_USB_CHIPIDEA_GENERIC=m
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1761_UDC=y
+# CONFIG_USB_ISP1760_HOST_ROLE is not set
+# CONFIG_USB_ISP1760_GADGET_ROLE is not set
+CONFIG_USB_ISP1760_DUAL_ROLE=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_UPD78F0730=m
+CONFIG_USB_SERIAL_XR=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HUB_USB251XB=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+CONFIG_USB_LINK_LAYER_TEST=m
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_TAHVO_USB=m
+CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y
+CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_GR_UDC=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_SNP_CORE=m
+# CONFIG_USB_M66592 is not set
+CONFIG_USB_BDC_UDC=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+CONFIG_USB_NET2272_DMA=y
+CONFIG_USB_NET2280=m
+CONFIG_USB_GOKU=m
+CONFIG_USB_EG20T=m
+CONFIG_USB_MAX3420_UDC=m
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_F_TCM=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+# CONFIG_USB_CONFIGFS_F_TCM is not set
+
+#
+# USB Gadget precomposed configurations
+#
+CONFIG_USB_ZERO=m
+CONFIG_USB_AUDIO=m
+CONFIG_GADGET_UAC1=y
+# CONFIG_GADGET_UAC1_LEGACY is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_GADGET_TARGET=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_NOKIA=m
+CONFIG_USB_G_ACM_MS=m
+# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+CONFIG_USB_RAW_GADGET=m
+# end of USB Gadget precomposed configurations
+
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_RT1711H=m
+CONFIG_TYPEC_MT6360=m
+CONFIG_TYPEC_TCPCI_MT6370=m
+CONFIG_TYPEC_TCPCI_MAXIM=m
+CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
+CONFIG_UCSI_ACPI=m
+CONFIG_UCSI_STM32G0=m
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_ANX7411=m
+CONFIG_TYPEC_RT1719=m
+CONFIG_TYPEC_HD3SS3220=m
+CONFIG_TYPEC_STUSB160X=m
+CONFIG_TYPEC_WUSB3801=m
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+CONFIG_TYPEC_MUX_FSA4480=m
+CONFIG_TYPEC_MUX_GPIO_SBU=m
+CONFIG_TYPEC_MUX_PI3USB30532=m
+CONFIG_TYPEC_MUX_INTEL_PMC=m
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
+
+#
+# USB Type-C Alternate Mode drivers
+#
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
+CONFIG_USB_ROLE_SWITCH=y
+CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+CONFIG_MMC_CRYPTO=y
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_F_SDH30=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_ALCOR=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SPI=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_USDHI6ROL0=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_HSQ=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+CONFIG_MMC_SDHCI_XENON=m
+CONFIG_SCSI_UFSHCD=m
+# CONFIG_SCSI_UFS_BSG is not set
+CONFIG_SCSI_UFS_CRYPTO=y
+CONFIG_SCSI_UFS_HPB=y
+CONFIG_SCSI_UFS_HWMON=y
+CONFIG_SCSI_UFSHCD_PCI=m
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MS_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_CLASS_MULTICOLOR=m
+# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+
+#
+# LED drivers
+#
+CONFIG_LEDS_88PM860X=m
+CONFIG_LEDS_APU=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_MT6323=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP50XX=m
+CONFIG_LEDS_LP8788=m
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
+CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_WM831X_STATUS=m
+CONFIG_LEDS_WM8350=m
+CONFIG_LEDS_DA903X=m
+CONFIG_LEDS_DA9052=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2606MVV=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_ADP5520=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_MAX8997=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_MENF21BMC=m
+CONFIG_LEDS_IS31FL319X=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_MLXCPLD=m
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_USER=m
+CONFIG_LEDS_NIC78BX=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+CONFIG_LEDS_LM36274=m
+CONFIG_LEDS_TPS6105X=m
+
+#
+# Flash and Torch LED drivers
+#
+CONFIG_LEDS_AS3645A=m
+CONFIG_LEDS_LM3601X=m
+CONFIG_LEDS_MT6370_FLASH=m
+# CONFIG_LEDS_RT8515 is not set
+CONFIG_LEDS_SGM3140=m
+
+#
+# RGB LED drivers
+#
+CONFIG_LEDS_PWM_MULTICOLOR=m
+CONFIG_LEDS_MT6370_RGB=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+# CONFIG_LEDS_TRIGGER_MTD is not set
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
+CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
+CONFIG_LEDS_TRIGGER_TTY=m
+
+#
+# Simple LED drivers
+#
+CONFIG_LEDS_SIEMENS_SIMATIC_IPC=m
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_VIRT_DMA=y
+CONFIG_INFINIBAND_BNXT_RE=m
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
+CONFIG_INFINIBAND_ERDMA=m
+CONFIG_INFINIBAND_HFI1=m
+# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
+# CONFIG_SDMA_VERBOSITY is not set
+CONFIG_INFINIBAND_IRDMA=m
+CONFIG_MANA_INFINIBAND=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_QIB_DCA=y
+CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+CONFIG_INFINIBAND_RDMAVT=m
+CONFIG_RDMA_RXE=m
+CONFIG_RDMA_SIW=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_RTRS=m
+CONFIG_INFINIBAND_RTRS_CLIENT=m
+CONFIG_INFINIBAND_RTRS_SERVER=m
+CONFIG_INFINIBAND_OPA_VNIC=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+# CONFIG_EDAC_LEGACY_SYSFS is not set
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=m
+CONFIG_EDAC_GHES=y
+CONFIG_EDAC_AMD64=m
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+CONFIG_EDAC_IE31200=m
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_EDAC_SBRIDGE=m
+CONFIG_EDAC_SKX=m
+CONFIG_EDAC_I10NM=m
+CONFIG_EDAC_PND2=m
+CONFIG_EDAC_IGEN6=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_88PM860X=m
+CONFIG_RTC_DRV_88PM80X=m
+CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABEOZ9=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_DS1307=m
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_LP8788=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_MAX8907=m
+CONFIG_RTC_DRV_MAX8925=m
+CONFIG_RTC_DRV_MAX8998=m
+CONFIG_RTC_DRV_MAX8997=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF85363=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_PALMAS=m
+CONFIG_RTC_DRV_TPS6586X=m
+CONFIG_RTC_DRV_TPS65910=m
+CONFIG_RTC_DRV_RC5T583=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_RV3032=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_SD3078=m
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1302=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
+CONFIG_RTC_DRV_RX6110=m
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_DA9052=m
+CONFIG_RTC_DRV_DA9055=m
+CONFIG_RTC_DRV_DA9063=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_WM831X=m
+CONFIG_RTC_DRV_WM8350=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_CROS_EC=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_FTRTC010=m
+CONFIG_RTC_DRV_PCAP=m
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MT6397=m
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+CONFIG_RTC_DRV_GOLDFISH=m
+CONFIG_RTC_DRV_WILCO_EC=m
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DMA_ACPI=y
+CONFIG_ALTERA_MSGDMA=m
+CONFIG_INTEL_IDMA64=m
+CONFIG_INTEL_IDXD_BUS=m
+CONFIG_INTEL_IDXD=m
+# CONFIG_INTEL_IDXD_COMPAT is not set
+CONFIG_INTEL_IDXD_SVM=y
+CONFIG_INTEL_IDXD_PERFMON=y
+CONFIG_INTEL_IOATDMA=m
+CONFIG_PLX_DMA=m
+CONFIG_XILINX_XDMA=m
+CONFIG_AMD_PTDMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
+CONFIG_HSU_DMA=m
+CONFIG_SF_PDMA=m
+CONFIG_INTEL_LDMA=y
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+# CONFIG_UDMABUF is not set
+# CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
+# CONFIG_DMABUF_SELFTESTS is not set
+# CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
+# end of DMABUF options
+
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+CONFIG_CHARLCD=m
+CONFIG_LINEDISP=m
+CONFIG_HD44780_COMMON=m
+CONFIG_HD44780=m
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_IMG_ASCII_LCD=m
+CONFIG_HT16K33=m
+CONFIG_LCD2S=m
+CONFIG_PARPORT_PANEL=m
+CONFIG_PANEL_PARPORT=0
+CONFIG_PANEL_PROFILE=5
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_CHARLCD_BL_OFF is not set
+# CONFIG_CHARLCD_BL_ON is not set
+CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_PANEL=m
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_UIO_PRUSS=m
+CONFIG_UIO_MF624=m
+CONFIG_UIO_HV_GENERIC=m
+CONFIG_UIO_DFL=m
+CONFIG_VFIO=m
+CONFIG_VFIO_CONTAINER=y
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_NOIOMMU=y
+CONFIG_VFIO_VIRQFD=y
+CONFIG_VFIO_PCI_CORE=m
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VFIO_PCI_IGD=y
+CONFIG_MLX5_VFIO_PCI=m
+CONFIG_VFIO_MDEV=m
+CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VMGENID=y
+CONFIG_VBOXGUEST=m
+CONFIG_NITRO_ENCLAVES=m
+CONFIG_EFI_SECRET=m
+CONFIG_TDX_GUEST_DRIVER=m
+CONFIG_VIRTIO_ANCHOR=y
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_PCI_LIB=y
+CONFIG_VIRTIO_PCI_LIB_LEGACY=y
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_PMEM=m
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_MEM=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+CONFIG_VDPA=m
+# CONFIG_VDPA_SIM is not set
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_MLX5_VDPA=y
+CONFIG_MLX5_VDPA_NET=m
+# CONFIG_MLX5_VDPA_STEERING_DEBUG is not set
+CONFIG_VP_VDPA=m
+CONFIG_ALIBABA_ENI_VDPA=m
+CONFIG_SNET_VDPA=m
+CONFIG_VHOST_IOTLB=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST_TASK=y
+CONFIG_VHOST=m
+CONFIG_VHOST_MENU=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+# CONFIG_HYPERV_VTL_MODE is not set
+CONFIG_HYPERV_TIMER=y
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+# CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PCI_STUB=y
+CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PVCALLS_FRONTEND=m
+# CONFIG_XEN_PVCALLS_BACKEND is not set
+CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_ACPI_PROCESSOR=y
+CONFIG_XEN_MCE_LOG=y
+CONFIG_XEN_HAVE_PVMMU=y
+CONFIG_XEN_EFI=y
+CONFIG_XEN_AUTO_XLATE=y
+CONFIG_XEN_ACPI=y
+CONFIG_XEN_SYMS=y
+CONFIG_XEN_HAVE_VPMU=y
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
+CONFIG_XEN_UNPOPULATED_ALLOC=y
+CONFIG_XEN_GRANT_DMA_OPS=y
+CONFIG_XEN_VIRTIO=y
+# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
+# end of Xen driver support
+
+# CONFIG_GREYBUS is not set
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
+CONFIG_COMEDI_BOND=m
+CONFIG_COMEDI_TEST=m
+CONFIG_COMEDI_PARPORT=m
+CONFIG_COMEDI_ISA_DRIVERS=y
+CONFIG_COMEDI_PCL711=m
+CONFIG_COMEDI_PCL724=m
+CONFIG_COMEDI_PCL726=m
+CONFIG_COMEDI_PCL730=m
+CONFIG_COMEDI_PCL812=m
+CONFIG_COMEDI_PCL816=m
+CONFIG_COMEDI_PCL818=m
+CONFIG_COMEDI_PCM3724=m
+CONFIG_COMEDI_AMPLC_DIO200_ISA=m
+CONFIG_COMEDI_AMPLC_PC236_ISA=m
+CONFIG_COMEDI_AMPLC_PC263_ISA=m
+CONFIG_COMEDI_RTI800=m
+CONFIG_COMEDI_RTI802=m
+CONFIG_COMEDI_DAC02=m
+CONFIG_COMEDI_DAS16M1=m
+CONFIG_COMEDI_DAS08_ISA=m
+CONFIG_COMEDI_DAS16=m
+CONFIG_COMEDI_DAS800=m
+CONFIG_COMEDI_DAS1800=m
+CONFIG_COMEDI_DAS6402=m
+CONFIG_COMEDI_DT2801=m
+CONFIG_COMEDI_DT2811=m
+CONFIG_COMEDI_DT2814=m
+CONFIG_COMEDI_DT2815=m
+CONFIG_COMEDI_DT2817=m
+CONFIG_COMEDI_DT282X=m
+CONFIG_COMEDI_DMM32AT=m
+CONFIG_COMEDI_FL512=m
+CONFIG_COMEDI_AIO_AIO12_8=m
+CONFIG_COMEDI_AIO_IIRO_16=m
+CONFIG_COMEDI_II_PCI20KC=m
+CONFIG_COMEDI_C6XDIGIO=m
+CONFIG_COMEDI_MPC624=m
+CONFIG_COMEDI_ADQ12B=m
+CONFIG_COMEDI_NI_AT_A2150=m
+CONFIG_COMEDI_NI_AT_AO=m
+CONFIG_COMEDI_NI_ATMIO=m
+CONFIG_COMEDI_NI_ATMIO16D=m
+CONFIG_COMEDI_NI_LABPC_ISA=m
+CONFIG_COMEDI_PCMAD=m
+CONFIG_COMEDI_PCMDA12=m
+CONFIG_COMEDI_PCMMIO=m
+CONFIG_COMEDI_PCMUIO=m
+CONFIG_COMEDI_MULTIQ3=m
+CONFIG_COMEDI_S526=m
+CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
+CONFIG_COMEDI_ADDI_APCI_1032=m
+CONFIG_COMEDI_ADDI_APCI_1500=m
+CONFIG_COMEDI_ADDI_APCI_1516=m
+CONFIG_COMEDI_ADDI_APCI_1564=m
+CONFIG_COMEDI_ADDI_APCI_16XX=m
+CONFIG_COMEDI_ADDI_APCI_2032=m
+CONFIG_COMEDI_ADDI_APCI_2200=m
+CONFIG_COMEDI_ADDI_APCI_3120=m
+CONFIG_COMEDI_ADDI_APCI_3501=m
+CONFIG_COMEDI_ADDI_APCI_3XXX=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1720=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
+CONFIG_COMEDI_ADV_PCI1760=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
+CONFIG_COMEDI_AMPLC_PCI224=m
+CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
+CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
+CONFIG_COMEDI_GSC_HPDI=m
+CONFIG_COMEDI_MF6X4=m
+CONFIG_COMEDI_ICP_MULTI=m
+CONFIG_COMEDI_DAQBOARD2000=m
+CONFIG_COMEDI_JR3_PCI=m
+CONFIG_COMEDI_KE_COUNTER=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+CONFIG_COMEDI_CB_PCIMDAS=m
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_ME4000=m
+CONFIG_COMEDI_ME_DAQ=m
+CONFIG_COMEDI_NI_6527=m
+CONFIG_COMEDI_NI_65XX=m
+CONFIG_COMEDI_NI_660X=m
+CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
+CONFIG_COMEDI_NI_PCIDIO=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_RTD520=m
+CONFIG_COMEDI_S626=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_CB_DAS16_CS=m
+CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_NI_DAQ_700_CS=m
+CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
+CONFIG_COMEDI_NI_LABPC_CS=m
+CONFIG_COMEDI_NI_MIO_CS=m
+CONFIG_COMEDI_QUATECH_DAQP_CS=m
+CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_NI_USB6501=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8254=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_8255_SA=m
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_ISADMA=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_ISADMA=m
+CONFIG_COMEDI_NI_TIO=m
+CONFIG_COMEDI_NI_ROUTING=m
+# CONFIG_COMEDI_TESTS is not set
+CONFIG_STAGING=y
+CONFIG_PRISM2_USB=m
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16203=m
+CONFIG_ADIS16240=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD7816=m
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+CONFIG_ADT7316=m
+CONFIG_ADT7316_SPI=m
+CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
+
+#
+# Direct Digital Synthesis
+#
+CONFIG_AD9832=m
+CONFIG_AD9834=m
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+CONFIG_FB_SM750=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_INTEL_ATOMISP=y
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_SP8870=m
+CONFIG_VIDEO_IPU3_IMGU=m
+# CONFIG_STAGING_MEDIA_DEPRECATED is not set
+CONFIG_LTE_GDM724X=m
+CONFIG_FB_TFT=m
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_HX8357D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SEPS525=m
+CONFIG_FB_TFT_SH1106=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1305=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7789V=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1611=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_MOST_COMPONENTS=m
+CONFIG_MOST_NET=m
+CONFIG_MOST_VIDEO=m
+CONFIG_MOST_I2C=m
+CONFIG_KS7010=m
+# CONFIG_PI433 is not set
+CONFIG_FIELDBUS_DEV=m
+CONFIG_QLGE=m
+CONFIG_VME_BUS=y
+
+#
+# VME Bridge Drivers
+#
+CONFIG_VME_TSI148=m
+# CONFIG_VME_FAKE is not set
+
+#
+# VME Device Drivers
+#
+CONFIG_VME_USER=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_ACPI=m
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
+CONFIG_CHROMEOS_TBMC=m
+CONFIG_CROS_EC=m
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
+CONFIG_CROS_EC_SPI=m
+CONFIG_CROS_EC_UART=m
+CONFIG_CROS_EC_LPC=m
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LIGHTBAR=m
+CONFIG_CROS_EC_DEBUGFS=m
+CONFIG_CROS_EC_SENSORHUB=m
+CONFIG_CROS_EC_SYSFS=m
+CONFIG_CROS_EC_TYPEC=m
+CONFIG_CROS_HPS_I2C=m
+CONFIG_CROS_USBPD_LOGGER=m
+CONFIG_CROS_USBPD_NOTIFY=m
+CONFIG_CHROMEOS_PRIVACY_SCREEN=m
+CONFIG_CROS_TYPEC_SWITCH=m
+CONFIG_WILCO_EC=m
+# CONFIG_WILCO_EC_DEBUGFS is not set
+CONFIG_WILCO_EC_EVENTS=m
+CONFIG_WILCO_EC_TELEMETRY=m
+# CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_SURFACE_PLATFORMS=y
+CONFIG_SURFACE3_WMI=m
+CONFIG_SURFACE_3_POWER_OPREGION=m
+CONFIG_SURFACE_ACPI_NOTIFY=m
+# CONFIG_SURFACE_AGGREGATOR_CDEV is not set
+CONFIG_SURFACE_AGGREGATOR_HUB=m
+CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
+CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH=m
+CONFIG_SURFACE_DTX=m
+CONFIG_SURFACE_GPE=m
+CONFIG_SURFACE_HOTPLUG=m
+CONFIG_SURFACE_PLATFORM_PROFILE=m
+CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_SURFACE_AGGREGATOR=m
+CONFIG_SURFACE_AGGREGATOR_BUS=y
+# CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACPI_WMI=m
+CONFIG_WMI_BMOF=m
+CONFIG_HUAWEI_WMI=m
+CONFIG_MXM_WMI=m
+CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
+CONFIG_XIAOMI_WMI=m
+CONFIG_GIGABYTE_WMI=m
+CONFIG_YOGABOOK_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ACER_WIRELESS=m
+CONFIG_ACER_WMI=m
+CONFIG_AMD_PMF=m
+CONFIG_AMD_PMC=m
+CONFIG_AMD_HSMP=m
+CONFIG_ADV_SWBUTTON=m
+CONFIG_APPLE_GMUX=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_ASUS_WIRELESS=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_ASUS_TF103C_DOCK=m
+CONFIG_MERAKI_MX100=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
+CONFIG_X86_PLATFORM_DRIVERS_DELL=y
+CONFIG_ALIENWARE_WMI=m
+CONFIG_DCDBAS=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_RBU=m
+CONFIG_DELL_RBTN=m
+CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_WMI=y
+CONFIG_DELL_SMBIOS_SMM=y
+CONFIG_DELL_SMO8800=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_PRIVACY=y
+CONFIG_DELL_WMI_AIO=m
+CONFIG_DELL_WMI_DESCRIPTOR=m
+CONFIG_DELL_WMI_DDV=m
+CONFIG_DELL_WMI_LED=m
+CONFIG_DELL_WMI_SYSMAN=m
+CONFIG_AMILO_RFKILL=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_FUJITSU_TABLET=m
+CONFIG_GPD_POCKET_FAN=m
+CONFIG_X86_PLATFORM_DRIVERS_HP=y
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WMI=m
+CONFIG_WIRELESS_HOTKEY=m
+CONFIG_IBM_RTL=m
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_LENOVO_YMC=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+CONFIG_THINKPAD_ACPI_DEBUGFACILITIES=y
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_THINKPAD_LMI=m
+CONFIG_INTEL_ATOMISP2_PDX86=y
+CONFIG_INTEL_ATOMISP2_LED=m
+CONFIG_INTEL_IFS=m
+CONFIG_INTEL_SAR_INT1092=m
+CONFIG_INTEL_SKL_INT3472=m
+CONFIG_INTEL_PMC_CORE=y
+CONFIG_INTEL_PMT_CLASS=m
+CONFIG_INTEL_PMT_TELEMETRY=m
+CONFIG_INTEL_PMT_CRASHLOG=m
+
+#
+# Intel Speed Select Technology interface support
+#
+CONFIG_INTEL_SPEED_SELECT_TPMI=m
+CONFIG_INTEL_SPEED_SELECT_INTERFACE=m
+# end of Intel Speed Select Technology interface support
+
+CONFIG_INTEL_TELEMETRY=m
+CONFIG_INTEL_WMI=y
+CONFIG_INTEL_WMI_SBL_FW_UPDATE=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
+
+#
+# Intel Uncore Frequency Control
+#
+CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# end of Intel Uncore Frequency Control
+
+CONFIG_INTEL_HID_EVENT=m
+CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_INT0002_VGPIO=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_INTEL_BXTWC_PMIC_TMU=m
+CONFIG_INTEL_BYTCRC_PWRSRC=m
+CONFIG_INTEL_CHTDC_TI_PWRBTN=m
+CONFIG_INTEL_CHTWC_INT33FE=m
+CONFIG_INTEL_ISHTP_ECLITE=m
+CONFIG_INTEL_MRFLD_PWRBTN=m
+CONFIG_INTEL_PUNIT_IPC=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SDSI=m
+CONFIG_INTEL_SMARTCONNECT=m
+CONFIG_INTEL_TPMI=m
+# CONFIG_INTEL_TURBO_MAX_3 is not set
+CONFIG_INTEL_VSEC=m
+CONFIG_MSI_EC=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_MSI_WMI=m
+CONFIG_PCENGINES_APU2=m
+CONFIG_BARCO_P50_GPIO=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
+CONFIG_TOSHIBA_WMI=m
+CONFIG_ACPI_CMPC=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_LG_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_SYSTEM76_ACPI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_SERIAL_MULTI_INSTANTIATE=m
+# CONFIG_MLX_PLATFORM is not set
+# CONFIG_TOUCHSCREEN_DMI is not set
+CONFIG_FW_ATTR_CLASS=m
+CONFIG_INTEL_IPS=m
+CONFIG_INTEL_SCU_IPC=y
+CONFIG_INTEL_SCU=y
+CONFIG_INTEL_SCU_PCI=y
+CONFIG_INTEL_SCU_PLATFORM=m
+CONFIG_INTEL_SCU_IPC_UTIL=m
+CONFIG_SIEMENS_SIMATIC_IPC=m
+CONFIG_WINMATE_FM07_KEYS=m
+CONFIG_P2SB=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+CONFIG_COMMON_CLK_WM831X=m
+CONFIG_LMK04832=m
+CONFIG_COMMON_CLK_MAX9485=m
+CONFIG_COMMON_CLK_SI5341=m
+CONFIG_COMMON_CLK_SI5351=m
+CONFIG_COMMON_CLK_SI544=m
+CONFIG_COMMON_CLK_CDCE706=m
+CONFIG_COMMON_CLK_TPS68470=m
+CONFIG_COMMON_CLK_CS2000_CP=m
+CONFIG_CLK_TWL6040=m
+CONFIG_COMMON_CLK_PALMAS=m
+CONFIG_COMMON_CLK_PWM=m
+CONFIG_XILINX_VCU=m
+# CONFIG_HWSPINLOCK is not set
+
+#
+# Clock Source drivers
+#
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+CONFIG_PCC=y
+CONFIG_ALTERA_MBOX=m
+CONFIG_IOMMU_IOVA=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+CONFIG_IOMMU_IO_PGTABLE=y
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_IOMMU_DMA=y
+CONFIG_IOMMU_SVA=y
+CONFIG_AMD_IOMMU=y
+CONFIG_AMD_IOMMU_V2=m
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+CONFIG_INTEL_IOMMU_SVM=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+# CONFIG_INTEL_IOMMU_PERF_EVENTS is not set
+# CONFIG_IOMMUFD is not set
+CONFIG_IRQ_REMAP=y
+CONFIG_HYPERV_IOMMU=y
+CONFIG_VIRTIO_IOMMU=m
+
+#
+# Remoteproc drivers
+#
+# CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+CONFIG_RPMSG=m
+# CONFIG_RPMSG_CHAR is not set
+# CONFIG_RPMSG_CTRL is not set
+CONFIG_RPMSG_NS=m
+CONFIG_RPMSG_QCOM_GLINK=m
+CONFIG_RPMSG_QCOM_GLINK_RPM=m
+CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
+CONFIG_SOUNDWIRE=m
+
+#
+# SoundWire Devices
+#
+CONFIG_SOUNDWIRE_AMD=m
+CONFIG_SOUNDWIRE_CADENCE=m
+CONFIG_SOUNDWIRE_INTEL=m
+CONFIG_SOUNDWIRE_QCOM=m
+CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# fujitsu SoC drivers
+#
+# end of fujitsu SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# end of Enable LiteX SoC Builder specific drivers
+
+CONFIG_WPCM450_SOC=m
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_QMI_HELPERS=m
+# end of Qualcomm SoC drivers
+
+CONFIG_SOC_TI=y
+
+#
+# Xilinx SoC drivers
+#
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_AXP288=m
+CONFIG_EXTCON_FSA9480=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_INTEL_INT3496=m
+CONFIG_EXTCON_INTEL_CHT_WC=m
+CONFIG_EXTCON_INTEL_MRFLD=m
+CONFIG_EXTCON_MAX14577=m
+CONFIG_EXTCON_MAX3355=m
+CONFIG_EXTCON_MAX77693=m
+CONFIG_EXTCON_MAX77843=m
+CONFIG_EXTCON_MAX8997=m
+CONFIG_EXTCON_PALMAS=m
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_RT8973A=m
+CONFIG_EXTCON_SM5502=m
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_EXTCON_USBC_CROS_EC=m
+CONFIG_EXTCON_USBC_TUSB320=m
+CONFIG_MEMORY=y
+CONFIG_FPGA_DFL_EMIF=m
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_DMA=m
+CONFIG_IIO_BUFFER_DMAENGINE=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=m
+CONFIG_IIO_GTS_HELPER=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+CONFIG_IIO_SW_DEVICE=m
+CONFIG_IIO_SW_TRIGGER=m
+CONFIG_IIO_TRIGGERED_EVENT=m
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16201=m
+CONFIG_ADIS16209=m
+CONFIG_ADXL313=m
+CONFIG_ADXL313_I2C=m
+CONFIG_ADXL313_SPI=m
+CONFIG_ADXL355=m
+CONFIG_ADXL355_I2C=m
+CONFIG_ADXL355_SPI=m
+CONFIG_ADXL367=m
+CONFIG_ADXL367_SPI=m
+CONFIG_ADXL367_I2C=m
+CONFIG_ADXL372=m
+CONFIG_ADXL372_SPI=m
+CONFIG_ADXL372_I2C=m
+CONFIG_BMA220=m
+CONFIG_BMA400=m
+CONFIG_BMA400_I2C=m
+CONFIG_BMA400_SPI=m
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_BMI088_ACCEL=m
+CONFIG_BMI088_ACCEL_SPI=m
+CONFIG_DA280=m
+CONFIG_DA311=m
+CONFIG_DMARD06=m
+CONFIG_DMARD09=m
+CONFIG_DMARD10=m
+CONFIG_FXLS8962AF=m
+CONFIG_FXLS8962AF_I2C=m
+CONFIG_FXLS8962AF_SPI=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_IIO_KX022A=m
+CONFIG_IIO_KX022A_SPI=m
+CONFIG_IIO_KX022A_I2C=m
+CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
+CONFIG_KXSD9_I2C=m
+CONFIG_KXCJK1013=m
+CONFIG_MC3230=m
+CONFIG_MMA7455=m
+CONFIG_MMA7455_I2C=m
+CONFIG_MMA7455_SPI=m
+CONFIG_MMA7660=m
+CONFIG_MMA8452=m
+CONFIG_MMA9551_CORE=m
+CONFIG_MMA9551=m
+CONFIG_MMA9553=m
+CONFIG_MSA311=m
+CONFIG_MXC4005=m
+CONFIG_MXC6255=m
+CONFIG_SCA3000=m
+CONFIG_SCA3300=m
+CONFIG_STK8312=m
+CONFIG_STK8BA50=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD4130=m
+CONFIG_AD7091R5=m
+CONFIG_AD7124=m
+CONFIG_AD7192=m
+CONFIG_AD7266=m
+CONFIG_AD7280=m
+CONFIG_AD7291=m
+CONFIG_AD7292=m
+CONFIG_AD7298=m
+CONFIG_AD7476=m
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+CONFIG_AD7606_IFACE_SPI=m
+CONFIG_AD7766=m
+CONFIG_AD7768_1=m
+CONFIG_AD7780=m
+CONFIG_AD7791=m
+CONFIG_AD7793=m
+CONFIG_AD7887=m
+CONFIG_AD7923=m
+CONFIG_AD7949=m
+CONFIG_AD799X=m
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
+CONFIG_CC10001_ADC=m
+CONFIG_DA9150_GPADC=m
+CONFIG_DLN2_ADC=m
+CONFIG_ENVELOPE_DETECTOR=m
+CONFIG_HI8435=m
+CONFIG_HX711=m
+CONFIG_INA2XX_ADC=m
+CONFIG_INTEL_MRFLD_ADC=m
+CONFIG_LP8788_ADC=m
+CONFIG_LTC2471=m
+CONFIG_LTC2485=m
+CONFIG_LTC2496=m
+CONFIG_LTC2497=m
+CONFIG_MAX1027=m
+CONFIG_MAX11100=m
+CONFIG_MAX1118=m
+CONFIG_MAX11205=m
+CONFIG_MAX11410=m
+CONFIG_MAX1241=m
+CONFIG_MAX1363=m
+CONFIG_MAX9611=m
+CONFIG_MCP320X=m
+CONFIG_MCP3422=m
+CONFIG_MCP3911=m
+# CONFIG_MEDIATEK_MT6360_ADC is not set
+CONFIG_MEDIATEK_MT6370_ADC=m
+CONFIG_MEN_Z188_ADC=m
+CONFIG_MP2629_ADC=m
+CONFIG_NAU7802=m
+CONFIG_PALMAS_GPADC=m
+CONFIG_QCOM_VADC_COMMON=m
+CONFIG_QCOM_SPMI_IADC=m
+CONFIG_QCOM_SPMI_VADC=m
+CONFIG_QCOM_SPMI_ADC5=m
+CONFIG_RICHTEK_RTQ6056=m
+CONFIG_SD_ADC_MODULATOR=m
+CONFIG_TI_ADC081C=m
+CONFIG_TI_ADC0832=m
+CONFIG_TI_ADC084S021=m
+CONFIG_TI_ADC12138=m
+CONFIG_TI_ADC108S102=m
+CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADC161S626=m
+CONFIG_TI_ADS1015=m
+CONFIG_TI_ADS7924=m
+CONFIG_TI_ADS1100=m
+CONFIG_TI_ADS7950=m
+CONFIG_TI_ADS8344=m
+CONFIG_TI_ADS8688=m
+CONFIG_TI_ADS124S08=m
+CONFIG_TI_ADS131E08=m
+CONFIG_TI_AM335X_ADC=m
+CONFIG_TI_LMP92064=m
+CONFIG_TI_TLC4541=m
+CONFIG_TI_TSC2046=m
+CONFIG_TWL4030_MADC=m
+CONFIG_TWL6030_GPADC=m
+CONFIG_VF610_ADC=m
+CONFIG_VIPERBOARD_ADC=m
+CONFIG_XILINX_XADC=m
+# end of Analog to digital converters
+
+#
+# Analog to digital and digital to analog converters
+#
+CONFIG_AD74115=m
+CONFIG_AD74413R=m
+# end of Analog to digital and digital to analog converters
+
+#
+# Analog Front Ends
+#
+CONFIG_IIO_RESCALE=m
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+CONFIG_AD8366=m
+CONFIG_ADA4250=m
+CONFIG_HMC425=m
+# end of Amplifiers
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7150=m
+CONFIG_AD7746=m
+# end of Capacitance to digital converters
+
+#
+# Chemical Sensors
+#
+CONFIG_ATLAS_PH_SENSOR=m
+CONFIG_ATLAS_EZO_SENSOR=m
+CONFIG_BME680=m
+CONFIG_BME680_I2C=m
+CONFIG_BME680_SPI=m
+CONFIG_CCS811=m
+CONFIG_IAQCORE=m
+CONFIG_PMS7003=m
+CONFIG_SCD30_CORE=m
+CONFIG_SCD30_I2C=m
+CONFIG_SCD30_SERIAL=m
+CONFIG_SCD4X=m
+CONFIG_SENSIRION_SGP30=m
+CONFIG_SENSIRION_SGP40=m
+CONFIG_SPS30=m
+CONFIG_SPS30_I2C=m
+CONFIG_SPS30_SERIAL=m
+CONFIG_SENSEAIR_SUNRISE_CO2=m
+CONFIG_VZ89X=m
+# end of Chemical Sensors
+
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m
+CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+CONFIG_IIO_MS_SENSORS_I2C=m
+
+#
+# IIO SCMI Sensors
+#
+# end of IIO SCMI Sensors
+
+#
+# SSP Sensor Common
+#
+CONFIG_IIO_SSP_SENSORS_COMMONS=m
+CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+CONFIG_AD3552R=m
+CONFIG_AD5064=m
+CONFIG_AD5360=m
+CONFIG_AD5380=m
+CONFIG_AD5421=m
+CONFIG_AD5446=m
+CONFIG_AD5449=m
+CONFIG_AD5592R_BASE=m
+CONFIG_AD5592R=m
+CONFIG_AD5593R=m
+CONFIG_AD5504=m
+CONFIG_AD5624R_SPI=m
+CONFIG_LTC2688=m
+CONFIG_AD5686=m
+CONFIG_AD5686_SPI=m
+CONFIG_AD5696_I2C=m
+CONFIG_AD5755=m
+CONFIG_AD5758=m
+CONFIG_AD5761=m
+CONFIG_AD5764=m
+CONFIG_AD5766=m
+CONFIG_AD5770R=m
+CONFIG_AD5791=m
+CONFIG_AD7293=m
+CONFIG_AD7303=m
+CONFIG_AD8801=m
+CONFIG_DPOT_DAC=m
+CONFIG_DS4424=m
+CONFIG_LTC1660=m
+CONFIG_LTC2632=m
+CONFIG_M62332=m
+CONFIG_MAX517=m
+CONFIG_MAX5522=m
+CONFIG_MAX5821=m
+CONFIG_MCP4725=m
+CONFIG_MCP4922=m
+CONFIG_TI_DAC082S085=m
+CONFIG_TI_DAC5571=m
+CONFIG_TI_DAC7311=m
+CONFIG_TI_DAC7612=m
+CONFIG_VF610_DAC=m
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+CONFIG_IIO_SIMPLE_DUMMY=m
+# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
+# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
+
+#
+# Filters
+#
+CONFIG_ADMV8818=m
+# end of Filters
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+CONFIG_AD9523=m
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+CONFIG_ADF4350=m
+CONFIG_ADF4371=m
+CONFIG_ADF4377=m
+CONFIG_ADMV1013=m
+CONFIG_ADMV1014=m
+CONFIG_ADMV4420=m
+CONFIG_ADRF6780=m
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+CONFIG_ADIS16080=m
+CONFIG_ADIS16130=m
+CONFIG_ADIS16136=m
+CONFIG_ADIS16260=m
+CONFIG_ADXRS290=m
+CONFIG_ADXRS450=m
+CONFIG_BMG160=m
+CONFIG_BMG160_I2C=m
+CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_MPU3050=m
+CONFIG_MPU3050_I2C=m
+CONFIG_IIO_ST_GYRO_3AXIS=m
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
+CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+CONFIG_AFE4403=m
+CONFIG_AFE4404=m
+CONFIG_MAX30100=m
+CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+CONFIG_AM2315=m
+CONFIG_DHT11=m
+CONFIG_HDC100X=m
+CONFIG_HDC2010=m
+CONFIG_HID_SENSOR_HUMIDITY=m
+CONFIG_HTS221=m
+CONFIG_HTS221_I2C=m
+CONFIG_HTS221_SPI=m
+CONFIG_HTU21=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+CONFIG_ADIS16400=m
+CONFIG_ADIS16460=m
+CONFIG_ADIS16475=m
+CONFIG_ADIS16480=m
+CONFIG_BMI160=m
+CONFIG_BMI160_I2C=m
+CONFIG_BMI160_SPI=m
+CONFIG_BOSCH_BNO055=m
+CONFIG_BOSCH_BNO055_SERIAL=m
+CONFIG_BOSCH_BNO055_I2C=m
+CONFIG_FXOS8700=m
+CONFIG_FXOS8700_I2C=m
+CONFIG_FXOS8700_SPI=m
+CONFIG_KMX61=m
+CONFIG_INV_ICM42600=m
+CONFIG_INV_ICM42600_I2C=m
+CONFIG_INV_ICM42600_SPI=m
+CONFIG_INV_MPU6050_IIO=m
+CONFIG_INV_MPU6050_I2C=m
+CONFIG_INV_MPU6050_SPI=m
+CONFIG_IIO_ST_LSM6DSX=m
+CONFIG_IIO_ST_LSM6DSX_I2C=m
+CONFIG_IIO_ST_LSM6DSX_SPI=m
+CONFIG_IIO_ST_LSM6DSX_I3C=m
+CONFIG_IIO_ST_LSM9DS0=m
+CONFIG_IIO_ST_LSM9DS0_I2C=m
+CONFIG_IIO_ST_LSM9DS0_SPI=m
+# end of Inertial measurement units
+
+CONFIG_IIO_ADIS_LIB=m
+CONFIG_IIO_ADIS_LIB_BUFFER=y
+
+#
+# Light sensors
+#
+CONFIG_ACPI_ALS=m
+CONFIG_ADJD_S311=m
+CONFIG_ADUX1020=m
+CONFIG_AL3010=m
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+CONFIG_APDS9960=m
+CONFIG_AS73211=m
+CONFIG_BH1750=m
+CONFIG_BH1780=m
+CONFIG_CM32181=m
+CONFIG_CM3232=m
+CONFIG_CM3323=m
+CONFIG_CM3605=m
+CONFIG_CM36651=m
+CONFIG_IIO_CROS_EC_LIGHT_PROX=m
+CONFIG_GP2AP002=m
+CONFIG_GP2AP020A00F=m
+CONFIG_IQS621_ALS=m
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+CONFIG_ISL29125=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_JSA1212=m
+CONFIG_ROHM_BU27034=m
+CONFIG_RPR0521=m
+CONFIG_SENSORS_LM3533=m
+CONFIG_LTR501=m
+CONFIG_LTRF216A=m
+CONFIG_LV0104CS=m
+CONFIG_MAX44000=m
+CONFIG_MAX44009=m
+CONFIG_NOA1305=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
+CONFIG_SI1133=m
+CONFIG_SI1145=m
+CONFIG_STK3310=m
+CONFIG_ST_UVIS25=m
+CONFIG_ST_UVIS25_I2C=m
+CONFIG_ST_UVIS25_SPI=m
+CONFIG_TCS3414=m
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
+CONFIG_TSL2591=m
+CONFIG_TSL2772=m
+CONFIG_TSL4531=m
+CONFIG_US5182D=m
+CONFIG_VCNL4000=m
+CONFIG_VCNL4035=m
+CONFIG_VEML6030=m
+CONFIG_VEML6070=m
+CONFIG_VL6180=m
+CONFIG_ZOPT2201=m
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+CONFIG_AK8974=m
+CONFIG_AK8975=m
+CONFIG_AK09911=m
+CONFIG_BMC150_MAGN=m
+CONFIG_BMC150_MAGN_I2C=m
+CONFIG_BMC150_MAGN_SPI=m
+CONFIG_MAG3110=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_MMC35240=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+CONFIG_SENSORS_HMC5843_SPI=m
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
+# CONFIG_TI_TMAG5273 is not set
+CONFIG_YAMAHA_YAS530=m
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+CONFIG_IIO_MUX=m
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_HRTIMER_TRIGGER=m
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_TIGHTLOOP_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
+
+#
+# Linear and angular position sensors
+#
+CONFIG_IQS624_POS=m
+CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
+# end of Linear and angular position sensors
+
+#
+# Digital potentiometers
+#
+CONFIG_AD5110=m
+CONFIG_AD5272=m
+CONFIG_DS1803=m
+CONFIG_MAX5432=m
+CONFIG_MAX5481=m
+CONFIG_MAX5487=m
+CONFIG_MCP4018=m
+CONFIG_MCP4131=m
+CONFIG_MCP4531=m
+CONFIG_MCP41010=m
+CONFIG_TPL0102=m
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+CONFIG_LMP91000=m
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+CONFIG_ABP060MG=m
+CONFIG_BMP280=m
+CONFIG_BMP280_I2C=m
+CONFIG_BMP280_SPI=m
+CONFIG_IIO_CROS_EC_BARO=m
+CONFIG_DLHL60D=m
+CONFIG_DPS310=m
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_HP03=m
+CONFIG_ICP10100=m
+CONFIG_MPL115=m
+CONFIG_MPL115_I2C=m
+CONFIG_MPL115_SPI=m
+CONFIG_MPL3115=m
+CONFIG_MS5611=m
+CONFIG_MS5611_I2C=m
+CONFIG_MS5611_SPI=m
+CONFIG_MS5637=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+CONFIG_T5403=m
+CONFIG_HP206C=m
+CONFIG_ZPA2326=m
+CONFIG_ZPA2326_I2C=m
+CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+CONFIG_AS3935=m
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+CONFIG_CROS_EC_MKBP_PROXIMITY=m
+CONFIG_ISL29501=m
+CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
+CONFIG_PING=m
+CONFIG_RFD77402=m
+CONFIG_SRF04=m
+CONFIG_SX_COMMON=m
+CONFIG_SX9310=m
+CONFIG_SX9324=m
+CONFIG_SX9360=m
+CONFIG_SX9500=m
+CONFIG_SRF08=m
+CONFIG_VCNL3020=m
+CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S90=m
+CONFIG_AD2S1200=m
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+CONFIG_IQS620AT_TEMP=m
+CONFIG_LTC2983=m
+CONFIG_MAXIM_THERMOCOUPLE=m
+CONFIG_HID_SENSOR_TEMP=m
+CONFIG_MLX90614=m
+CONFIG_MLX90632=m
+CONFIG_TMP006=m
+CONFIG_TMP007=m
+CONFIG_TMP117=m
+CONFIG_TSYS01=m
+CONFIG_TSYS02D=m
+CONFIG_MAX30208=m
+CONFIG_MAX31856=m
+CONFIG_MAX31865=m
+# end of Temperature sensors
+
+CONFIG_NTB=m
+CONFIG_NTB_MSI=y
+CONFIG_NTB_AMD=m
+CONFIG_NTB_IDT=m
+CONFIG_NTB_INTEL=m
+CONFIG_NTB_EPF=m
+CONFIG_NTB_SWITCHTEC=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_PERF=m
+CONFIG_NTB_MSI_TEST=m
+CONFIG_NTB_TRANSPORT=m
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_DEBUG is not set
+CONFIG_PWM_CLK=m
+CONFIG_PWM_CRC=y
+CONFIG_PWM_CROS_EC=m
+CONFIG_PWM_DWC=m
+CONFIG_PWM_IQS620A=m
+CONFIG_PWM_LP3943=m
+CONFIG_PWM_LPSS=m
+CONFIG_PWM_LPSS_PCI=m
+CONFIG_PWM_LPSS_PLATFORM=m
+CONFIG_PWM_PCA9685=m
+CONFIG_PWM_TWL=m
+CONFIG_PWM_TWL_LED=m
+
+#
+# IRQ chip support
+#
+CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_SIMPLE=y
+CONFIG_RESET_TI_SYSCON=m
+CONFIG_RESET_TI_TPS380X=m
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PHY_MIPI_DPHY=y
+CONFIG_USB_LGM_PHY=m
+CONFIG_PHY_CAN_TRANSCEIVER=m
+
+#
+# PHY drivers for Broadcom platforms
+#
+CONFIG_BCM_KONA_USB2_PHY=m
+# end of PHY drivers for Broadcom platforms
+
+CONFIG_PHY_PXA_28NM_HSIC=m
+CONFIG_PHY_PXA_28NM_USB2=m
+CONFIG_PHY_CPCAP_USB=m
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_SAMSUNG_USB2=m
+CONFIG_PHY_TUSB1210=m
+CONFIG_PHY_INTEL_LGM_EMMC=m
+# end of PHY Subsystem
+
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL_CORE=m
+CONFIG_INTEL_RAPL=m
+CONFIG_IDLE_INJECT=y
+CONFIG_MCB=m
+CONFIG_MCB_PCI=m
+CONFIG_MCB_LPC=m
+
+#
+# Performance monitor support
+#
+# end of Performance monitor support
+
+CONFIG_RAS=y
+# CONFIG_RAS_CEC is not set
+CONFIG_USB4=m
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# Android
+#
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
+# end of Android
+
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+CONFIG_ND_PFN=m
+CONFIG_NVDIMM_PFN=y
+CONFIG_NVDIMM_DAX=y
+CONFIG_NVDIMM_KEYS=y
+# CONFIG_NVDIMM_SECURITY_TEST is not set
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
+CONFIG_DEV_DAX_HMEM=m
+CONFIG_DEV_DAX_CXL=m
+CONFIG_DEV_DAX_HMEM_DEVICES=y
+CONFIG_DEV_DAX_KMEM=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+
+#
+# Layout Types
+#
+# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
+# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
+# end of Layout Types
+
+CONFIG_NVMEM_RAVE_SP_EEPROM=m
+CONFIG_NVMEM_RMEM=m
+CONFIG_NVMEM_SPMI_SDAM=m
+
+#
+# HW tracing support
+#
+CONFIG_STM=m
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_HEARTBEAT=m
+CONFIG_STM_SOURCE_FTRACE=m
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_ACPI=m
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH_STH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
+CONFIG_FPGA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_BRIDGE=m
+CONFIG_ALTERA_FREEZE_BRIDGE=m
+CONFIG_XILINX_PR_DECOUPLER=m
+CONFIG_FPGA_REGION=m
+CONFIG_FPGA_DFL=m
+CONFIG_FPGA_DFL_FME=m
+CONFIG_FPGA_DFL_FME_MGR=m
+CONFIG_FPGA_DFL_FME_BRIDGE=m
+CONFIG_FPGA_DFL_FME_REGION=m
+CONFIG_FPGA_DFL_AFU=m
+CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000=m
+CONFIG_FPGA_DFL_PCI=m
+CONFIG_FPGA_M10_BMC_SEC_UPDATE=m
+CONFIG_FPGA_MGR_MICROCHIP_SPI=m
+CONFIG_FPGA_MGR_LATTICE_SYSCONFIG=m
+CONFIG_FPGA_MGR_LATTICE_SYSCONFIG_SPI=m
+CONFIG_TEE=m
+CONFIG_AMDTEE=m
+CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
+CONFIG_MUX_ADG792A=m
+CONFIG_MUX_ADGS1408=m
+CONFIG_MUX_GPIO=m
+# end of Multiplexer drivers
+
+CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set
+CONFIG_COUNTER=m
+CONFIG_INTEL_QEP=m
+CONFIG_INTERRUPT_CNT=m
+CONFIG_MOST=m
+CONFIG_MOST_USB_HDM=m
+CONFIG_MOST_CDEV=m
+CONFIG_MOST_SND=m
+# CONFIG_PECI is not set
+CONFIG_HTE=y
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+CONFIG_LEGACY_DIRECT_IO=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+# CONFIG_XFS_SUPPORT_ASCII_CI is not set
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_FS_LZO=y
+CONFIG_F2FS_FS_LZORLE=y
+CONFIG_F2FS_FS_LZ4=y
+CONFIG_F2FS_FS_LZ4HC=y
+CONFIG_F2FS_FS_ZSTD=y
+# CONFIG_F2FS_IOSTAT is not set
+CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_ZONEFS_FS=m
+CONFIG_FS_DAX=y
+CONFIG_FS_DAX_PMD=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+# CONFIG_EXPORTFS_BLOCK_OPS is not set
+CONFIG_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=y
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_FUSE_DAX=y
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_XINO_AUTO is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_NETFS_SUPPORT=m
+CONFIG_NETFS_STATS=y
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_DEBUG is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_ERROR_INJECTION is not set
+# CONFIG_CACHEFILES_ONDEMAND is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/EXFAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_DEFAULT_UTF8 is not set
+CONFIG_EXFAT_FS=m
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+CONFIG_NTFS3_FS=m
+# CONFIG_NTFS3_64BIT_CLUSTER is not set
+CONFIG_NTFS3_LZX_XPRESS=y
+# CONFIG_NTFS3_FS_POSIX_ACL is not set
+# end of DOS/FAT/EXFAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_PID_ARCH_STATUS=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+# CONFIG_TMPFS_INODE64 is not set
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y
+# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set
+CONFIG_MEMFD_CREATE=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=y
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+# CONFIG_JFFS2_CMODE_PRIORITY is not set
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_CMODE_FAVOURLZO=y
+CONFIG_UBIFS_FS=m
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
+CONFIG_UBIFS_ATIME_SUPPORT=y
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_SECURITY=y
+CONFIG_UBIFS_FS_AUTHENTICATION=y
+CONFIG_CRAMFS=m
+CONFIG_CRAMFS_BLOCKDEV=y
+# CONFIG_CRAMFS_MTD is not set
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_ZSTD is not set
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=m
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
+CONFIG_PSTORE_DEFLATE_COMPRESS=m
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
+# CONFIG_PSTORE_842_COMPRESS is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS is not set
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+# CONFIG_PSTORE_BLK is not set
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EROFS_FS=m
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+# CONFIG_EROFS_FS_ZIP is not set
+CONFIG_VBOXSF_FS=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFSD=m
+# CONFIG_NFSD_V2 is not set
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+# CONFIG_NFSD_BLOCKLAYOUT is not set
+# CONFIG_NFSD_SCSILAYOUT is not set
+# CONFIG_NFSD_FLEXFILELAYOUT is not set
+# CONFIG_NFSD_V4_2_INTER_SSC is not set
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y
+# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CEPH_FS_SECURITY_LABEL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS=m
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+# CONFIG_UNICODE is not set
+CONFIG_IO_WQ=y
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_REQUEST_CACHE=y
+CONFIG_PERSISTENT_KEYRINGS=y
+CONFIG_TRUSTED_KEYS=y
+CONFIG_TRUSTED_KEYS_TPM=y
+CONFIG_ENCRYPTED_KEYS=y
+# CONFIG_USER_DECRYPTED_DATA is not set
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_INFINIBAND is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_SECURITY_PATH=y
+CONFIG_INTEL_TXT=y
+CONFIG_LSM_MMAP_MIN_ADDR=0
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
+CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
+CONFIG_SECURITY_SMACK=y
+# CONFIG_SECURITY_SMACK_BRINGUP is not set
+CONFIG_SECURITY_SMACK_NETFILTER=y
+# CONFIG_SECURITY_SMACK_APPEND_SIGNALS is not set
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+# CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set
+CONFIG_SECURITY_APPARMOR=y
+# CONFIG_SECURITY_APPARMOR_DEBUG is not set
+CONFIG_SECURITY_APPARMOR_INTROSPECT_POLICY=y
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+CONFIG_SECURITY_APPARMOR_EXPORT_BINARY=y
+CONFIG_SECURITY_APPARMOR_PARANOID_LOAD=y
+# CONFIG_SECURITY_LOADPIN is not set
+CONFIG_SECURITY_YAMA=y
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_INTEGRITY=y
+CONFIG_INTEGRITY_SIGNATURE=y
+CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
+CONFIG_INTEGRITY_TRUSTED_KEYRING=y
+CONFIG_INTEGRITY_AUDIT=y
+CONFIG_IMA=y
+CONFIG_IMA_KEXEC=y
+CONFIG_IMA_MEASURE_PCR_IDX=10
+CONFIG_IMA_LSM_RULES=y
+CONFIG_IMA_NG_TEMPLATE=y
+# CONFIG_IMA_SIG_TEMPLATE is not set
+CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
+CONFIG_IMA_DEFAULT_HASH_SHA1=y
+# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set
+# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
+CONFIG_IMA_DEFAULT_HASH="sha1"
+# CONFIG_IMA_WRITE_POLICY is not set
+# CONFIG_IMA_READ_POLICY is not set
+CONFIG_IMA_APPRAISE=y
+# CONFIG_IMA_ARCH_POLICY is not set
+# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
+CONFIG_IMA_APPRAISE_BOOTPARAM=y
+# CONFIG_IMA_APPRAISE_MODSIG is not set
+CONFIG_IMA_TRUSTED_KEYRING=y
+CONFIG_IMA_BLACKLIST_KEYRING=y
+# CONFIG_IMA_LOAD_X509 is not set
+CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y
+CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y
+# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
+CONFIG_IMA_DISABLE_HTABLE=y
+CONFIG_EVM=y
+CONFIG_EVM_ATTR_FSUUID=y
+CONFIG_EVM_EXTRA_SMACK_XATTRS=y
+# CONFIG_EVM_ADD_XATTRS is not set
+# CONFIG_EVM_LOAD_X509 is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
+
+#
+# Kernel hardening options
+#
+CONFIG_GCC_PLUGIN_STRUCTLEAK=y
+
+#
+# Memory initialization
+#
+# CONFIG_INIT_STACK_NONE is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
+CONFIG_GCC_PLUGIN_STACKLEAK=y
+# CONFIG_GCC_PLUGIN_STACKLEAK_VERBOSE is not set
+CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
+# CONFIG_STACKLEAK_METRICS is not set
+CONFIG_STACKLEAK_RUNTIME_DISABLE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
+CONFIG_ZERO_CALL_USED_REGS=y
+# end of Memory initialization
+
+CONFIG_RANDSTRUCT_NONE=y
+# CONFIG_RANDSTRUCT_FULL is not set
+# CONFIG_RANDSTRUCT_PERFORMANCE is not set
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SKCIPHER=y
+CONFIG_CRYPTO_SKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_SIMD=m
+CONFIG_CRYPTO_ENGINE=m
+# end of Crypto core or helper
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+# end of Public-key cryptography
+
+#
+# Block ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_TI=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARIA=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_SM4_GENERIC=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+# end of Block ciphers
+
+#
+# Length-preserving ciphers and modes
+#
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_HCTR2=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XCTR=m
+CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_NHPOLY1305=m
+# end of Length-preserving ciphers and modes
+
+#
+# AEAD (authenticated encryption with associated data) ciphers
+#
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ESSIV=m
+# end of AEAD (authenticated encryption with associated data) ciphers
+
+#
+# Hashes, digests, and MACs
+#
+CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_POLYVAL=m
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_SM3_GENERIC=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_XXHASH=m
+# end of Hashes, digests, and MACs
+
+#
+# CRCs (cyclic redundancy checks)
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRC64_ROCKSOFT=y
+# end of CRCs (cyclic redundancy checks)
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=m
+# end of Compression
+
+#
+# Random number generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+CONFIG_CRYPTO_DRBG_HASH=y
+CONFIG_CRYPTO_DRBG_CTR=y
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_KDF800108_CTR=y
+# end of Random number generation
+
+#
+# Userspace interface
+#
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
+# CONFIG_CRYPTO_STATS is not set
+# end of Userspace interface
+
+CONFIG_CRYPTO_HASH_INFO=y
+
+#
+# Accelerated Cryptographic Algorithms for CPU (x86)
+#
+CONFIG_CRYPTO_CURVE25519_X86=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_DES3_EDE_X86_64=m
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
+CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64=m
+CONFIG_CRYPTO_CHACHA20_X86_64=m
+CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
+CONFIG_CRYPTO_NHPOLY1305_SSE2=m
+CONFIG_CRYPTO_NHPOLY1305_AVX2=m
+CONFIG_CRYPTO_BLAKE2S_X86=y
+CONFIG_CRYPTO_POLYVAL_CLMUL_NI=m
+CONFIG_CRYPTO_POLY1305_X86_64=m
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
+CONFIG_CRYPTO_SM3_AVX_X86_64=m
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+CONFIG_CRYPTO_CRC32C_INTEL=y
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+# end of Accelerated Cryptographic Algorithms for CPU (x86)
+
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=y
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_SP_CCP=y
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+CONFIG_CRYPTO_DEV_SP_PSP=y
+# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
+CONFIG_CRYPTO_DEV_NITROX=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+CONFIG_CRYPTO_DEV_QAT=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_C3XXX=m
+CONFIG_CRYPTO_DEV_QAT_C62X=m
+CONFIG_CRYPTO_DEV_QAT_4XXX=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
+CONFIG_CRYPTO_DEV_QAT_C62XVF=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
+# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+# CONFIG_FIPS_SIGNATURE_SELFTEST is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_LINEAR_RANGES=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_PRIME_NUMBERS=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_UTILS=y
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_GF128MUL=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA1=y
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
+CONFIG_CRC_CCITT=y
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC64_ROCKSOFT=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=y
+# CONFIG_CRC4 is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_842_COMPRESS=m
+CONFIG_842_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMMON=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_MICROLZMA=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_TEST=m
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_ZSTD=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_DMA_OPS=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
+CONFIG_SWIOTLB=y
+CONFIG_DMA_CMA=y
+CONFIG_DMA_PERNUMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=0
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_CHECK_SIGNATURE=y
+# CONFIG_FORCE_NR_CPUS is not set
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_SIGNATURE=y
+CONFIG_DIMLIB=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+CONFIG_FONT_6x10=y
+# CONFIG_FONT_10x18 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+CONFIG_FONT_TER16x32=y
+CONFIG_FONT_6x8=y
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_MEMREGION=y
+CONFIG_ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_HAS_COPY_MC=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_STACKDEPOT=y
+CONFIG_SBITMAP=y
+CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
+# end of Library routines
+
+CONFIG_PLDMFW=y
+CONFIG_ASN1_ENCODER=y
+CONFIG_POLYNOMIAL=m
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+CONFIG_STACKTRACE_BUILD_ID=y
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
+CONFIG_SYMBOLIC_ERRNAME=y
+CONFIG_DEBUG_BUGVERBOSE=y
+# end of printk and dmesg options
+
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_AS_HAS_NON_CONST_LEB128=y
+CONFIG_DEBUG_INFO_NONE=y
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF5 is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_READABLE_ASM is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
+CONFIG_FRAME_POINTER=y
+CONFIG_OBJTOOL=y
+CONFIG_STACK_VALIDATION=y
+# CONFIG_VMLINUX_MAP is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+#
+# Generic Kernel Debugging Instruments
+#
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_KGDB=y
+CONFIG_KGDB_HONOUR_BLOCKLIST=y
+CONFIG_KGDB_SERIAL_CONSOLE=y
+# CONFIG_KGDB_TESTS is not set
+CONFIG_KGDB_LOW_LEVEL_TRAP=y
+CONFIG_KGDB_KDB=y
+CONFIG_KDB_DEFAULT_ENABLE=0x1
+CONFIG_KDB_KEYBOARD=y
+CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+CONFIG_ARCH_HAS_EARLY_DEBUG=y
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+CONFIG_HAVE_ARCH_KCSAN=y
+CONFIG_HAVE_KCSAN_COMPILER=y
+# CONFIG_KCSAN is not set
+# end of Generic Kernel Debugging Instruments
+
+#
+# Networking Debugging
+#
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
+# CONFIG_DEBUG_NET is not set
+# end of Networking Debugging
+
+#
+# Memory Debugging
+#
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_PAGE_OWNER is not set
+# CONFIG_PAGE_TABLE_CHECK is not set
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_DEBUG_PAGE_REF is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
+CONFIG_ARCH_HAS_DEBUG_WX=y
+# CONFIG_DEBUG_WX is not set
+CONFIG_GENERIC_PTDUMP=y
+# CONFIG_PTDUMP_DEBUGFS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_PER_VMA_LOCK_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SHRINKER_DEBUG is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_SCHED_STACK_END_CHECK=y
+CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VM_PGTABLE is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
+# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set
+CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
+# CONFIG_KASAN is not set
+CONFIG_HAVE_ARCH_KFENCE=y
+CONFIG_KFENCE=y
+CONFIG_KFENCE_SAMPLE_INTERVAL=0
+CONFIG_KFENCE_NUM_OBJECTS=255
+# CONFIG_KFENCE_DEFERRABLE is not set
+# CONFIG_KFENCE_STATIC_KEYS is not set
+CONFIG_KFENCE_STRESS_TEST_FAULTS=0
+CONFIG_HAVE_ARCH_KMSAN=y
+# end of Memory Debugging
+
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Oops, Lockups and Hangs
+#
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+# CONFIG_WQ_WATCHDOG is not set
+# CONFIG_TEST_LOCKUP is not set
+# end of Debug Oops, Lockups and Hangs
+
+#
+# Scheduler Debugging
+#
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+# end of Scheduler Debugging
+
+# CONFIG_DEBUG_TIMEKEEPING is not set
+# CONFIG_DEBUG_PREEMPT is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_LOCK_TORTURE_TEST=m
+CONFIG_WW_MUTEX_SELFTEST=m
+# CONFIG_SCF_TORTURE_TEST is not set
+# CONFIG_CSD_LOCK_WAIT_DEBUG is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+# CONFIG_NMI_CHECK_CPU is not set
+# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+
+#
+# Debug kernel data structures
+#
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# CONFIG_DEBUG_MAPLE_TREE is not set
+# end of Debug kernel data structures
+
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+CONFIG_TORTURE_TEST=m
+# CONFIG_RCU_SCALE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_REF_SCALE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
+# CONFIG_RCU_CPU_STALL_CPUTIME is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_DEBUG_CGROUP_REF is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_RETHOOK=y
+CONFIG_RETHOOK=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_NO_PATCHABLE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
+CONFIG_HAVE_OBJTOOL_MCOUNT=y
+CONFIG_HAVE_OBJTOOL_NOP_MCOUNT=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
+CONFIG_BUILDTIME_MCOUNT_SORT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_BOOTTIME_TRACING is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_FPROBE=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_STACK_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
+CONFIG_SCHED_TRACER=y
+# CONFIG_HWLAT_TRACER is not set
+# CONFIG_OSNOISE_TRACER is not set
+# CONFIG_TIMERLAT_TRACER is not set
+CONFIG_MMIOTRACE=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+# CONFIG_BPF_KPROBE_OVERRIDE is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
+CONFIG_SYNTH_EVENTS=y
+# CONFIG_USER_EVENTS is not set
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_TRACE_EVENT_INJECT is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+# CONFIG_MMIOTRACE_TEST is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_SYNTH_EVENT_GEN_TEST is not set
+# CONFIG_KPROBE_EVENT_GEN_TEST is not set
+# CONFIG_RV is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
+CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+
+#
+# x86 Debugging
+#
+CONFIG_EARLY_PRINTK_USB=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_EARLY_PRINTK=y
+CONFIG_EARLY_PRINTK_DBGP=y
+# CONFIG_EARLY_PRINTK_USB_XDBC is not set
+# CONFIG_EFI_PGT_DUMP is not set
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_DEBUG is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+# CONFIG_IO_DELAY_0X80 is not set
+CONFIG_IO_DELAY_0XED=y
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_DEBUG_ENTRY is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+CONFIG_X86_DEBUG_FPU=y
+CONFIG_PUNIT_ATOM_DEBUG=m
+# CONFIG_UNWINDER_ORC is not set
+CONFIG_UNWINDER_FRAME_POINTER=y
+# end of x86 Debugging
+
+#
+# Kernel Testing and Coverage
+#
+# CONFIG_KUNIT is not set
+CONFIG_NOTIFIER_ERROR_INJECTION=m
+CONFIG_PM_NOTIFIER_ERROR_INJECT=m
+CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_TEST_DHRY is not set
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_MIN_HEAP is not set
+# CONFIG_TEST_DIV64 is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_TEST_REF_TRACKER is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+CONFIG_INTERVAL_TREE_TEST=m
+CONFIG_PERCPU_TEST=m
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+CONFIG_TEST_HEXDUMP=m
+# CONFIG_STRING_SELFTEST is not set
+CONFIG_TEST_STRING_HELPERS=m
+CONFIG_TEST_KSTRTOX=m
+CONFIG_TEST_PRINTF=m
+CONFIG_TEST_SCANF=m
+CONFIG_TEST_BITMAP=m
+CONFIG_TEST_UUID=m
+CONFIG_TEST_XARRAY=m
+# CONFIG_TEST_MAPLE_TREE is not set
+CONFIG_TEST_RHASHTABLE=m
+CONFIG_TEST_IDA=m
+CONFIG_TEST_PARMAN=m
+CONFIG_TEST_LKM=m
+CONFIG_TEST_BITOPS=m
+CONFIG_TEST_VMALLOC=m
+CONFIG_TEST_USER_COPY=m
+CONFIG_TEST_BPF=m
+CONFIG_TEST_BLACKHOLE_DEV=m
+CONFIG_FIND_BIT_BENCHMARK=m
+CONFIG_TEST_FIRMWARE=m
+# CONFIG_TEST_SYSCTL is not set
+CONFIG_TEST_UDELAY=m
+CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_TEST_DYNAMIC_DEBUG is not set
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_LIVEPATCH is not set
+CONFIG_TEST_OBJAGG=m
+# CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_FREE_PAGES is not set
+# CONFIG_TEST_FPU is not set
+# CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set
+CONFIG_ARCH_USE_MEMTEST=y
+CONFIG_MEMTEST=y
+# CONFIG_HYPERV_TESTING is not set
+# end of Kernel Testing and Coverage
+
+#
+# Rust hacking
+#
+# end of Rust hacking
+# end of Kernel hacking
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f548b7307d..e099c5cc83 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -486,6 +486,21 @@ 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.3")
+(define-public linux-libre-6.4-gnu-revision "gnu")
+(define deblob-scripts-6.4
+  (linux-libre-deblob-scripts
+   linux-libre-6.4-version
+   linux-libre-6.4-gnu-revision
+   (base32 "1hfircard99kmf81416xnln0chs6hskpjqz0p55ic8alm4rdlljs")
+   (base32 "1566506bmci15i80y0l0s93dgpgima0lqfmkg5ql7gd671aawkra")))
+(define-public linux-libre-6.4-pristine-source
+  (let ((version linux-libre-6.4-version)
+        (hash (base32 "18c8ikghvlr6h9jajy11dldck4h57wl301j14rxg7xhd6qlysd3i")))
+   (make-linux-libre-source version
+                            (%upstream-linux-source version hash)
+                            deblob-scripts-6.4)))
+
 (define-public linux-libre-6.3-version "6.3.13")
 (define-public linux-libre-6.3-gnu-revision "gnu")
 (define deblob-scripts-6.3
@@ -622,6 +637,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
     (patches (append (origin-patches source)
                      patches))))
 
+(define-public linux-libre-6.4-source
+  (source-with-patches linux-libre-6.4-pristine-source
+                       (list %boot-logo-patch
+                             %linux-libre-arm-export-__sync_icache_dcache-patch)))
+
 (define-public linux-libre-6.3-source
   (source-with-patches linux-libre-6.3-pristine-source
                        (list %boot-logo-patch
@@ -738,6 +758,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
     (description "Headers of the Linux-Libre kernel.")
     (license license:gpl2)))
 
+(define-public linux-libre-headers-6.4
+  (make-linux-libre-headers* linux-libre-6.4-version
+                             linux-libre-6.4-gnu-revision
+                             linux-libre-6.4-source))
+
 (define-public linux-libre-headers-6.3
   (make-linux-libre-headers* linux-libre-6.3-version
                              linux-libre-6.3-gnu-revision
@@ -1081,6 +1106,14 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
 ;;; Generic kernel packages.
 ;;;
 
+(define-public linux-libre-6.4
+  (make-linux-libre* linux-libre-6.4-version
+                     linux-libre-6.4-gnu-revision
+                     linux-libre-6.4-source
+                     '("x86_64-linux" "i686-linux" "armhf-linux"
+                       "aarch64-linux" "powerpc64le-linux" "riscv64-linux")
+                     #:configuration-file kernel-config))
+
 (define-public linux-libre-6.3
   (make-linux-libre* linux-libre-6.3-version
                      linux-libre-6.3-gnu-revision
-- 
cgit 1.4.1


From 67790e7f2f8f5cd80c9d00b358a58a360ec90cdd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:04 +0200
Subject: guix-install.sh: Unconditionally install gnu-store.mount.

* etc/guix-install.sh (sys_enable_guix_daemon):
Remove obsolete conditional.
---
 etc/guix-install.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 1949f00ed4..943cbdb480 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -437,13 +437,11 @@ sys_enable_guix_daemon()
             { # systemd .mount units must be named after the target directory.
               # Here we assume a hard-coded name of /gnu/store.
               # XXX Work around <https://issues.guix.gnu.org/41356> until next release.
-              if [ -f ~root/.config/guix/current/lib/systemd/system/gnu-store.mount ]; then
-                  cp ~root/.config/guix/current/lib/systemd/system/gnu-store.mount \
-                     /etc/systemd/system/;
-                  chmod 664 /etc/systemd/system/gnu-store.mount;
-                  systemctl daemon-reload &&
-                      systemctl enable gnu-store.mount;
-              fi
+              cp ~root/.config/guix/current/lib/systemd/system/gnu-store.mount \
+                 /etc/systemd/system/;
+              chmod 664 /etc/systemd/system/gnu-store.mount;
+              systemctl daemon-reload &&
+                  systemctl enable gnu-store.mount;
 
               cp ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \
                  /etc/systemd/system/;
-- 
cgit 1.4.1


From 024f78aba21f1b97420072e2d3b060bd282d2230 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: guix-install.sh: Don't patch guix-daemon.service.

* etc/guix-install.sh (sys_enable_guix_daemon):
Remove obsolete sed invocations.
---
 etc/guix-install.sh | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 943cbdb480..74f7688cab 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -447,16 +447,6 @@ sys_enable_guix_daemon()
                  /etc/systemd/system/;
               chmod 664 /etc/systemd/system/guix-daemon.service;
 
-              # Work around <https://bugs.gnu.org/36074>, present in 1.0.1.
-              sed -i /etc/systemd/system/guix-daemon.service \
-                  -e "s/GUIX_LOCPATH='/'GUIX_LOCPATH=/";
-
-              # Work around <https://bugs.gnu.org/35671>, present in 1.0.1.
-              if ! grep en_US /etc/systemd/system/guix-daemon.service >/dev/null;
-              then sed -i /etc/systemd/system/guix-daemon.service \
-                       -e 's/^Environment=\(.*\)$/Environment=\1 LC_ALL=en_US.UTF-8';
-              fi;
-
               configure_substitute_discovery \
                   /etc/systemd/system/guix-daemon.service
 
-- 
cgit 1.4.1


From 93243a6ca4e6b8f6b6c1aa9ee097bca8432a2b35 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: guix-install.sh: Remove any old systemd units first.

Don't clobber /dev/null permissions if units are masked.

* etc/guix-install.sh (sys_enable_guix_daemon): Factor out unit
installation.  Unconditionally remove any old units.  Install and enable
gnu-store.mount after guix-daemon.service.
---
 etc/guix-install.sh | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 74f7688cab..fc14471f1a 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -434,24 +434,27 @@ sys_enable_guix_daemon()
                 _msg "${PAS}enabled Guix daemon via upstart"
             ;;
         systemd)
-            { # systemd .mount units must be named after the target directory.
-              # Here we assume a hard-coded name of /gnu/store.
-              # XXX Work around <https://issues.guix.gnu.org/41356> until next release.
-              cp ~root/.config/guix/current/lib/systemd/system/gnu-store.mount \
-                 /etc/systemd/system/;
-              chmod 664 /etc/systemd/system/gnu-store.mount;
-              systemctl daemon-reload &&
-                  systemctl enable gnu-store.mount;
-
-              cp ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \
-                 /etc/systemd/system/;
-              chmod 664 /etc/systemd/system/guix-daemon.service;
+            { install_unit()
+              {
+                  local dest="/etc/systemd/system/$1"
+                  rm -f "$dest"
+                  cp ~root/.config/guix/current/lib/systemd/system/"$1" "$dest"
+                  chmod 664 "$dest"
+                  systemctl daemon-reload
+                  systemctl enable "$1"
+              }
+
+              install_unit guix-daemon.service
 
               configure_substitute_discovery \
                   /etc/systemd/system/guix-daemon.service
 
+              # Install after guix-daemon.service to avoid a harmless warning.
+              # systemd .mount units must be named after the target directory.
+              # Here we assume a hard-coded name of /gnu/store.
+              install_unit gnu-store.mount
+
               systemctl daemon-reload &&
-                  systemctl enable guix-daemon &&
                   systemctl start  guix-daemon; } &&
                 _msg "${PAS}enabled Guix daemon via systemd"
             ;;
-- 
cgit 1.4.1


From 6e0c8f097bf3dea498f7e443c89cb2228d3b38f5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: xtl: Update to 0.7.5.

* gnu/packages/cpp.scm (xtl): Update to 0.7.5.
---
 gnu/packages/cpp.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 7d3db8ea9b..0ea80ea237 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -677,7 +677,7 @@ intuitive syntax and trivial integration.")
 (define-public xtl
   (package
     (name "xtl")
-    (version "0.7.4")
+    (version "0.7.5")
     (source (origin
               (method git-fetch)
               (uri
@@ -686,7 +686,7 @@ intuitive syntax and trivial integration.")
                 (commit version)))
               (sha256
                (base32
-                "134pgvmf9cx5dxs0m0m3qhp3m3r1gl86ic3xax21zc4sdj8sdq46"))
+                "1llfy6pkzqx2va74h9xafjylyvw6839a843mqc05n6x6wll5bkam"))
               (file-name (git-file-name name version))))
     (native-inputs
      (list doctest googletest nlohmann-json))
-- 
cgit 1.4.1


From ef64cc509ed311cc7cab30daa8fbfee7495180bc Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:03 +0200
Subject: gnu: xtl: Use G-expressions.

* gnu/packages/cpp.scm (xtl)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/cpp.scm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 0ea80ea237..ec1f4cd325 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -691,14 +691,15 @@ intuitive syntax and trivial integration.")
     (native-inputs
      (list doctest googletest nlohmann-json))
     (arguments
-     '(#:configure-flags
-       '("-DBUILD_TESTS=ON")
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* _
-             (with-directory-excursion "test"
-               (invoke "./test_xtl")))))))
+     (list
+      #:configure-flags
+      #~(list "-DBUILD_TESTS=ON")
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda _
+              (with-directory-excursion "test"
+                (invoke "./test_xtl")))))))
     (home-page "https://github.com/QuantStack/xtl")
     (build-system cmake-build-system)
     (synopsis "C++ template library providing some basic tools")
-- 
cgit 1.4.1


From bbce7b4ab888d892feaf35c9004c3a1f06db4714 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: libxcrypt: Update to 4.4.36.

* gnu/packages/crypto.scm (libxcrypt): Update to 4.4.36.
---
 gnu/packages/crypto.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index aa4aab372b..cbbc705755 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -1675,7 +1675,7 @@ checksum tool based on the BLAKE3 cryptographic hash function.")
 (define-public libxcrypt
   (package
     (name "libxcrypt")
-    (version "4.4.33")
+    (version "4.4.36")
     (source
      (origin
        (method git-fetch)
@@ -1684,7 +1684,7 @@ checksum tool based on the BLAKE3 cryptographic hash function.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "174k5cj95617akg6pplv371mpd35j9q8il245f2zcpq76yz4qydl"))))
+        (base32 "1yhpjjjv38y14nrj15bkndq824v42plndgi3k8mmc04grj1fbnjf"))))
     (build-system gnu-build-system)
     (native-inputs
      (list autoconf
-- 
cgit 1.4.1


From 869d9bcf0779645819794a954f06ce951c143aaf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: signify: Update to 31.

* gnu/packages/crypto.scm (signify): Update to 31.
---
 gnu/packages/crypto.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index cbbc705755..9fa82c8a6a 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -216,7 +216,7 @@ communication, encryption, decryption, signatures, etc.")
 (define-public signify
   (package
     (name "signify")
-    (version "30")
+    (version "31")
     (home-page "https://github.com/aperezdc/signify")
     (source (origin
               (method url-fetch)
@@ -224,7 +224,7 @@ communication, encryption, decryption, signatures, etc.")
                                   "/download/v" version "/signify-" version ".tar.xz"))
               (sha256
                (base32
-                "11l67j04gyxnlw6zrzsygqs5cgsc1sww1rh0apl05yay131hd17n"))))
+                "0x1bipfphnyvf2kl7n9q4gawaglma79368vb8whama6lxsggsm8i"))))
     (build-system gnu-build-system)
     ;; TODO Build with libwaive (described in README.md), to implement something
     ;; like OpenBSD's pledge().
-- 
cgit 1.4.1


From 920d12624ff1933c08dd6059a67fd07380a0bb4f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: signify: Use G-expressions.

* gnu/packages/crypto.scm (signify)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/crypto.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 9fa82c8a6a..ea8d201b5d 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -229,12 +229,13 @@ communication, encryption, decryption, signatures, etc.")
     ;; TODO Build with libwaive (described in README.md), to implement something
     ;; like OpenBSD's pledge().
     (arguments
-     `(#:make-flags
-       (list ,(string-append "CC=" (cc-for-target))
-             (string-append "PREFIX=" (assoc-ref %outputs "out")))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure))))
+     (list
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              (string-append "PREFIX=" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure))))
     (native-inputs
      (list pkg-config))
     (inputs
-- 
cgit 1.4.1


From ab4f8669026ad4d9dcf377133c2368e16488d106 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: Remove top-level (guix build utils) import.

* gnu/packages/game-development.scm: Don't import (guix build utils) here.
---
 gnu/packages/game-development.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index f97c126441..5668672f4d 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -55,7 +55,6 @@
   #:use-module (guix git-download)
   #:use-module (guix svn-download)
   #:use-module (guix utils)
-  #:use-module (guix build utils)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
-- 
cgit 1.4.1


From 86aa9e23d82fbcb79abc9f709b0c75881ba40201 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: stoken: Use HTTPS home page.

* gnu/packages/crypto.scm (stoken)[home-page]: Use HTTPS.
---
 gnu/packages/crypto.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index ea8d201b5d..91acedbc97 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -1211,7 +1211,7 @@ Features:
      (list pkg-config))
     (inputs
      (list nettle libxml2))
-    (home-page "http://stoken.sf.net")
+    (home-page "https://stoken.sf.net")
     (synopsis "Software Token for cryptographic authentication")
     (description
      "@code{stoken} is a token code generator compatible with RSA SecurID
-- 
cgit 1.4.1


From aa576321f2b3bd74f0c11ff737112ce6a8337605 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:04 +0200
Subject: gnu: oath-toolkit: Update to 2.6.9.

* gnu/packages/authentication.scm (oath-toolkit): Update to 2.6.9.
[source]: Remove patch.
* gnu/packages/patches/oath-toolkit-xmlsec-compat.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/authentication.scm                    |  5 +-
 .../patches/oath-toolkit-xmlsec-compat.patch       | 79 ----------------------
 3 files changed, 2 insertions(+), 83 deletions(-)
 delete mode 100644 gnu/packages/patches/oath-toolkit-xmlsec-compat.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 06a376a99a..b460d3bc91 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1644,7 +1644,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/nvi-dbpagesize-binpower.patch		\
   %D%/packages/patches/nvi-db4.patch				\
   %D%/packages/patches/nyacc-binary-literals.patch		\
-  %D%/packages/patches/oath-toolkit-xmlsec-compat.patch		\
   %D%/packages/patches/obs-modules-location.patch		\
   %D%/packages/patches/ocaml-dose3-add-unix-dependency.patch	\
   %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch	\
diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm
index de1769d65f..f89458cb8c 100644
--- a/gnu/packages/authentication.scm
+++ b/gnu/packages/authentication.scm
@@ -62,15 +62,14 @@
 (define-public oath-toolkit
   (package
     (name "oath-toolkit")
-    (version "2.6.7")
+    (version "2.6.9")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://download.savannah.nongnu.org/releases/"
                            name "/" name "-" version ".tar.gz"))
-       (patches (search-patches "oath-toolkit-xmlsec-compat.patch"))
        (sha256
-        (base32 "1aa620k05lsw3l3slkp2mzma40q3p9wginspn9zk8digiz7dzv9n"))))
+        (base32 "11g9r1avl3d2nnkglk0g7d6z6gs5padk75xqzvbxp9pir0qwhfik"))))
     (build-system gnu-build-system)
     (arguments
      ;; TODO ‘--enable-pskc’ causes xmlsec-related test suite failures.
diff --git a/gnu/packages/patches/oath-toolkit-xmlsec-compat.patch b/gnu/packages/patches/oath-toolkit-xmlsec-compat.patch
deleted file mode 100644
index 18589366a9..0000000000
--- a/gnu/packages/patches/oath-toolkit-xmlsec-compat.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Adjust tests for compatibility with newer xmlsec.
-
-Taken from upstream:
-
-  https://gitlab.com/oath-toolkit/oath-toolkit/-/commit/0ae59b9c72f69ee21044e736e292b73051df3272
-
-diff --git a/libpskc/examples/pskc-hotp-signed.xml b/libpskc/examples/pskc-hotp-signed.xml
-index 359dd4723cf2b5ae1ca53d793cc6900a15bd4969..396e0829ff245b3ad6953cc3523d77568c8a18f4 100644
---- a/libpskc/examples/pskc-hotp-signed.xml
-+++ b/libpskc/examples/pskc-hotp-signed.xml
-@@ -38,7 +38,8 @@ rIXbwqKhnBP943U4Ch31oEbZtbo+XRbiq11wv6dLNsi76TNGDqsjTKgEcSIYI6Vd
- rMxnil6ChoIBvSSPGHhJuj1bW1EPW92JtIa6byrAj1m4RwSviQy2i65YoIdtrhRt
- CWekj2zuL/0szv5rZMCCvxioOCA8znqELEPMfs0Aa/cACD2MZcC4gGXehNCvzYJr
- TmB6lFpxP6f0g6eO7PVcqYN9NCwECxb5Cvx2j2uNlereY35/9oPR6YJx+V7sL+DB
--n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4</X509Certificate>
-+n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4
-+</X509Certificate>
- </X509Data>
- </KeyInfo>
- </Signature></KeyContainer>
-diff --git a/pskctool/tests/pskc-all-signed.xml b/pskctool/tests/pskc-all-signed.xml
-index 39cf8af5bb00e34fa5e1acb97cea59ff742758f4..5d44e72d928ccf1f46975e6ccca58297e235be95 100644
---- a/pskctool/tests/pskc-all-signed.xml
-+++ b/pskctool/tests/pskc-all-signed.xml
-@@ -38,7 +38,8 @@ rIXbwqKhnBP943U4Ch31oEbZtbo+XRbiq11wv6dLNsi76TNGDqsjTKgEcSIYI6Vd
- rMxnil6ChoIBvSSPGHhJuj1bW1EPW92JtIa6byrAj1m4RwSviQy2i65YoIdtrhRt
- CWekj2zuL/0szv5rZMCCvxioOCA8znqELEPMfs0Aa/cACD2MZcC4gGXehNCvzYJr
- TmB6lFpxP6f0g6eO7PVcqYN9NCwECxb5Cvx2j2uNlereY35/9oPR6YJx+V7sL+DB
--n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4</X509Certificate>
-+n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4
-+</X509Certificate>
- </X509Data>
- </KeyInfo>
- </Signature></KeyContainer>
-diff --git a/pskctool/tests/tst_libexamples.sh b/pskctool/tests/tst_libexamples.sh
-index 0e8e558b4cbefbac9f2ca301fddb2ac4b8cfbdfa..5cb52ce44f40a78ab886ff12d2eac64e5b5c4c7e 100755
---- a/pskctool/tests/tst_libexamples.sh
-+++ b/pskctool/tests/tst_libexamples.sh
-@@ -1,7 +1,7 @@
- #!/bin/sh
- 
- # tst_libexamples.sh - keep pskctool output in GTK-DOC manual up to date
--# Copyright (C) 2012-2021 Simon Josefsson
-+# Copyright (C) 2012-2022 Simon Josefsson
- 
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -45,7 +45,8 @@ fi
- 
- $PSKCTOOL --sign --sign-key $srcdir/pskc-ee-key.pem \
-     --sign-crt $srcdir/pskc-ee-crt.pem \
--    $srcdir/../../libpskc/examples/pskc-hotp.xml > foo
-+    $srcdir/../../libpskc/examples/pskc-hotp.xml \
-+    | sed 's,4</X509Cert,4\n</X509Cert,' > foo
- if ! diff -ur $srcdir/../../libpskc/examples/pskc-hotp-signed.xml foo; then
-     echo "FAIL: pskctool --sign output change, commit updated file."
-     exit 1
-diff --git a/pskctool/tests/tst_sign.sh b/pskctool/tests/tst_sign.sh
-index b62757336061394746d60f706369127fe1db466d..2d452d69f2e6595ff85a34540939801324dbdfea 100755
---- a/pskctool/tests/tst_sign.sh
-+++ b/pskctool/tests/tst_sign.sh
-@@ -1,7 +1,7 @@
- #!/bin/sh
- 
- # tst_sign.sh - test that pskctool can sign and verify
--# Copyright (C) 2012-2021 Simon Josefsson
-+# Copyright (C) 2012-2022 Simon Josefsson
- 
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -32,7 +32,7 @@ $PSKCTOOL --info --strict --debug $pskc_all > tmp-pre-human.txt
- $PSKCTOOL --sign \
-     --sign-key $pskc_ee_key \
-     --sign-crt $pskc_ee_crt \
--    $pskc_all > tmp-signed.xml
-+    $pskc_all | sed 's,4</X509Cert,4\n</X509Cert,' > tmp-signed.xml
- 
- diff -ur $pskc_all_signed tmp-signed.xml
- 
-- 
cgit 1.4.1


From 8b96a20ff3e084bf1e5f4d3db887ca24f218b605 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:05 +0200
Subject: gnu: oath-toolkit: Mark up description.

* gnu/packages/authentication.scm (oath-toolkit)[synopsis, description]:
Use @acronym{}.
---
 gnu/packages/authentication.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm
index f89458cb8c..7c7fb8e861 100644
--- a/gnu/packages/authentication.scm
+++ b/gnu/packages/authentication.scm
@@ -92,16 +92,16 @@
     (inputs
      (list linux-pam openssl xmlsec-openssl))
     (home-page "https://www.nongnu.org/oath-toolkit/")
-    (synopsis "One-time password (OTP) components")
+    (synopsis "@acronym{OTP, one-time password} components")
     (description
-     "The @dfn{OATH} (Open AuTHentication) Toolkit provides various components
-for building one-time password (@dfn{OTP}) authentication systems:
+     "The @acronym{OATH, Open AuTHentication} Toolkit provides various
+components for building @acronym{OTP, One-Time Password} authentication systems:
 
 @itemize
 @item @command{oathtool}, a command-line tool for generating & validating OTPs.
 @item @code{liboath}, a C library for OATH handling.
 @item @command{pskctool}, a command-line tool for manipulating secret key
-files in the Portable Symmetric Key Container (@dfn{PSKC}) format
+files in the @acronym{PSKC, Portable Symmetric Key Container} format
 described in RFC6030.
 @item @code{libpskc}, a shared and static C library for PSKC handling.
 @item @code{pam_oath}, a PAM module for pluggable login authentication.
@@ -110,8 +110,7 @@ described in RFC6030.
 Supported technologies include the event-based @acronym{HOTP, Hash-based Message
 Authentication Code One-Time Password} algorithm (RFC4226), the time-based
 @acronym{TOTP, Time-based One-Time Password} algorithm (RFC6238), and
-@acronym{PSKC, Portable Symmetric Key Container} (RFC6030) to manage secret key
-data.")
+PSKC (RFC6030) to manage secret key data.")
     (license (list license:lgpl2.1+     ; the libraries (liboath/ & libpskc/)
                    license:gpl3+))))    ; the tools (everything else)
 
-- 
cgit 1.4.1


From e286fe4a681c83efffbcd5eb716516882048eff4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: snapraid: Update to 12.2.

* gnu/packages/backup.scm (snapraid): Update to 12.2.
---
 gnu/packages/backup.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 54386fc538..625956e3f4 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -391,7 +391,7 @@ list and implement the backup strategy.")
 (define-public snapraid
   (package
     (name "snapraid")
-    (version "12.0")
+    (version "12.2")
     (source
      (origin
        (method git-fetch)
@@ -400,7 +400,7 @@ list and implement the backup strategy.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0k8pynafkx8bhnqnjhc3jsds5p40sflz4drm88i6dg6ifv35mhh9"))))
+        (base32 "0xgvyhyyl2v6azxwzqbpgyln4r2dw34xa8z09116vpkgdgivh36z"))))
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags
-- 
cgit 1.4.1


From d00be5725496ca1acfd4f44266c906bd8b32a293 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:00 +0200
Subject: gnu: rdiff-backup: Update to 2.2.5.

* gnu/packages/backup.scm (rdiff-backup): Update to 2.2.5.
---
 gnu/packages/backup.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 625956e3f4..7381acd4d8 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -480,14 +480,14 @@ errors.")
 (define-public rdiff-backup
   (package
     (name "rdiff-backup")
-    (version "2.2.4")
+    (version "2.2.5")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/rdiff-backup/rdiff-backup/releases/"
                            "download/v" version "/rdiff-backup-" version ".tar.gz"))
        (sha256
-        (base32 "1xfvy1xql8zl7rprnaxwya8bp9g7rg8v5pwhr93svhj2594m30cl"))))
+        (base32 "13m0kq9y6rzgaq0zlzh7qhi789qmbzp3dnc7y57fmhsfg1mq5ql6"))))
     (build-system python-build-system)
     (native-inputs
      (list python-setuptools-scm))
-- 
cgit 1.4.1


From df6ea7416f085cc95b6f9d6ae9c06560cbe74a42 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: qpwgraph: Update to 0.4.5.

* gnu/packages/audio.scm (qpwgraph): Update to 0.4.5.
---
 gnu/packages/audio.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 447b0ea78c..1156be5f65 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -6236,7 +6236,7 @@ and DSD streams.")
 (define-public qpwgraph
   (package
     (name "qpwgraph")
-    (version "0.4.4")
+    (version "0.4.5")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -6245,7 +6245,7 @@ and DSD streams.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "05j98y8j3f0dybaal6qawq9nsrvr1hylsnig4yk6si16mhb32y7l"))))
+                "06pgkma0i9dbir74cfhgnnkqjcq8z496by4lk1whqcj7j9ldbi2l"))))
     (build-system cmake-build-system)
     (arguments (list #:tests? #f)) ;; no tests
     (inputs (list alsa-lib
-- 
cgit 1.4.1


From d08bd19de0b06d5da7f2c06fb733e245b566dd54 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: wimlib: Update to 1.14.1.

* gnu/packages/backup.scm (wimlib): Update to 1.14.1.
[inputs]: Upgrade fuse to fuse-3.
---
 gnu/packages/backup.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 7381acd4d8..c8a1b388de 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -768,19 +768,19 @@ backups on untrusted computers.")
 (define-public wimlib
   (package
     (name "wimlib")
-    (version "1.13.5")
+    (version "1.14.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://wimlib.net/downloads/"
                                   "wimlib-" version ".tar.gz"))
               (sha256
                (base32
-                "08z3xxm5hq1n4wmyhgz14p1cv0w2lx610vn8nhfwpds4n7lwkz1j"))))
+                "0hkgcf3v3hmwck02s0623brdx1ijvk1la0h5mgly1whnaqviajj9"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config))
     (inputs
-     (list fuse libxml2 ntfs-3g openssl))
+     (list fuse-3 libxml2 ntfs-3g openssl))
     (arguments
      `(#:configure-flags
        (list "--disable-static"
-- 
cgit 1.4.1


From cb46336c40d695b87218b2136d670eacd7a519fc Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
Date: Sun, 9 Jul 2023 15:58:51 +0200
Subject: gnu: Add python-ovh.

* gnu/packages/python-web.scm (python-ovh): New variable.
---
 gnu/packages/python-web.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 61a21f9c94..6f855a503b 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -778,6 +778,34 @@ Model} (SAM) templates into AWS CloudFormation templates.")
 emit information from within their applications to the AWS X-Ray service.")
     (license license:asl2.0)))
 
+(define-public python-ovh
+  (package
+    (name "python-ovh")
+    (version "1.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "ovh" version))
+              (sha256
+               (base32
+                "0ygniv12lixh9rvnjcd01gzbzk2b5xwcg2a59b7964a77dd9p3qh"))))
+    (build-system pyproject-build-system)
+    (arguments (list #:tests? #f))      ; XXX: tests require networking
+    (propagated-inputs (list python-requests))
+    (native-inputs (list python-black
+                         python-coverage
+                         python-flake8
+                         python-isort
+                         python-pytest
+                         python-pytest-cov
+                         python-setuptools
+                         python-sphinx
+                         python-wheel))
+    (home-page "https://api.ovh.com")
+    (synopsis "Interact with OVHcloud APIs")
+    (description "This package provides the official module to perform HTTP requests
+to the OVHcloud APIs.")
+    (license license:bsd-3)))
+
 (define-public python-cbor2
   (package
     (name "python-cbor2")
-- 
cgit 1.4.1


From c8a6ec79635f9a97a5346aa7cb85db1063de8980 Mon Sep 17 00:00:00 2001
From: Brian Cully <bjc@spork.org>
Date: Wed, 5 Jul 2023 08:57:03 -0400
Subject: gnu: Add emacs-popwin.

 * gnu/packages/emacs-xyz.scm (emacs-popwin): new variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 480096fb50..7c50035eff 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13630,6 +13630,34 @@ automatically when Git, Subversion or Mercurial are used.  It also provides
 functions to assist in reviewing changes on files.")
     (license license:gpl3+)))
 
+(define-public emacs-popwin
+  (package
+    (name "emacs-popwin")
+    (version "1.0.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emacsorphanage/popwin")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1x1iimzbwb5izbia6aj6xv49jybzln2qxm5ybcrcq7xync5swiv1"))))
+    (build-system emacs-build-system)
+    (arguments
+     (list
+      #:tests? #f ; requires an attached terminal
+      ))
+    (native-inputs
+     (list emacs-ert-runner))
+    (home-page "https://github.com/emacsorphanage/popwin")
+    (synopsis "Popup window manager for Emacs")
+    (description
+     "This package provides utilities for treating certain windows as @dfn{pop
+up windows}, which close automatically when quitting a command or selecting
+another window.")
+    (license license:gpl3+)))
+
 (define-public emacs-pyvenv
   (package
     (name "emacs-pyvenv")
-- 
cgit 1.4.1


From c6dad0178af1c13e540a6e4ad51a2dd72b3910e0 Mon Sep 17 00:00:00 2001
From: Brian Cully <bjc@spork.org>
Date: Wed, 5 Jul 2023 08:57:04 -0400
Subject: gnu: Add emacs-elfeed-goodies

* gnu/packages/emacs-xyz.scm (emacs-elfeed-goodies): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7c50035eff..f26fe56dd1 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13393,6 +13393,45 @@ and tooling.")
 and RSS, with a user interface inspired by notmuch.")
     (license license:gpl3+)))
 
+(define-public emacs-elfeed-goodies
+  (let ((commit "544ef42ead011d960a0ad1c1d34df5d222461a6b"))
+    (package
+      (name "emacs-elfeed-goodies")
+      (version commit)
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/jeetelongname/elfeed-goodies")
+               (commit version)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "147pwqx2maf430qhigzfd6lqk7a5sbrydf9a4c5bvsw8jv7wzb6l"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       (list
+        emacs-elfeed
+        emacs-popwin
+        emacs-powerline
+        emacs-link-hint))
+      (home-page "https://github.com/jeetelongname/elfeed-goodies")
+      (synopsis
+       "Various bits and pieces to enhance the Elfeed user experience.")
+      (description
+       "This package enhances the vanilla Elfeed user experience with:
+@itemize @bullet
+@item
+An adaptive, powerline-based header for the @code{*elfeed-search*} and
+@code{*elfeed-entry*} buffers, with a matching entry format.
+
+@item
+Split pane setup.
+
+@item
+A function to toggle the @code{*elfeed-log*} buffer in a popup window.
+@end itemize")
+      (license license:gpl3+))))
+
 (define-public emacs-elfeed-org
   (let ((commit "77b6bbf222487809813de260447d31c4c59902c9"))
     (package
-- 
cgit 1.4.1


From 1ef314fa58073cc688f536a38580ab9db2bd9f1d Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Fri, 7 Jul 2023 08:41:42 +0400
Subject: gnu: Add emacs-weyland-yutani-theme.

* gnu/packages/emacs-xyz.scm (emacs-weyland-yutani-theme): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f26fe56dd1..838a62e64e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -35807,6 +35807,29 @@ uncluttered design pattern to achieve optimal focus and readability for code
 syntax highlighting and UI components.")
     (license license:expat)))
 
+(define-public emacs-weyland-yutani-theme
+  (let ((commit "e89a63a62e071180c9cdd9067679fadc3f7bf796")
+        (revision "0"))
+    (package
+      (name "emacs-weyland-yutani-theme")
+      (version (git-version "0.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/jstaursky/weyland-yutani-theme")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0gxlz9b7fvbjkqxsyb4l75g7jsxyms0i1vpnb6y499hl115akcaz"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/jstaursky/weyland-yutani-theme")
+      (synopsis "Emacs theme based on the Alien movie franchise")
+      (description
+       "Weyland Yutani is a dark Emacs theme based on the Alien movie
+franchise.")
+      (license license:gpl3+))))
+
 (define-public emacs-janet-mode
   (let ((commit "2f5bcabcb6953e1ed1926ba6a2328c453e8b4ac7"))
     (package
-- 
cgit 1.4.1


From 45491ea8da85ad977ca11f4595a7ddeb22146b0d Mon Sep 17 00:00:00 2001
From: Lilah Tascheter <lilah@lunabee.space>
Date: Sat, 8 Jul 2023 13:29:28 -0500
Subject: gnu: mesa: Fix Vulkan on older Intel GPUs.

Mesa split the Vulkan intel driver into two: intel and intel_hasvk.
Enables intel_hasvk so vulkan functions on older intel GPUs again, and
swrast for lavapipe as a fallback.

* gnu/packages/gl.scm (mesa-vulkan-hasvk): New variable.
(mesa): Graft with mesa-vulkan-hasvk.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/gl.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 9885bde712..1691086e1a 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -279,6 +279,7 @@ also known as DXTn or DXTC) for Mesa.")
          (base32
           "1mcjf41x2bhxs6yxars7nh2vfryfw50g6rvbcfbb1wqdv2jn4qrq"))))
     (build-system meson-build-system)
+    (replacement mesa-vulkan-hasvk)
     (propagated-inputs
      ;; The following are in the Requires.private field of gl.pc.
      (list libdrm
@@ -526,6 +527,21 @@ device drivers allows Mesa to be used in many different environments ranging
 from software emulation to complete hardware acceleration for modern GPUs.")
     (license license:x11)))
 
+(define mesa-vulkan-hasvk
+  (let ((graft mesa)
+        (vulk "-Dvulkan-drivers=intel,amd"))
+    (package
+      (inherit graft)
+      (arguments
+        (substitute-keyword-arguments (package-arguments graft)
+          ((#:configure-flags flags)
+           #~(begin
+               (use-modules (ice-9 match))
+               (map (match-lambda
+                      (#$vulk (string-append #$vulk ",intel_hasvk,swrast"))
+                      (x x))
+                 #$flags))))))))
+
 (define-public mesa-opencl
   (package/inherit mesa
     (name "mesa-opencl")
-- 
cgit 1.4.1


From 093e9204183790558921c968034c547b41ebef3a Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
Date: Sat, 8 Jul 2023 21:24:21 +0200
Subject: gnu: capypdf: Update to 0.4.0.

* gnu/packages/pdf.scm (capypdf): Update to 0.4.0.
---
 gnu/packages/pdf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index ef81900069..767cf0c5db 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -117,7 +117,7 @@
 (define-public capypdf
   (package
     (name "capypdf")
-    (version "0.3.0")
+    (version "0.4.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -125,7 +125,7 @@
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
-               (base32 "193izn2jw55w2dxy6l0vz5zrlar9lm7a6z443nw0vs4mlj4jnasi"))))
+               (base32 "1kn46n3j5fygivmd6ldnv8vdwfv48ffaizq61yy4z9w2jm6fgxim"))))
     (build-system meson-build-system)
     (arguments
      (list #:meson meson/newer
-- 
cgit 1.4.1


From ff0d34a29bc0f19b1dd2714fc0a3bd73a244aebe Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 15 Jul 2023 23:11:31 +0200
Subject: gnu: r-with-tests: Fix reference to grep.

detectCores.R fails to return the number of cores when running R in a
container without grep.

Reported-by: Jonas Freimuth.

* gnu/packages/statistics.scm (r-with-tests)[arguments]: Fix references to
grep and wc in detectCores.R.
[inputs]: Add grep.
---
 gnu/packages/statistics.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index f28e60362c..2043bf2fd3 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -244,7 +244,15 @@ This package also provides @command{xls2csv} to export Excel files to CSV.")
                (substitute* "src/scripts/R.sh.in"
                  (("uname") uname-bin))
                (substitute* "src/unix/sys-std.c"
-                 (("rm -Rf ") (string-append rm-bin " -Rf "))))))
+                 (("rm -Rf ") (string-append rm-bin " -Rf ")))
+               (substitute* "src/library/parallel/R/detectCores.R"
+                 (("'grep")
+                  (string-append "'"
+                                 (search-input-file inputs "/bin/grep")))
+                 (("\\| wc -l")
+                  (string-append "| "
+                                 (search-input-file inputs "/bin/wc")
+                                 " -l"))))))
          (add-after 'unpack 'patch-tests
            (lambda _
              ;; This is needed because R is run during the check phase and
@@ -401,6 +409,7 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
            curl
            openblas
            gfortran
+           grep
            icu4c
            libjpeg-turbo
            libpng
-- 
cgit 1.4.1


From 8d2a016f1ba1b770a63151dae2cfc25160223bb7 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 16 Jul 2023 00:12:42 +0200
Subject: gnu: r-with-tests: Update to 4.3.1.

* gnu/packages/statistics.scm (r-with-tests): Update to 4.3.1.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 2043bf2fd3..bb95b40755 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -211,7 +211,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.")
 (define r-with-tests
   (package
     (name "r-with-tests")
-    (version "4.3.0")
+    (version "4.3.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://cran/src/base/R-"
@@ -219,7 +219,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "02d6lrb0008wr9ikcas0h5xrk7i074ddwzzp4083czgjdj5w9p25"))))
+                "16dswjcymzr2mj1vjwqdyjaa9d4isa1p6c9viihnyg02y4jbzl4d"))))
     (build-system gnu-build-system)
     (arguments
      `(#:disallowed-references (,tzdata-for-tests)
-- 
cgit 1.4.1


From e767fe2ddc145e1ec86e11df13e1c67065d908bf Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 16 Jul 2023 10:46:40 +0200
Subject: gnu: libnode: Delete extra phase.

This is a follow-up to commit 5dc2a88f99e2e448f7e9ca842a4a0d072a8f8f20.

* gnu/packages/node.scm (libnode)[arguments]: Remove phase
'ignore-number-of-hardlinks.
---
 gnu/packages/node.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 8ba57dd4e0..6569422584 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -941,4 +941,5 @@ source files.")
        ((#:phases phases '%standard-phases)
         `(modify-phases ,phases
            (delete 'install-npmrc)
-           (delete 'patch-nested-shebangs)))))))
+           (delete 'patch-nested-shebangs)
+           (delete 'ignore-number-of-hardlinks)))))))
-- 
cgit 1.4.1


From 796c823a0d1d0aec9f4af908eca462e58e5675b5 Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant <glv@posteo.net>
Date: Sun, 16 Jul 2023 11:05:24 +0200
Subject: gnu: welle-io: Add missing input.

* gnu/packages/radio.scm (welle-io)[inputs]: Add qtquickcontrols-5.
---
 gnu/packages/radio.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 82d8d5a7af..0ef9896de9 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -2179,6 +2179,7 @@ receiver.")
            qtdeclarative-5
            qtgraphicaleffects
            qtmultimedia-5
+           qtquickcontrols-5
            qtquickcontrols2-5
            soapysdr))
     (arguments
-- 
cgit 1.4.1


From 3755941f038ec66fba568fa88d6b2d295e196723 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Sun, 16 Jul 2023 22:47:36 +0200
Subject: gnu: jbr: Use Jetbrains' configure-flags.

* gnu/packages/java.scm (jbr17)[arguments]<#:configure-flags>: Use Jetbrains'
configure flags.
---
 gnu/packages/java.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 5a6288581e..7ad1116527 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1553,6 +1553,15 @@ blacklisted.certs.pem"
                (base32
                 "0wh9xhqgcjk0jgvpvlvf78dy3r8m0vgqd0f54whpx0qqbmyavgdw"))
               (patches (search-patches "jbr-17-xcursor-no-dynamic.patch"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments openjdk17)
+       ((#:configure-flags configure-flags)
+        #~(append #$configure-flags
+                  (list "--with-jvm-features=shenandoahgc"
+                        "--enable-cds=yes"
+                        "--with-vendor-name=JetBrains s.r.o"
+                        "--with-vendor-url=https://www.jetbrains.com/"
+                        "--with-vendor-bug-url=https://youtrack.jetbrains.com/issues/JBR")))))
     (synopsis "JetBrains Java Runtime")
     (description "This package provides a Java runtime environment for
 and Java development kit.  It supports enhanced class redefinition (DCEVM),
-- 
cgit 1.4.1


From 36cbd2654e6e4685128d9fb457037c16f934836b Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Sat, 15 Jul 2023 10:39:30 +0100
Subject: gnu: ghc-8.10: Fix build on i686-linux.

As one profiling test fails very repeatedly on the bordeaux build farm, but
ghc did seem to build successfully on other machines.

* gnu/packages/haskell.scm (ghc-8.10)[arguments]: Don't run the T11627a
profiling test on i686-linux.
---
 gnu/packages/haskell.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 6b2c86fec4..62815efbb1 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1271,8 +1271,11 @@ interactive environment for the functional language Haskell.")
            ;; next rebuild. Note that they are required for GHC 8.10 and 9.2.
            #$@(if (string-prefix? "i686" (or (%current-target-system)
                                              (%current-system)))
-               #~((add-after 'skip-failing-tests-i686 'skip-failing-tests-i686-cuirass
+               #~((add-after 'skip-failing-tests-i686 'skip-more-failing-tests-i686
                     (lambda _
+                      (substitute* '("testsuite/tests/profiling/should_run/all.T")
+                        (("test\\('T11627a', \\[ ")
+                         "test('T11627a', [ when(arch('i386'), skip), "))
                       (substitute* '("testsuite/driver/testlib.py")
                         ((".*changes being made to the file will invalidate the code signature.*")
                          "")
-- 
cgit 1.4.1


From c0d3d494cd6420f2e58d42d566f2af54846bcf13 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Mon, 17 Jul 2023 08:52:49 +0100
Subject: teams: Change email address for Christopher Baines.

This will allow me to automatically detect when I'm getting emails related to
Guix teams.

* etc/teams.scm.in: Change email address for Christopher Baines.
---
 etc/teams.scm.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/teams.scm.in b/etc/teams.scm.in
index 1e8ea95966..f041fab9ec 100644
--- a/etc/teams.scm.in
+++ b/etc/teams.scm.in
@@ -542,7 +542,7 @@ GLib/GIO, GTK, GStreamer and Webkit."
   r core mentors tex)
 
 (define-member (person "Christopher Baines"
-                       "mail@cbaines.net")
+                       "guix@cbaines.net")
   core mentors ruby)
 
 (define-member (person "Andrew Tropin"
-- 
cgit 1.4.1


From 728ed83188846453f1319ea425847da8200a55a9 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Mon, 17 Jul 2023 09:05:03 +0100
Subject: gnu: Remove harfbuzz-5.

As this package definition is redundant, harfbuzz is version 5.3.1.

* gnu/packages/gtk.scm (harfbuzz-5): Remove.
* gnu/packages/libreoffice.scm (libreoffice)[inputs]: Replace harfbuzz-5 with
harfbuzz.
* gnu/packages/qt.scm (qtwebengine)[inputs]: Remove redundant replace.
---
 gnu/packages/gtk.scm         | 14 --------------
 gnu/packages/libreoffice.scm |  2 +-
 gnu/packages/qt.scm          |  1 -
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ca41612e90..9621357b99 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -286,20 +286,6 @@ output.  Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
                                 "See 'COPYING' in the distribution."))
     (home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/")))
 
-
-(define-public harfbuzz-5
-  (package
-    (inherit harfbuzz)
-    (version "5.3.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/harfbuzz/harfbuzz"
-                                  "/releases/download/" version "/harfbuzz-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "0ka3nkk2lks2lgakq02vyibwdziv11dkpa2brkx230asnyby0v2a"))))))
-
 (define-public libdatrie
   (package
     (name "libdatrie")
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 04279fff63..d06166e64a 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -1117,7 +1117,7 @@ commonly called @code{ftoa} or @code{dtoa}.")
            graphite2
            gst-plugins-base
            gtk+
-           harfbuzz-5
+           harfbuzz
            hunspell
            hyphen
            libabw
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index de070ecaf3..c3d7d02fe7 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3126,7 +3126,6 @@ linux/libcurl_wrapper.h"
     (inputs
      (modify-inputs (package-inputs qtwebengine-5)
        (replace "qtmultimedia" qtmultimedia)
-       (replace "harfbuzz" harfbuzz-5)
        (append libxkbfile xkeyboard-config)))
     (propagated-inputs
      (modify-inputs (package-propagated-inputs qtwebengine-5)
-- 
cgit 1.4.1


From 54a74d35e6bb7dd0f92d16ac7db1fa8558e7d79b Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Mon, 17 Jul 2023 09:06:34 +0100
Subject: gnu: Hide python-bcbio-gff/biopython-1.73.

To avoid the ambiguous package specification.

* gnu/packages/bioinformatics.scm (python-bcbio-gff/biopython-1.73): Hide
package.
---
 gnu/packages/bioinformatics.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index fb0f0d5fd7..4acba4f3c9 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -1411,11 +1411,12 @@ Format (GFF) with Biopython integration.")
     (license (license:non-copyleft "http://www.biopython.org/DIST/LICENSE"))))
 
 (define-public python-bcbio-gff/biopython-1.73
-  (package
-    (inherit python-bcbio-gff)
-    (propagated-inputs
-     (modify-inputs (package-propagated-inputs python-bcbio-gff)
-       (replace "python-biopython" python-biopython-1.73)))))
+  (hidden-package
+   (package
+     (inherit python-bcbio-gff)
+     (propagated-inputs
+      (modify-inputs (package-propagated-inputs python-bcbio-gff)
+        (replace "python-biopython" python-biopython-1.73))))))
 
 ;; Note: the name on PyPi is "biofluff".
 (define-public python-biofluff
-- 
cgit 1.4.1


From 22c7ac4109aaf92a0c176ab7bd2a7423996fa8d0 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Mon, 17 Jul 2023 09:07:34 +0100
Subject: gnu: gnome: Hide devhelp-with-libsoup2.

To avoid the ambiguous package specification.

* gnu/packages/gnome.scm (devhelp-with-libsoup2): Hide package.
---
 gnu/packages/gnome.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 360c657741..4f5734dc0a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6182,9 +6182,10 @@ throughout GNOME for API documentation).")
     (license license:gpl2+)))
 
 (define-public devhelp-with-libsoup2
-  (package/inherit devhelp
-    (inputs (modify-inputs (package-inputs devhelp)
-              (replace "webkitgtk" webkitgtk-with-libsoup2)))))
+  (hidden-package
+   (package/inherit devhelp
+     (inputs (modify-inputs (package-inputs devhelp)
+               (replace "webkitgtk" webkitgtk-with-libsoup2))))))
 
 (define-public cogl
   (package
-- 
cgit 1.4.1


From ad08f9331fee7a8e71e94b02f86f54ab3e1001a8 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Mon, 17 Jul 2023 09:08:18 +0100
Subject: gnu: simulation: Fix duplicate open-simulation-interface.

Give the python variant a different name, and fix the build.

* gnu/packages/simulation.scm (python-open-simulation-interface)[name]: Set.
[propagated-inputs]: Add python-pyyaml and python-protobuf.
---
 gnu/packages/simulation.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index a4aac0ebf8..d62298510a 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -288,8 +288,12 @@ functions in virtual scenarios.")
 
 (define-public python-open-simulation-interface
   (package/inherit open-simulation-interface
+    (name "python-open-simulation-interface")
     (build-system python-build-system)
-    (arguments '())))
+    (arguments '())
+    (propagated-inputs
+     (list python-pyyaml
+           python-protobuf))))
 
 (define-public esmini
   (package
-- 
cgit 1.4.1


From eda2c23874d298e7867ebd6d74213df3527ba8df Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 13:51:54 +0200
Subject: scripts/refresh: Remove column from spec line before sorting.

We want to sort by file and line number, but the column number messes
everything up.

This is a follow-up to commit b43841c124d15eaecc41b3928f08a26dbd5c653a.

* guix/scripts/refresh.scm (guix-refresh): Trim the digits on the right of the
location string before comparing them.
---
 guix/scripts/refresh.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index 719883d4a9..a9241aa20d 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -591,7 +591,8 @@ all are dependent packages: ~{~a~^ ~}~%")
                                   (string-append (config-directory)
                                                  "/upstream/trustedkeys.kbx"))))
                 (let* ((spec-line
-                        (compose location->string
+                        (compose (cut string-trim-right <> char-set:digit)
+                                 location->string
                                  package-location
                                  update-spec-package))
                        ;; Sort the specs so that we update packages from the
-- 
cgit 1.4.1


From af6b542954b6be8814b84347008eb60ffb052cd4 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:18:43 +0200
Subject: gnu: r-openssl: Update to 2.1.0.

* gnu/packages/statistics.scm (r-openssl): Update to 2.1.0.
[properties]: Add hint to keep openssl input.
[inputs]: Add zlib.
---
 gnu/packages/statistics.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index bb95b40755..a54c726e8d 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2679,14 +2679,17 @@ collation, and NAMESPACE files.")
 (define-public r-openssl
   (package
     (name "r-openssl")
-    (version "2.0.6")
+    (version "2.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "openssl" version))
        (sha256
         (base32
-         "1wxkq613054ic0w58a41fyr7bp7f939vhsgj6hbhs3r72qm07wvp"))))
+         "0fg5avcrjjn7sv6rzbp19y6jwjjr77xpldxg4xssp5s1p832wnk2"))))
+    (properties
+     `((upstream-name . "openssl")
+       (updater-extra-inputs . ("openssl"))))
     (build-system r-build-system)
     (arguments
      (list
@@ -2698,7 +2701,7 @@ collation, and NAMESPACE files.")
                (("PKG_LIBS=\"\\$\\{PKG_LIBS_VERSIONED\\}\"")
                 "PKG_LIBS=\"${PKG_LIBS}\"")))))))
     (inputs
-     (list openssl))
+     (list openssl zlib))
     (native-inputs
      (list pkg-config r-knitr))
     (propagated-inputs
-- 
cgit 1.4.1


From c30a4577a84e1fb7a20ba473ca0f8ecefb2a1471 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:51 +0200
Subject: gnu: r-babelwhale: Update to 1.2.0.

* gnu/packages/cran.scm (r-babelwhale): Update to 1.2.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 199bc69c03..5f3261f11f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1255,13 +1255,13 @@ for authoring journal articles and conference submissions.")
 (define-public r-babelwhale
   (package
     (name "r-babelwhale")
-    (version "1.1.0")
+    (version "1.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "babelwhale" version))
        (sha256
-        (base32 "01l8vwyz3bx0iks6cjs5y9ifdsnc1p1yqp4i0kzqd1gjhycizv6y"))))
+        (base32 "0m5q83ykz5w1fsjsk2vyrnv21cg4n075kbvfvw4k22c61p78shdl"))))
     (properties `((upstream-name . "babelwhale")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From 8ed1249d6516bb860eb3c8d11dfd7a0173b9cfc5 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:51 +0200
Subject: gnu: r-ggpp: Update to 0.5.3.

* gnu/packages/cran.scm (r-ggpp): Update to 0.5.3.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 5f3261f11f..e3331c21f9 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1871,14 +1871,14 @@ variables.")
 (define-public r-ggpp
   (package
     (name "r-ggpp")
-    (version "0.5.2")
+    (version "0.5.3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ggpp" version))
        (sha256
         (base32
-         "0w93427hyiihddsdr6q962gfl01b06yxchi3x3dinfb8mf1m5qmk"))))
+         "1shcjplw2w8jbfbp0flpxhb7jfy7v79vhjv1qlh6lmam2fziydcc"))))
     (properties `((upstream-name . "ggpp")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From 01be46499311324035f8381b639aceae4435eb4f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:52 +0200
Subject: gnu: r-sass: Update to 0.4.7.

* gnu/packages/cran.scm (r-sass): Update to 0.4.7.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index e3331c21f9..e538388d94 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3997,14 +3997,14 @@ conditionals and comparisons, and more.")
 (define-public r-sass
   (package
     (name "r-sass")
-    (version "0.4.6")
+    (version "0.4.7")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sass" version))
        (sha256
         (base32
-         "06f0279ljg6mbcimmfx4rp18zxb9yc24sdp2yxwfxzdp17kjrs1f"))))
+         "1vp9qnhkvz4shhvwrwbwcy1xnrgry0rmqxsg96ggv90m6sv0hyki"))))
     (properties `((upstream-name . "sass")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From ecb9e3e180a5fd6759e233eb1dcf3e861d1f8b6c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:52 +0200
Subject: gnu: r-gensa: Update to 1.1.9.

* gnu/packages/cran.scm (r-gensa): Update to 1.1.9.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index e538388d94..f85ab0062a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5013,13 +5013,13 @@ coordinates.")
 (define-public r-gensa
   (package
     (name "r-gensa")
-    (version "1.1.8")
+    (version "1.1.9")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "GenSA" version))
               (sha256
                (base32
-                "05m2xjaf4202jzzn5l7i7k80kzr8vihv7jpw99c9ic5n3ra8fpip"))))
+                "10qm0467r2rbcck1w7dijng5j676314vsyxsr0p8l843xz7s66rq"))))
     (properties `((upstream-name . "GenSA")))
     (build-system r-build-system)
     (home-page "https://cran.r-project.org/package=GenSA")
-- 
cgit 1.4.1


From a20818b3e88566954dbeb320b988171dd8582a8f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:52 +0200
Subject: gnu: r-rcppspdlog: Update to 0.0.14.

* gnu/packages/cran.scm (r-rcppspdlog): Update to 0.0.14.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index f85ab0062a..b796971b95 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5616,13 +5616,13 @@ factorization and divisive clustering for large sparse and dense matrices.")
 (define-public r-rcppspdlog
   (package
     (name "r-rcppspdlog")
-    (version "0.0.13")
+    (version "0.0.14")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "RcppSpdlog" version))
        (sha256
-        (base32 "1149kh047301hrp15479ikcmrix968pwqw3jza7mp7bsxhrjrp3k"))))
+        (base32 "1n63mz2rr63kz3v7mg6n4cvw2lrw1ffk7xvln1j1005argvzvd4c"))))
     (properties `((upstream-name . "RcppSpdlog")))
     (build-system r-build-system)
     (propagated-inputs (list r-rcpp))
-- 
cgit 1.4.1


From b23bfb6de51d9fb1f52abfff81d8b4dcc99d3000 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:52 +0200
Subject: gnu: r-ctrdata: Update to 1.14.0.

* gnu/packages/cran.scm (r-ctrdata): Update to 1.14.0.
[propagated-inputs]: Add r-dplyr.
---
 gnu/packages/cran.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index b796971b95..c8f384210e 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5881,18 +5881,19 @@ graphics packages that comes with the base installation.")
 (define-public r-ctrdata
   (package
     (name "r-ctrdata")
-    (version "1.13.3")
+    (version "1.14.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "ctrdata" version))
               (sha256
                (base32
-                "15vs8b2jxap5ya59n6pdby1p89hd0y0b4say72q6icxsjzzj979z"))))
+                "0x5dpph62s7dwfs0y4gd73zzbil9cr1y5q8mpn9m7z2gdr67wk1c"))))
     (properties `((upstream-name . "ctrdata")))
     (build-system r-build-system)
     (propagated-inputs
      (list r-clipr
            r-curl
+           r-dplyr
            r-httr
            r-jqr
            r-jsonlite
-- 
cgit 1.4.1


From 892f9dba8a76f087798ea3a1daea447cf1dd1537 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:52 +0200
Subject: gnu: r-doby: Update to 4.6.17.

* gnu/packages/cran.scm (r-doby): Update to 4.6.17.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index c8f384210e..55d60337f7 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -13275,14 +13275,14 @@ the work.")
 (define-public r-doby
   (package
     (name "r-doby")
-    (version "4.6.16")
+    (version "4.6.17")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "doBy" version))
        (sha256
         (base32
-         "1rxvxhb572n29mbvkh6xmi7cnwc6c8g2xzw1wp10nfr9gnspx4ym"))))
+         "02jb1z19rsmbvzwapgfx7m8lfnlcx9dqf6gkr9fmgcl77d5992n5"))))
     (properties `((upstream-name . "doBy")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From 2f5903c51a77c5869924eacd42ad3d658c47ce08 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:52 +0200
Subject: gnu: r-rcppalgos: Update to 2.8.0.

* gnu/packages/cran.scm (r-rcppalgos): Update to 2.8.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 55d60337f7..5a3f06b9fb 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -16572,13 +16572,13 @@ address a bug.")
 (define-public r-rcppalgos
   (package
     (name "r-rcppalgos")
-    (version "2.7.2")
+    (version "2.8.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "RcppAlgos" version))
               (sha256
                (base32
-                "1wfwwbv9wrs2vbk0c36zcwcl9yyzz2h1mw36mpq7lz56xxhy0wf5"))))
+                "1f9wxwqzv03bgr22s3hnj7mg9qlbap1dsg6vj1blgjl6xpfvz5bn"))))
     (properties `((upstream-name . "RcppAlgos")))
     (build-system r-build-system)
     (inputs (list gmp))
-- 
cgit 1.4.1


From b0711055841a192464ba6e4d6de9f1b914ee6125 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:52 +0200
Subject: gnu: r-tidytree: Update to 0.4.4.

* gnu/packages/cran.scm (r-tidytree): Update to 0.4.4.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 5a3f06b9fb..b5671aa223 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -17548,13 +17548,13 @@ maps.")
 (define-public r-tidytree
   (package
     (name "r-tidytree")
-    (version "0.4.2")
+    (version "0.4.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "tidytree" version))
        (sha256
-        (base32 "0phmvbpsxx85fvw4000d160qh8njrgmzpr3ja0gy59dgv1k1m0yb"))))
+        (base32 "196c7j3pgapwh8j8jdhsz078wl24xcf5jkrbbsr2s7xg32j0lmi1"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-ape
-- 
cgit 1.4.1


From fa0788a9b4510fbbe4365b38e1451812569c1317 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:53 +0200
Subject: gnu: r-longdat: Update to 1.1.2.

* gnu/packages/cran.scm (r-longdat): Update to 1.1.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index b5671aa223..88d6212385 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -19381,13 +19381,13 @@ handling in messages and custom formatting.")
 (define-public r-longdat
   (package
     (name "r-longdat")
-    (version "1.1.1")
+    (version "1.1.2")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "LongDat" version))
               (sha256
                (base32
-                "1k8rl6jv4xzsm620wf373ds6l8fbb5ff07rgbp0bgqrymvwdf1jc"))))
+                "1rzkb7byd32jqvhf75zyvy0dlkq79aicz8j0x7lk821qiq4dfv6l"))))
     (properties `((upstream-name . "LongDat")))
     (build-system r-build-system)
     (propagated-inputs (list r-bestnormalize
-- 
cgit 1.4.1


From 2824b8949da6c7330570df6d90134b7e8294b72d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:53 +0200
Subject: gnu: r-sf: Update to 1.0-14.

* gnu/packages/cran.scm (r-sf): Update to 1.0-14.
[inputs]: Add curl, openssh, openssl, pcre2, and zlib.
---
 gnu/packages/cran.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 88d6212385..c3064b2bb4 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -21607,17 +21607,25 @@ information about geometries.")
 (define-public r-sf
   (package
     (name "r-sf")
-    (version "1.0-13")
+    (version "1.0-14")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sf" version))
        (sha256
         (base32
-         "11lcc57vqip1zj8hi09mnisl9jiqqxwx6b06jl752dayxi2109br"))))
+         "1xrrqd91601lcd83zzwksb4ampy1j8vf8f6941csk89psm45clwb"))))
     (build-system r-build-system)
     (inputs
-     (list gdal geos proj sqlite))
+     (list curl
+           gdal
+           geos
+           openssh
+           openssl
+           pcre2
+           proj
+           sqlite
+           zlib))
     (propagated-inputs
      (list r-classint
            r-dbi
-- 
cgit 1.4.1


From 4a6843b3b3303769a1e69c1a4b759f75f4e663f8 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:53 +0200
Subject: gnu: r-sccore: Update to 1.0.4.

* gnu/packages/cran.scm (r-sccore): Update to 1.0.4.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index c3064b2bb4..a3a78dee9d 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -24053,13 +24053,13 @@ code edited with @code{RStudio IDE}, @code{Emacs} and @code{Vim}.")
 (define-public r-sccore
   (package
     (name "r-sccore")
-    (version "1.0.3")
+    (version "1.0.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sccore" version))
        (sha256
-        (base32 "1bvqbqh8pkiljy7s3mc67wsr1jlxb19rhd95160xparmrbffpxqb"))))
+        (base32 "11l7xl1ylzmda4i2p1b08a43pvciin2i2sas2n3cj1gmamflkji3"))))
     (properties `((upstream-name . "sccore")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From f702efa97e73a7223b87a38a3da1ce0c6b0a55d7 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:53 +0200
Subject: gnu: r-seewave: Update to 2.2.1.

* gnu/packages/cran.scm (r-seewave): Update to 2.2.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index a3a78dee9d..dd48e4b4d0 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -27297,14 +27297,14 @@ transcription, ...")
 (define-public r-seewave
   (package
     (name "r-seewave")
-    (version "2.2.0")
+    (version "2.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "seewave" version))
        (sha256
         (base32
-         "0bi1l47l3846c18k6h2vrv0xp9xh00n544a578jrndahzrj1hfwl"))))
+         "0whfanh3949162575ddw5y6s5ydq9v24l929gwdd1jv16xzlnp9h"))))
     (properties `((upstream-name . "seewave")))
     (build-system r-build-system)
     (inputs
-- 
cgit 1.4.1


From a28d88e847ddcadded7edc6b79b9b6f78a8feb63 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:53 +0200
Subject: gnu: r-stars: Update to 0.6-2.

* gnu/packages/cran.scm (r-stars): Update to 0.6-2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index dd48e4b4d0..e97e1ed7ce 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -36809,14 +36809,14 @@ light-weight geometry library used by @url{http://postgis.net/,PostGIS}.")
 (define-public r-stars
   (package
     (name "r-stars")
-    (version "0.6-1")
+    (version "0.6-2")
     (source
       (origin
         (method url-fetch)
         (uri (cran-uri "stars" version))
         (sha256
           (base32
-            "19q44bs2w12lyim8gzfpgxfkp2cdf29cav4cv74vzsxrv8xdny0z"))))
+            "0prip06c28d72wa7h8h8p2y7rw7jnh2h2yhnygbaipc8cbzlvi7x"))))
     (properties `((upstream-name . "stars")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From 8029b180bdf0917d509ffad9e221f996be7d9c9e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:53 +0200
Subject: gnu: r-ggh4x: Update to 0.2.5.

* gnu/packages/cran.scm (r-ggh4x): Update to 0.2.5.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index e97e1ed7ce..75ffc81bfd 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -39220,14 +39220,14 @@ be efficient and easy to use.")
 (define-public r-ggh4x
   (package
     (name "r-ggh4x")
-    (version "0.2.4")
+    (version "0.2.5")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ggh4x" version))
        (sha256
         (base32
-         "15b2agnk5dsinrxkbq5bmqgckssvlrkwarj2pi7xi8lxsqqrpw3w"))))
+         "0xj4nlxrpmwzdlj4q3vnhwy7gd1634ff7yjsnaf609ap0q23mxb1"))))
     (properties `((upstream-name . "ggh4x")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From f96c109be96af747b5f967c206332e1f02e024cd Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:53 +0200
Subject: gnu: r-mgcv: Update to 1.9-0.

* gnu/packages/statistics.scm (r-mgcv): Update to 1.9-0.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index a54c726e8d..1fac3191d4 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -720,13 +720,13 @@ nonlinear mixed-effects models.")
 (define-public r-mgcv
   (package
    (name "r-mgcv")
-   (version "1.8-42")
+   (version "1.9-0")
    (source
     (origin
      (method url-fetch)
      (uri (cran-uri "mgcv" version))
      (sha256
-      (base32 "1ixn5pgc3qriy5nfd264dz7l126xg4k4zidgkqag41mdcj5w6zq8"))))
+      (base32 "0w1v0hdswb332xz3br1fcgacib7ddr4hb96cmlycxcpqq5w01cdj"))))
    (build-system r-build-system)
    (propagated-inputs
     (list r-matrix r-nlme))
-- 
cgit 1.4.1


From b5fede2809b1f2f16ee811ba63c95664eeea3b53 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:54 +0200
Subject: gnu: r-deoptimr: Update to 1.1-0.

* gnu/packages/statistics.scm (r-deoptimr): Update to 1.1-0.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 1fac3191d4..9d4dae0586 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5595,14 +5595,14 @@ data for species delimitation, nearest neighbor based noise detection.")
 (define-public r-deoptimr
   (package
     (name "r-deoptimr")
-    (version "1.0-14")
+    (version "1.1-0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "DEoptimR" version))
        (sha256
         (base32
-         "0d2ij0ncwjp9kh5bv7nvha8p1g73y620pw62c1q5chvjpjvxshfp"))))
+         "15nnix9k5x6hixfk1pvmkq1bmi3nbw4mf16ng5b7b8qakj8h8h8n"))))
     (properties `((upstream-name . "DEoptimR")))
     (build-system r-build-system)
     (home-page "https://cran.r-project.org/web/packages/DEoptimR")
-- 
cgit 1.4.1


From 7d6bdd1c8ad20e7a564ca91cf4aabfb6403497f5 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:54 +0200
Subject: gnu: r-matrixmodels: Update to 0.5-2.

* gnu/packages/statistics.scm (r-matrixmodels): Update to 0.5-2.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 9d4dae0586..d0f2142d3d 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5904,14 +5904,14 @@ metrics for evaluating models.")
 (define-public r-matrixmodels
   (package
     (name "r-matrixmodels")
-    (version "0.5-1")
+    (version "0.5-2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "MatrixModels" version))
        (sha256
         (base32
-         "1a9ywhv1yklfcp0jgirkih3ib5scs61hkscmyddwfh5blpgmpi9z"))))
+         "0ap3mfzb2psjwlksfjzs2ycl5598bllwzx5hfmf9db4yjsydn1hw"))))
     (properties `((upstream-name . "MatrixModels")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From a450a5aafae64da34513d7dea121f94ac5e2c751 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:54 +0200
Subject: gnu: r-clubsandwich: Update to 0.5.9.

* gnu/packages/statistics.scm (r-clubsandwich): Update to 0.5.9.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index d0f2142d3d..09ff7cde58 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -6883,14 +6883,14 @@ mediation and estimating power.")
 (define-public r-clubsandwich
   (package
     (name "r-clubsandwich")
-    (version "0.5.8")
+    (version "0.5.9")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "clubSandwich" version))
        (sha256
         (base32
-         "1y894n35l4lzqm15ifxjnpnh95dldsfivv4098571yqf1z4a253q"))))
+         "0r43qyff1v986snvnynsj02kp50npyi1qln1gwgpl3n1syngzcn8"))))
     (properties `((upstream-name . "clubSandwich")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From ed58e991f5fe97c7e7b1d33ebf67dd383ca19bf2 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:19:54 +0200
Subject: gnu: r-puniform: Update to 0.2.6.

* gnu/packages/statistics.scm (r-puniform): Update to 0.2.6.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 09ff7cde58..68206ea6a1 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -6921,14 +6921,14 @@ Methods are provided for a variety of fitted models, including @code{lm()} and
 (define-public r-puniform
   (package
     (name "r-puniform")
-    (version "0.2.5")
+    (version "0.2.6")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "puniform" version))
        (sha256
         (base32
-         "1zw8qbqnyhyvzrw6izrqgnmbawcqg2jdhcb8lxs1rd8y7cn4v4wj"))))
+         "1rfd7d14an28hba1rhldxn418qagnlk8ngvimb86i3774ll9blvi"))))
     (properties `((upstream-name . "puniform")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From 6f9894d63c19688c19603a7def086d8838af7cab Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:55:07 +0200
Subject: gnu: r-affycomp: Update to 1.76.1.

* gnu/packages/bioconductor.scm (r-affycomp): Update to 1.76.1.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index bc8eda4293..4fae20fa83 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -5442,14 +5442,14 @@ analysis.")
 (define-public r-affycomp
   (package
     (name "r-affycomp")
-    (version "1.76.0")
+    (version "1.76.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "affycomp" version))
        (sha256
         (base32
-         "1bsav6d3dhn2fs7gjd1jvrb448ckxw5l6ikrdv63cdnnjk0dxl62"))))
+         "0wccj8q8sl0zc68nr5qf1qih8awqf1h6bwi5hq9d7r59p4g4r9n1"))))
     (properties `((upstream-name . "affycomp")))
     (build-system r-build-system)
     (propagated-inputs (list r-biobase))
-- 
cgit 1.4.1


From d1979fe4bbdce48e942ba9f7d0ee62cade65f0bb Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:55:07 +0200
Subject: gnu: r-treeio: Update to 1.24.2.

* gnu/packages/bioconductor.scm (r-treeio): Update to 1.24.2.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 4fae20fa83..c42c7dad93 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -11281,14 +11281,14 @@ multiplication.")
 (define-public r-treeio
   (package
     (name "r-treeio")
-    (version "1.24.1")
+    (version "1.24.2")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "treeio" version))
        (sha256
         (base32
-         "1jwjnwakinfqfx8ajbl58lqdhsq06a25phxy3vsprh1glj37smf7"))))
+         "0xjhyrqpr54aaj4han69ndkbmz5kwnf01adh80v2r8jc8jwdfy6m"))))
     (properties `((upstream-name . "treeio")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From d29a060d20fb7d6ae6de544fabbd61c36985216d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:55:07 +0200
Subject: gnu: r-icobra: Update to 1.28.1.

* gnu/packages/bioconductor.scm (r-icobra): Update to 1.28.1.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index c42c7dad93..6b09a41596 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -11800,14 +11800,14 @@ independent of the p-value under the null hypothesis.")
 (define-public r-icobra
   (package
     (name "r-icobra")
-    (version "1.28.0")
+    (version "1.28.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "iCOBRA" version))
        (sha256
         (base32
-         "1dirwfmjl15lqh1dx1yhaqbfiz5iwzp03d3g64iy31nzi8sha4qq"))))
+         "120bcakhhl6xqsfclzgmn7rcxmld289bjl6j7nrli7aiq5ilz8h4"))))
     (properties `((upstream-name . "iCOBRA")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From 79b508e3f6ce134ade47b0cf005eee1357663849 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:55:07 +0200
Subject: gnu: r-gosemsim: Update to 2.26.1.

* gnu/packages/bioconductor.scm (r-gosemsim): Update to 2.26.1.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 6b09a41596..339e789649 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -12991,14 +12991,14 @@ information about samples and features can be added to the plot.")
 (define-public r-gosemsim
   (package
     (name "r-gosemsim")
-    (version "2.26.0")
+    (version "2.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "GOSemSim" version))
        (sha256
         (base32
-         "1pg86z4vbrp59kpq7zpscnjw9cgfkdqjrdp9zjvdf3xghgjvwl9a"))))
+         "15z7wqnp0s8fiysl3qc76pjaj3xik2br2mz2z3nmf28vxig69mx9"))))
     (properties `((upstream-name . "GOSemSim")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From 2b5b5957080b3934cdf313dd02d33d1c82efefca Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:55:08 +0200
Subject: gnu: r-clusterprofiler: Update to 4.8.2.

* gnu/packages/bioconductor.scm (r-clusterprofiler): Update to 4.8.2.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 339e789649..8fbae054f4 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -13211,14 +13211,14 @@ All the visualization methods are developed based on ggplot2 graphics.")
 (define-public r-clusterprofiler
   (package
     (name "r-clusterprofiler")
-    (version "4.8.1")
+    (version "4.8.2")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "clusterProfiler" version))
        (sha256
         (base32
-         "1vcqzk5a2y3g2vv5vlpvcpd45xdq6rs5djnrdkww536cwkas9zvy"))))
+         "0iijby2j9i6sbdc3iwhqqb8xlz25k3dpiyq91p7yybggpr2p1nw4"))))
     (properties
      `((upstream-name . "clusterProfiler")))
     (build-system r-build-system)
-- 
cgit 1.4.1


From 22db2a63fe2f24db8130e158482160576b14edca Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:55:08 +0200
Subject: gnu: r-flowcore: Update to 2.12.1.

* gnu/packages/bioconductor.scm (r-flowcore): Update to 2.12.1.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 8fbae054f4..d11345c9f6 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -15511,14 +15511,14 @@ interact with gated cytometry data.")
 (define-public r-flowcore
   (package
     (name "r-flowcore")
-    (version "2.12.0")
+    (version "2.12.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "flowCore" version))
        (sha256
         (base32
-         "1zkv4nwc6vg0jd4rh8mswdhr9cbq7ll98424hl5vs9hklal6kw8d"))))
+         "09jirhhf1qfanyhbq1ybmw6smv8163b7cqgj0qw69grvs8bb0b6m"))))
     (properties `((upstream-name . "flowCore")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From ad457d01147b8d6fcb4ee64b2dc2d699caa1d1ee Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 17 Jul 2023 14:55:08 +0200
Subject: gnu: r-experimenthub: Update to 2.8.1.

* gnu/packages/bioconductor.scm (r-experimenthub): Update to 2.8.1.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index d11345c9f6..8549d2404d 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -17777,14 +17777,14 @@ also known as views, in a controlled vocabulary.")
 (define-public r-experimenthub
   (package
     (name "r-experimenthub")
-    (version "2.8.0")
+    (version "2.8.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "ExperimentHub" version))
        (sha256
         (base32
-         "0n55p4n2aadxh182lxxms3bk4bpajamivvqj06v09q2n9xnhjs7k"))))
+         "1md6lan98h95jv776zyvl5im39gz4h6fdxw571vfahgr4b2nxvm4"))))
     (properties `((upstream-name . "ExperimentHub")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From a08d0b0baf35bb099bf58a7aca273c93ae74e1b3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: trurl: Update to 0.8.

* gnu/packages/curl.scm (trurl): Update to 0.8.
---
 gnu/packages/curl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index a5dc94e11a..23cee9b309 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -386,7 +386,7 @@ sugar and output formatting inspired from @code{httpie}.")
 (define-public trurl
   (package
     (name "trurl")
-    (version "0.5")
+    (version "0.8")
     (source
      (origin
        (method git-fetch)
@@ -395,7 +395,7 @@ sugar and output formatting inspired from @code{httpie}.")
              (commit (string-append name "-" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1mvkpjs6wnz5hzmp2iglik85zljrzglsa6fm839l78fhw89dg3w6"))))
+        (base32 "19zdpjp01n7s7zgixq3irqfnx66dmqf8zyp0dlb6y7ga673lqwi8"))))
     (build-system gnu-build-system)
     (arguments
      (list
-- 
cgit 1.4.1


From 416927772d30ec6846f717dfda295db56430e687 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:00 +0200
Subject: gnu: trurl: Improve description.

* gnu/packages/curl.scm (trurl)[synopsis]: Fix typo.
[description]: Reorder & tighten.
---
 gnu/packages/curl.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 23cee9b309..76fcc115cf 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -408,11 +408,11 @@ sugar and output formatting inspired from @code{httpie}.")
     (native-inputs (list python))
     (inputs (list curl))
     (home-page "https://curl.se/trurl/")
-    (synopsis "Command line tool for URL parsing and manipulatio")
-    (description "@code{trurl} is a tool in a similar spirit of @code{tr} but
-for URLs.  Here, @code{tr} stands for translate or transpose.
+    (synopsis "Command line tool for URL parsing and manipulation")
+    (description "@code{trurl} is a command line tool that parses and
+manipulates URLs, designed to help shell script authors everywhere.
 
-@code{trurl} is a command line tool that parses and manipulates URLs, designed
-to help shell script authors everywhere.")
+It is similar in spirit to @code{tr}.  Here, @code{tr} stands for translate or
+transpose.")
    (license (license:non-copyleft "file://COPYING"
                                   "See COPYING in the distribution."))))
-- 
cgit 1.4.1


From 4d87d98aeeade0d229d10052db2794091cf5daaf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:05 +0200
Subject: gnu: redis: Fetch over HTTPS.

* gnu/packages/databases.scm (redis)[source]: Use HTTPS.
---
 gnu/packages/databases.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index cc0f0d28e9..0c4cd24f6d 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2423,7 +2423,7 @@ similar to BerkeleyDB, LevelDB, etc.")
     (version "7.0.9")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://download.redis.io/releases/redis-"
+              (uri (string-append "https://download.redis.io/releases/redis-"
                                   version".tar.gz"))
               (sha256
                (base32
-- 
cgit 1.4.1


From 6c67d3b026365d283b80fafa94012d2b0ac646af Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: redis: Update to 7.0.12.

* gnu/packages/databases.scm (redis): Update to 7.0.12.
[arguments]: Ever so slightly tweak style.
---
 gnu/packages/databases.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 0c4cd24f6d..84cc22cc8f 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2420,14 +2420,14 @@ similar to BerkeleyDB, LevelDB, etc.")
 (define-public redis
   (package
     (name "redis")
-    (version "7.0.9")
+    (version "7.0.12")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://download.redis.io/releases/redis-"
                                   version".tar.gz"))
               (sha256
                (base32
-                "0rczzcy2mwy6hjdgg10l9lr4vavh8jrs7zlb0ba534bwlk13awgp"))
+                "1dwayif99cipf0xs26zipbnj800px31pbsxz747bzclb4xdkvn4x"))
               (modules '((guix build utils)))
               (snippet
                ;; Delete bundled jemalloc, as the package will use the libc one
@@ -2435,7 +2435,7 @@ similar to BerkeleyDB, LevelDB, etc.")
     (build-system gnu-build-system)
     (arguments
      (list
-      #:make-flags #~(list #$(string-append "CC=" (cc-for-target))
+      #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
                            "MALLOC=libc"
                            "LDFLAGS=-ldl"
                            (string-append "PREFIX=" #$output))
@@ -2452,7 +2452,7 @@ similar to BerkeleyDB, LevelDB, etc.")
                  (which "env")))))
           (add-after 'unpack 'adjust-tests
             (lambda _
-              ;; Disable failing tests
+              ;; Disable failing tests.
               (substitute* "tests/test_helper.tcl"
                 ;; The AOF tests cause the test suite to hang waiting for a
                 ;; "background AOF rewrite to finish", perhaps because dead
-- 
cgit 1.4.1


From a4a47b49c88c84ec6e06c070af3ff815990c0345 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: vdirsyncer: Update to 0.19.2.

* gnu/packages/dav.scm (vdirsyncer): Update to 0.19.2.
---
 gnu/packages/dav.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index 7eb62401e9..3f865ac0b3 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -122,13 +122,13 @@ efficient syncing
 (define-public vdirsyncer
   (package
     (name "vdirsyncer")
-    (version "0.19.1")
+    (version "0.19.2")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri name version))
              (sha256
               (base32
-               "1bh3kz0d8g07xnlkb5l2fj6fdakqps1wviab6zv139x5b9rcfxma"))))
+               "1fl21m10ghrpmkqa12g0qri99cxk9879pkb60jd4b4w2mgp8q1gx"))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f ; The test suite is very flakey.
-- 
cgit 1.4.1


From 25e4acb84ef3ce30d095f9bd6b470fa32d7eb847 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: vdirsyncer: Use G-expressions.

* gnu/packages/dav.scm (vdirsyncer)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/dav.scm | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index 3f865ac0b3..50274fa8cb 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -24,6 +24,7 @@
 (define-module (gnu packages dav)
   #:use-module (guix build-system python)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix git-download)
@@ -131,20 +132,23 @@ efficient syncing
                "1fl21m10ghrpmkqa12g0qri99cxk9879pkb60jd4b4w2mgp8q1gx"))))
     (build-system python-build-system)
     (arguments
-     `(#:tests? #f ; The test suite is very flakey.
-       #:phases (modify-phases %standard-phases
-        (replace 'check
-          (lambda* (#:key inputs outputs tests? #:allow-other-keys)
-            (add-installed-pythonpath inputs outputs)
-            (setenv "DETERMINISTIC_TESTS" "true")
-            (setenv "DAV_SERVER" "radicale")
-            (setenv "REMOTESTORAGE_SERVER" "skip")
-            (if tests?
-                (invoke "make" "test"))))
-        (add-after 'unpack 'patch-version-call
-          (lambda _
-            (substitute* "docs/conf.py"
-              (("^release.*") (string-append "release = '" ,version "'\n"))))))))
+     (list
+      #:tests? #f                       ; the test suite is very flakey
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+              (add-installed-pythonpath inputs outputs)
+              (setenv "DETERMINISTIC_TESTS" "true")
+              (setenv "DAV_SERVER" "radicale")
+              (setenv "REMOTESTORAGE_SERVER" "skip")
+              (if tests?
+                  (invoke "make" "test"))))
+          (add-after 'unpack 'patch-version-call
+            (lambda _
+              (substitute* "docs/conf.py"
+                (("^release.*")
+                 (string-append "release = '" #$version "'\n"))))))))
     (native-inputs
      (list python-setuptools-scm
            python-sphinx
-- 
cgit 1.4.1


From 560e61e5eb795493fd5f34a4de648b574c519eaf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: virtuoso-ose: Update to 7.2.10.

* gnu/packages/databases.scm (virtuoso-ose): Update to 7.2.10.
---
 gnu/packages/databases.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 84cc22cc8f..d95b363249 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3321,14 +3321,14 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
 (define-public virtuoso-ose
   (package
     (name "virtuoso-ose")
-    (version "7.2.9")
+    (version "7.2.10")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://sourceforge/virtuoso/virtuoso/" version "/"
                            "virtuoso-opensource-" version ".tar.gz"))
        (sha256
-        (base32 "145s4lqixdxa3j0lp9lgzbb664zzy1imw04hmgia5y5679i8r0xy"))
+        (base32 "03vznas39valis02zk0hnli7x5asiam4rxzqhr58agzkdyb0lay0"))
        (patches (search-patches "virtuoso-ose-remove-pre-built-jar-files.patch"))
        (modules '((guix build utils)))
        ;; This snippet removes pre-built Java archives.
-- 
cgit 1.4.1


From ae8a4de1417887759d383645b040b5d7b06c0a44 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: virtuoso-ose: Use G-expressions.

* gnu/packages/databases.scm (virtuoso-ose)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/databases.scm | 128 +++++++++++++++++++++++----------------------
 1 file changed, 65 insertions(+), 63 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index d95b363249..6e8fe4cfb6 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3333,71 +3333,73 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
        (modules '((guix build utils)))
        ;; This snippet removes pre-built Java archives.
        (snippet
-        '(for-each delete-file-recursively
-                   (list "binsrc/hibernate"
-                         "binsrc/jena"
-                         "binsrc/jena2"
-                         "binsrc/jena3"
-                         "binsrc/jena4"
-                         "binsrc/rdf4j"
-                         "binsrc/sesame"
-                         "binsrc/sesame2"
-                         "binsrc/sesame3"
-                         "binsrc/sesame4"
-                         "libsrc/JDBCDriverType4")))))
+        #~(for-each delete-file-recursively
+                    (list "binsrc/hibernate"
+                          "binsrc/jena"
+                          "binsrc/jena2"
+                          "binsrc/jena3"
+                          "binsrc/jena4"
+                          "binsrc/rdf4j"
+                          "binsrc/sesame"
+                          "binsrc/sesame2"
+                          "binsrc/sesame3"
+                          "binsrc/sesame4"
+                          "libsrc/JDBCDriverType4")))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f ; Tests require a network connection.
-       ;; TODO: Removing the libsrc/zlib source directory breaks the build.
-       ;; This indicates that the internal zlib code may still be used.
-       #:configure-flags '("--without-internal-zlib"
-                           "--with-readline"
-                           "--enable-static=no")
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'bootstrap
-           (lambda _
-             (invoke "sh" "autogen.sh")))
-         (add-after 'unpack 'avoid-embedding-kernel-and-timestamps
-           ;; For a reproducible build, avoid embedding the kernel version and
-           ;; timestamps.
-           (lambda _
-             (substitute*
-                 (list "bin/makever"
-                       "appsrc/ODS-Polls/make_vad.sh"
-                       "appsrc/ODS-Blog/make_vad.sh"
-                       "appsrc/ODS-Community/make_vad.sh"
-                       "appsrc/ODS-Framework/make_vad.sh"
-                       "appsrc/ODS-Framework/oauth/make_vad.sh"
-                       "appsrc/ODS-WebMail/make_vad.sh"
-                       "appsrc/ODS-Calendar/make_vad.sh"
-                       "appsrc/ODS-Gallery/make_vad.sh"
-                       "appsrc/ODS-Briefcase/make_vad.sh"
-                       "appsrc/ODS-FeedManager/make_vad.sh"
-                       "appsrc/ODS-Bookmark/make_vad.sh"
-                       "appsrc/ODS-Addressbook/make_vad.sh"
-                       "binsrc/dbpedia/make_vad.sh"
-                       "binsrc/samples/demo/make_vad.sh"
-                       "binsrc/samples/demo/mkdoc.sh"
-                       "binsrc/samples/sparql_demo/make_vad.sh"
-                       "binsrc/bpel/make_vad.sh"
-                       "binsrc/fct/make_vad.sh"
-                       "binsrc/rdf_mappers/make_vad.sh"
-                       "binsrc/isparql/make_vad.sh"
-                       "binsrc/conductor/mkvad.sh")
-               (("^UNAME_SYSTEM=.*") "UNAME_SYSTEM=unknown\n")
-               (("^UNAME_RELEASE=.*") "UNAME_RELEASE=unknown\n")
-               (("^PACKDATE=.*") "PACKDATE=2012-04-18\n")
-               (("^DATE=.*") "DATE=2012-04-18\n"))))
-         ;; Even with "--enable-static=no", "libvirtuoso-t.a" is left in
-         ;; the build output.  The following phase removes it.
-         (add-after 'install 'remove-static-libs
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((lib (string-append (assoc-ref outputs "out") "/lib")))
-               (for-each (lambda (file)
-                           (delete-file (string-append lib "/" file)))
-                         '("libvirtuoso-t.a"
-                           "libvirtuoso-t.la"))))))))
+     (list
+      #:tests? #f                       ; tests require a network connection
+      ;; TODO: Removing the libsrc/zlib source directory breaks the build.
+      ;; This indicates that the internal zlib code may still be used.
+      #:configure-flags
+      #~(list "--without-internal-zlib"
+              "--with-readline"
+              "--enable-static=no")
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'bootstrap
+            (lambda _
+              (invoke "sh" "autogen.sh")))
+          (add-after 'unpack 'avoid-embedding-kernel-and-timestamps
+            ;; For a reproducible build, avoid embedding the kernel version and
+            ;; timestamps.
+            (lambda _
+              (substitute*
+                  (list "bin/makever"
+                        "appsrc/ODS-Polls/make_vad.sh"
+                        "appsrc/ODS-Blog/make_vad.sh"
+                        "appsrc/ODS-Community/make_vad.sh"
+                        "appsrc/ODS-Framework/make_vad.sh"
+                        "appsrc/ODS-Framework/oauth/make_vad.sh"
+                        "appsrc/ODS-WebMail/make_vad.sh"
+                        "appsrc/ODS-Calendar/make_vad.sh"
+                        "appsrc/ODS-Gallery/make_vad.sh"
+                        "appsrc/ODS-Briefcase/make_vad.sh"
+                        "appsrc/ODS-FeedManager/make_vad.sh"
+                        "appsrc/ODS-Bookmark/make_vad.sh"
+                        "appsrc/ODS-Addressbook/make_vad.sh"
+                        "binsrc/dbpedia/make_vad.sh"
+                        "binsrc/samples/demo/make_vad.sh"
+                        "binsrc/samples/demo/mkdoc.sh"
+                        "binsrc/samples/sparql_demo/make_vad.sh"
+                        "binsrc/bpel/make_vad.sh"
+                        "binsrc/fct/make_vad.sh"
+                        "binsrc/rdf_mappers/make_vad.sh"
+                        "binsrc/isparql/make_vad.sh"
+                        "binsrc/conductor/mkvad.sh")
+                (("^UNAME_SYSTEM=.*") "UNAME_SYSTEM=unknown\n")
+                (("^UNAME_RELEASE=.*") "UNAME_RELEASE=unknown\n")
+                (("^PACKDATE=.*") "PACKDATE=2012-04-18\n")
+                (("^DATE=.*") "DATE=2012-04-18\n"))))
+          ;; Even with "--enable-static=no", "libvirtuoso-t.a" is left in
+          ;; the build output.  The following phase removes it.
+          (add-after 'install 'remove-static-libs
+            (lambda _
+              (for-each
+               (lambda (file)
+                 (delete-file (string-append #$output "/lib/" file)))
+               '("libvirtuoso-t.a"
+                 "libvirtuoso-t.la")))))))
     (native-inputs
      (list autoconf automake bison flex gperf libtool))
     (inputs
-- 
cgit 1.4.1


From b499be6e20fcdb40bdb0d31c49079efdcfef55fe Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: xandikos: Update to 0.2.8.

* gnu/packages/dav.scm (xandikos): Update to 0.2.8.
---
 gnu/packages/dav.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index 50274fa8cb..e0306b8a97 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -85,13 +85,13 @@ clients.")
 (define-public xandikos
   (package
     (name "xandikos")
-    (version "0.2.3")
+    (version "0.2.8")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "xandikos" version))
        (sha256
-        (base32 "13ikmcja9p42azb5ccqj2bw98zybna6zlflj10hqy0kvbib70l94"))))
+        (base32 "00ghmzcc37b17pp0r6d9v5vpxmz500kzxqj1k9ppcjhbbpvp9w8n"))))
     (build-system python-build-system)
     (propagated-inputs
      (list python-aiohttp
-- 
cgit 1.4.1


From 62bd53dbb9afef108d56ffb3da948625ce47989e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:03 +0200
Subject: gnu: sdcv: Update to 0.5.5.

* gnu/packages/dictionaries.scm (sdcv): Update to 0.5.5.
[arguments]: ...don't we?  Remove the 'remove-jq-requirement phase.
[native-inputs]: Add jq.
---
 gnu/packages/dictionaries.scm | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index ea7ba538e8..06b5c4362c 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -53,6 +53,7 @@
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages tcl)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xml))
 
 
@@ -391,7 +392,7 @@ intelligible and easily correctable.")
 (define-public sdcv
   (package
     (name "sdcv")
-    (version "0.5.3")
+    (version "0.5.5")
     (source
      (origin
        (method git-fetch)
@@ -400,8 +401,7 @@ intelligible and easily correctable.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "144qpl9b8r2php0zhi9b7vg6flpvdgjy6yfaipydwwhxi4wy9600"))))
+        (base32 "17jwcgc3jdp41rvxqi7zdsysfpjgzqq4z1l345qwffp1an6yaaqk"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-DBUILD_TESTS=YES")
@@ -413,16 +413,13 @@ intelligible and easily correctable.")
          (add-before 'check 'pre-check
            (lambda _
              (setenv "HOME" (getcwd))
-             #t))
-         (add-after 'unpack 'remove-jq-requirement
-           (lambda _
-             ;; We don't want to bring in jq for one test.
-             (substitute* "tests/t_json"
-               (("jq") "echo"))
              #t)))))
     (native-inputs
      `(("gettext" ,gettext-minimal)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+
+       ;; For tests.
+       ("jq" ,jq)))
     (inputs
      (list glib ncurses readline zlib))
     (home-page "https://dushistov.github.io/sdcv/")
-- 
cgit 1.4.1


From 2db3fa4a7677ee7b7491bf037cf5e12ab1206ef3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: diffoscope: Update to 244.

* gnu/packages/diffoscope.scm (diffoscope): Update to 244.
---
 gnu/packages/diffoscope.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 8f43945009..4d3908cdf3 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -74,7 +74,7 @@
 (define-public diffoscope
   (package
     (name "diffoscope")
-    (version "242")
+    (version "244")
     (source
      (origin
        (method git-fetch)
@@ -83,7 +83,7 @@
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1aa6cszav4bgiljhkly0l3bzn4kggkncrk1zbc6hdm361r8yrw34"))))
+        (base32 "16v6p970kckyv5pa93sj7r5k4b0hgbyralvzddbj73g7srysa02v"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
-- 
cgit 1.4.1


From aeb6cdacbc3e245c515cd2c1dde869c462754687 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: diffoscope: Use G-expressions.

* gnu/packages/diffoscope.scm (diffoscope)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/diffoscope.scm | 108 ++++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 53 deletions(-)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 4d3908cdf3..61bd23f3e2 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -86,59 +86,61 @@
         (base32 "16v6p970kckyv5pa93sj7r5k4b0hgbyralvzddbj73g7srysa02v"))))
     (build-system python-build-system)
     (arguments
-     `(#:phases (modify-phases %standard-phases
-                  ;; These tests are broken because our `file` package has a
-                  ;; bug in berkeley-db and wasm file type detection.
-                  (add-after 'unpack 'remove-broken-file-type-detection-test
-                    (lambda _
-                      (delete-file "tests/comparators/test_berkeley_db.py")
-                      (delete-file "tests/comparators/test_wasm.py")))
-                  (add-after 'unpack 'embed-tool-references
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      (substitute* "diffoscope/comparators/utils/compare.py"
-                        (("\\[\"xxd\",")
-                         (string-append "[\"" (which "xxd") "\",")))
-                      (substitute* "diffoscope/diff.py"
-                        (("@tool_required\\(\"diff\"\\)") "")
-                        (("get_tool_name\\(\"diff\"\\)")
-                         (string-append "get_tool_name(\"" (which "diff") "\")")))
-                      (substitute* "diffoscope/comparators/directory.py"
-                        (("@tool_required\\(\"stat\"\\)") "")
-                        (("@tool_required\\(\"getfacl\"\\)") "")
-                        (("\\[\"stat\",")
-                         (string-append "[\"" (which "stat") "\","))
-                        (("\\[\"getfacl\",")
-                         (string-append "[\"" (which "getfacl") "\",")))))
-                  (add-after 'build 'build-man-page
-                    (lambda _
-                      (invoke "make" "-C" "doc")))
-                  (add-before 'check 'writable-test-data
-                    (lambda _
-                      ;; Tests may need write access to tests directory.
-                      (for-each make-file-writable (find-files "tests"))))
-                  (add-before 'check 'fix-failing-test
-                    (lambda _
-                      ;; There is no user name mapping in the build environment.
-                      ;; Pytest made it so much harder than should be necessary,
-                      ;; so I'm leaving… this here in case I ever need it again:
-                      ;; (substitute* "tests/comparators/test_squashfs.py"
-                      ;;   (("^def test_symlink_root.*" match)     ; no, I don't
-                      ;;    (string-append                         ; know Python
-                      ;;     match "\n    raise ValueError("       ; why do you
-                      ;;     "differences_root[1].unified_diff)\n"))) ; ask
-                      (substitute* "tests/data/squashfs_root_expected_diff"
-                        (("root/root")
-                         '"0/0      "))))
-                  (add-before 'check 'delete-failing-test
-                    ;; Please add new tests to fix-failing-test and not here ;-)
-                    (lambda _
-                      ;; This requires /sbin to be in $PATH.
-                      (delete-file "tests/test_tools.py")))
-                  (add-after 'install 'install-man-page
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let* ((out (assoc-ref outputs "out"))
-                             (man (string-append out "/share/man/man1")))
-                        (install-file "doc/diffoscope.1" man)))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; These tests are broken because our `file` package has a
+          ;; bug in berkeley-db and wasm file type detection.
+          (add-after 'unpack 'remove-broken-file-type-detection-test
+            (lambda _
+              (delete-file "tests/comparators/test_berkeley_db.py")
+              (delete-file "tests/comparators/test_wasm.py")))
+          (add-after 'unpack 'embed-tool-references
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "diffoscope/comparators/utils/compare.py"
+                (("\\[\"xxd\",")
+                 (string-append "[\"" (which "xxd") "\",")))
+              (substitute* "diffoscope/diff.py"
+                (("@tool_required\\(\"diff\"\\)") "")
+                (("get_tool_name\\(\"diff\"\\)")
+                 (string-append "get_tool_name(\"" (which "diff") "\")")))
+              (substitute* "diffoscope/comparators/directory.py"
+                (("@tool_required\\(\"stat\"\\)") "")
+                (("@tool_required\\(\"getfacl\"\\)") "")
+                (("\\[\"stat\",")
+                 (string-append "[\"" (which "stat") "\","))
+                (("\\[\"getfacl\",")
+                 (string-append "[\"" (which "getfacl") "\",")))))
+          (add-after 'build 'build-man-page
+            (lambda _
+              (invoke "make" "-C" "doc")))
+          (add-before 'check 'writable-test-data
+            (lambda _
+              ;; Tests may need write access to tests directory.
+              (for-each make-file-writable (find-files "tests"))))
+          (add-before 'check 'fix-failing-test
+            (lambda _
+              ;; There is no user name mapping in the build environment.
+              ;; Pytest made it so much harder than should be necessary,
+              ;; so I'm leaving… this here in case I ever need it again:
+              ;; (substitute* "tests/comparators/test_squashfs.py"
+              ;;   (("^def test_symlink_root.*" match)     ; no, I don't
+              ;;    (string-append                         ; know Python
+              ;;     match "\n    raise ValueError("       ; why do you
+              ;;     "differences_root[1].unified_diff)\n"))) ; ask
+              (substitute* "tests/data/squashfs_root_expected_diff"
+                (("root/root")
+                 '"0/0      "))))
+          (add-before 'check 'delete-failing-test
+            ;; Please add new tests to fix-failing-test and not here ;-)
+            (lambda _
+              ;; This requires /sbin to be in $PATH.
+              (delete-file "tests/test_tools.py")))
+          (add-after 'install 'install-man-page
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (man (string-append out "/share/man/man1")))
+                (install-file "doc/diffoscope.1" man)))))))
     (inputs (list rpm                   ;for rpm-python
                   python-debian
                   python-libarchive-c
-- 
cgit 1.4.1


From ba9fdaa81439004889f944f6ccef794abd33c907 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: diffoscope: Don't embed build-time references.

* gnu/packages/diffoscope.scm (diffoscope)[arguments]:
Avoid using WHICH in the 'embed-tool-references phase.
---
 gnu/packages/diffoscope.scm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 61bd23f3e2..5846c4cbd4 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -97,20 +97,22 @@
               (delete-file "tests/comparators/test_wasm.py")))
           (add-after 'unpack 'embed-tool-references
             (lambda* (#:key inputs #:allow-other-keys)
+              (define (bin command)
+                (search-input-file inputs (string-append "bin/" command)))
               (substitute* "diffoscope/comparators/utils/compare.py"
-                (("\\[\"xxd\",")
-                 (string-append "[\"" (which "xxd") "\",")))
+                (("\\[\"(xxd)\"," _ command)
+                 (string-append "[\"" (bin command) "\",")))
               (substitute* "diffoscope/diff.py"
                 (("@tool_required\\(\"diff\"\\)") "")
-                (("get_tool_name\\(\"diff\"\\)")
-                 (string-append "get_tool_name(\"" (which "diff") "\")")))
+                (("get_tool_name\\(\"(diff)\"\\)" _ command)
+                 (string-append "get_tool_name(\"" (bin command) "\")")))
               (substitute* "diffoscope/comparators/directory.py"
                 (("@tool_required\\(\"stat\"\\)") "")
                 (("@tool_required\\(\"getfacl\"\\)") "")
-                (("\\[\"stat\",")
-                 (string-append "[\"" (which "stat") "\","))
-                (("\\[\"getfacl\",")
-                 (string-append "[\"" (which "getfacl") "\",")))))
+                (("\\[\"(stat)\"," _ command)
+                 (string-append "[\"" (bin command) "\","))
+                (("\\[\"(getfacl)\"," _ command)
+                 (string-append "[\"" (bin command) "\",")))))
           (add-after 'build 'build-man-page
             (lambda _
               (invoke "make" "-C" "doc")))
-- 
cgit 1.4.1


From f7c3a2a86e6e5f98f1a2c4a96e0b6f014aec6e23 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: ddcutil: Update to 1.4.2.

* gnu/packages/hardware.scm (ddcutil): Update to 1.4.2.
---
 gnu/packages/hardware.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index c44f0eda04..8a16c1766d 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -488,14 +488,14 @@ RGB animations.")
 (define-public ddcutil
   (package
     (name "ddcutil")
-    (version "1.4.1")
+    (version "1.4.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.ddcutil.com/tarballs/"
                            "ddcutil-" version ".tar.gz"))
        (sha256
-        (base32 "14svdjpw9xn1czl4vff4jg2i9bp83lxcbzxj7hxn63z3gzacaj4k"))))
+        (base32 "015l13j7fp9fmlc5d7m6nfjbzjbp8vc0g5py35ljw7li2xk16v60"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config))
-- 
cgit 1.4.1


From 0393495c16b885f0e10c88f0a7ac2e9e4dbf304f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:03 +0200
Subject: gnu: unbound: Update to 1.17.1.

* gnu/packages/dns.scm (unbound): Update to 1.17.1.
[arguments]: Don't explicitly return #t from phases.
---
 gnu/packages/dns.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 9879998776..e4c48df174 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -636,14 +636,14 @@ BIND and djbdns---whilst using relatively little memory.")
 (define-public unbound
   (package
     (name "unbound")
-    (version "1.17.0")
+    (version "1.17.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.unbound.net/downloads/unbound-"
                            version ".tar.gz"))
        (sha256
-        (base32 "0h8k5yh49vasyzwkm3n1xsidxr7xybqwkvg4cq6937qxi7brbg6w"))))
+        (base32 "1x55f5aqlzynpy24ryf1rsmdy8m8iyi19n7k03k889g1rk78ah7f"))))
     (build-system gnu-build-system)
     (outputs '("out" "python"))
     (native-inputs
@@ -678,8 +678,7 @@ BIND and djbdns---whilst using relatively little memory.")
                  (("^PYTHON_SITE_PKG=.*$")
                   (string-append
                    "PYTHON_SITE_PKG="
-                   pyout "/lib/python-" ver "/site-packages\n"))))
-             #t))
+                   pyout "/lib/python-" ver "/site-packages\n"))))))
          (add-before 'check 'fix-missing-nss-for-tests
            ;; Unfortunately, the package's unittests involve some checks
            ;; looking up protocols and services which are not provided
@@ -780,8 +779,7 @@ struct servent *getservbyport(int port, const char *proto) {
                ;; The preload library only affects the unittests.
                (substitute* "Makefile"
                  (("./unittest")
-                  "LD_PRELOAD=/tmp/nss_preload.so ./unittest")))
-             #t)))))
+                  "LD_PRELOAD=/tmp/nss_preload.so ./unittest"))))))))
     (home-page "https://www.unbound.net")
     (synopsis "Validating, recursive, and caching DNS resolver")
     (description
-- 
cgit 1.4.1


From 72bd1abaee2b87b3c6aadda50c186177f00f559a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: libburn: Update to 1.5.6.

* gnu/packages/cdrom.scm (libburn): Update to 1.5.6.
---
 gnu/packages/cdrom.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index dbaa67efb6..1866a261dc 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -850,14 +850,14 @@ laid out on the image.")
 (define-public libburn
   (package
     (name "libburn")
-    (version "1.5.4")
+    (version "1.5.6")
     (source (origin
              (method url-fetch)
              (uri (string-append "http://files.libburnia-project.org/releases/"
                                  "libburn-" version ".tar.gz"))
              (sha256
               (base32
-               "0m1vyry6pi115nysfgb0cg313qqhnlxqdg7f920wpiar0z8mjl2j"))))
+               "0jv447ixwvj68vslbgbbvkzmaabf4dz0dcizg9garvp59cdlk5bj"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config))
-- 
cgit 1.4.1


From f1b546af68cc097c02a0ead2a8a3bb65d4022a04 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:13 +0200
Subject: gnu: libisofs: Update to 1.5.6.pl01.

* gnu/packages/cdrom.scm (libisofs): Update to 1.5.6.pl01.
---
 gnu/packages/cdrom.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 1866a261dc..c0fecc9fdc 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -872,14 +872,14 @@ DVD-RW, DVD-R, DVD-R/DL, BD-R, and BD-RE.")
 (define-public libisofs
   (package
     (name "libisofs")
-    (version "1.5.4")
+    (version "1.5.6.pl01")
     (source (origin
              (method url-fetch)
              (uri (string-append "http://files.libburnia-project.org/releases/"
                                  "libisofs-" version ".tar.gz"))
              (sha256
               (base32
-               "13m82l13cb5d7ca53dv3akma1jr9gw0hnnshdwqpj6ahly0fv85a"))))
+               "09czddjriv2zi1bdsck8a31ci6xpi1qr2rqmzfhlqx21sqwd67xc"))))
     (build-system gnu-build-system)
     (inputs
      (list zlib acl))
-- 
cgit 1.4.1


From 46713e522051e6e9db6ab9174a8516d30ce09220 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: zutils: Update to 1.12.

* gnu/packages/compression.scm (zutils): Update to 1.12.
[arguments]: Remove obsolete 'disable-failing-tests phase.
---
 gnu/packages/compression.scm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index e7ff85c5ef..efc869d16e 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2412,26 +2412,19 @@ To download a zchunk file.
 (define-public zutils
   (package
     (name "zutils")
-    (version "1.10")
+    (version "1.12")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://savannah/zutils/zutils-" version ".tar.lz"))
        (sha256
-        (base32 "15dimqp8zlqaaa2l46r22srp1py38mlmn69ph1j5fmrd54w43m0d"))))
+        (base32 "1vl8mhvsl0zlh34hwhc05vj33a2xfr0w7i978hcwaw8wn1w59bkq"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
        (list "--sysconfdir=/etc")
        #:phases
        (modify-phases %standard-phases
-         (add-before 'check 'disable-failing-tests
-           ;; XXX https://lists.nongnu.org/archive/html/zutils-bug/2020-07/msg00005.html
-           (lambda _
-             (substitute* "testsuite/check.sh"
-               (("\"\\$\\{ZGREP\\}\" -N -L \"GNU\"") "true")
-               (("\"\\$\\{ZGREP\\}\" -N -L \"nx_pattern\"") "false"))
-             #t))
          (replace 'install
           (lambda* (#:key make-flags outputs #:allow-other-keys)
             (apply invoke "make" "install"
-- 
cgit 1.4.1


From 05b8222096dc271a2793913c0a300fba18c55c8e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:00 +0200
Subject: gnu: zutils: Use G-expressions.

* gnu/packages/compression.scm (zutils)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/compression.scm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index efc869d16e..a14cbe982b 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2421,16 +2421,16 @@ To download a zchunk file.
         (base32 "1vl8mhvsl0zlh34hwhc05vj33a2xfr0w7i978hcwaw8wn1w59bkq"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags
-       (list "--sysconfdir=/etc")
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'install
-          (lambda* (#:key make-flags outputs #:allow-other-keys)
-            (apply invoke "make" "install"
-                   (string-append "sysconfdir=" (assoc-ref outputs "out")
-                                  "/etc")
-                   make-flags))))))
+     (list
+      #:configure-flags
+      #~(list "--sysconfdir=/etc")
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'install
+            (lambda* (#:key make-flags #:allow-other-keys)
+              (apply invoke "make" "install"
+                     (string-append "sysconfdir=" #$output "/etc")
+                     make-flags))))))
     (native-inputs
      ;; Needed to extract the source tarball and run the test suite.
      (list lzip))
-- 
cgit 1.4.1


From c859bfe63337a38aed1cb6910d7846219af94f52 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: xarchiver: Update to 0.5.4.21.

* gnu/packages/compression.scm (xarchiver): Update to 0.5.4.21.
---
 gnu/packages/compression.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index a14cbe982b..da7df1daa5 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2532,7 +2532,7 @@ file compression algorithm.")
 (define-public xarchiver
   (package
     (name "xarchiver")
-    (version "0.5.4.20")
+    (version "0.5.4.21")
     (source
      (origin
        (method git-fetch)
@@ -2541,7 +2541,7 @@ file compression algorithm.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1bgc8r2ii96ghslfscpjhswjgscvw65h2rjr0zvfqn8saqh1ydrv"))))
+        (base32 "0m3vq1mh2vg5r7vhnwjkfhix6i2cm15z82xsi6zaqvc4zkswb2m5"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list gettext-minimal intltool libxslt pkg-config))
-- 
cgit 1.4.1


From 57fe5b2338dfbb150d3921e9da3d9719fef6c9d9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: hplip: Update to 3.23.5.

* gnu/packages/cups.scm (hplip): Update to 3.23.5.
---
 gnu/packages/cups.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index eede1e1a05..801fe2e643 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -514,14 +514,14 @@ should only be used as part of the Guix cups-pk-helper service.")
 (define-public hplip
   (package
     (name "hplip")
-    (version "3.23.3")
+    (version "3.23.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/hplip/hplip/" version
                                   "/hplip-" version ".tar.gz"))
               (sha256
                (base32
-                "1dh7gqhzv03a6j1kbkiaksy9a752k90xwqi5x0hqvn5ilac0l9p4"))
+                "1j6bjn4zplxl7w15xrc1v5l3p9a0x0345756ahvgq8mi97bmx3pn"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
cgit 1.4.1


From 2a1c1a108db63aec2088dcfb0b52d8d228df903f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: epson-inkjet-printer-escpr: Document missing newer tarballs.

* gnu/packages/cups.scm (epson-inkjet-printer-escpr)[source]:
Add more bad news to comment.
---
 gnu/packages/cups.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 801fe2e643..9d81a0aa07 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -860,9 +860,9 @@ HP@tie{}LaserJet, and possibly other printers.  See @file{README} for details.")
   (package
     (name "epson-inkjet-printer-escpr")
     (version "1.7.24")
-    ;; XXX: This currently works.  But it will break as soon as a newer
-    ;; version is available since the URLs for older versions are not
-    ;; preserved.  An alternative source will be added as soon as
+    ;; XXX: This currently works.  But it will break as soon as a newer version
+    ;; is available since the URLs for older versions are not preserved.  Since
+    ;; 1.8.0, source tarballs have been discontinued and only a ‘source RPM’ is
     ;; available.
     (source
      (origin
-- 
cgit 1.4.1


From a22a6c4ce59e54260919da30b06cb58f933a0f8e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: zchunk: Update to 1.3.1.

* gnu/packages/compression.scm (zchunk): Update to 1.3.1.
---
 gnu/packages/compression.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index da7df1daa5..57b87ac1d2 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2361,7 +2361,7 @@ reading from and writing to ZIP archives.")
 (define-public zchunk
   (package
     (name "zchunk")
-    (version "1.2.2")
+    (version "1.3.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2370,7 +2370,7 @@ reading from and writing to ZIP archives.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0q0avb0397xkmidl8rxasfywp0r7w3awk6271pa2d9xl9p1n82zy"))))
+                "19rw870150w1c730wzg2pn68ixmscq8cwa3vricqhwxs5l63r5wr"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
-- 
cgit 1.4.1


From 3135d2cbfb85f7ede123d0af6ef2bdf8b4b1cb8d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:04 +0200
Subject: gnu: zchunk: Use G-expressions.

* gnu/packages/compression.scm (zchunk)[arguments]:
Rewrite as G-expressions.  Use SEARCH-INPUT-FILE.
---
 gnu/packages/compression.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 57b87ac1d2..63b6858afe 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2373,13 +2373,14 @@ reading from and writing to ZIP archives.")
                 "19rw870150w1c730wzg2pn68ixmscq8cwa3vricqhwxs5l63r5wr"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'patch-paths
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      (substitute* "src/zck_gen_zdict.c"
-                        (("/usr/bin/zstd")
-                         (string-append (assoc-ref inputs "zstd")
-                                        "/bin/zstd"))))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-file-name
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "src/zck_gen_zdict.c"
+                (("/usr/(bin/zstd)" _ file)
+                 (string-append (search-input-file inputs file)))))))))
     (native-inputs
      (list pkg-config))
     (inputs
-- 
cgit 1.4.1


From a81e46dbe5136575196664b9b1c4c559439892d2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: zchunk: Remove input labels.

* gnu/packages/compression.scm (zchunk)[propagated-inputs]:
Remove input labels.
---
 gnu/packages/compression.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 63b6858afe..09ac57668d 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2386,7 +2386,7 @@ reading from and writing to ZIP archives.")
     (inputs
      (list curl zstd))
     (propagated-inputs
-     `(("zstd:lib" ,zstd "lib")))       ;in Requires.private of zck.pc
+     (list `(,zstd "lib")))             ; in Requires.private of zck.pc
     (home-page "https://github.com/zchunk/zchunk")
     (synopsis "Compressed file format for efficient deltas")
     (description "The zchunk compressed file format allows splitting a file
-- 
cgit 1.4.1


From 08e2a497be3c0016695b6bfb0e22986908c54e9c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:03 +0200
Subject: gnu: stress: Update to 1.0.7.

* gnu/packages/admin.scm (stress): Update to 1.0.7.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index e9e949bf14..d0b9f4beb9 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2472,14 +2472,14 @@ utilization, temperature and power.")
 (define-public stress
   (package
     (name "stress")
-    (version "1.0.5")
+    (version "1.0.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://debian/pool/main/s/stress/stress_"
                                   version ".orig.tar.gz"))
               (sha256
                (base32
-                "09shpd85g8dvpiw0mnwykss676g0s7lbi8ab37xjinb5lfff960p"))))
+                "1cg0mklfrwfyzwqkzidd0151r8n2jgbiiqz1v0p3w4q62mkmdand"))))
     (build-system gnu-build-system)
     (native-inputs
      (list autoconf automake))
-- 
cgit 1.4.1


From d63a3c68fc8406501e2b979dcee583b35f98bd03 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: jc: Update to 1.23.3.

* gnu/packages/admin.scm (jc): Update to 1.23.3.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d0b9f4beb9..4d645bbc79 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4826,7 +4826,7 @@ LUKS volumes encrypted with the user's log-in password.")
 (define-public jc
   (package
     (name "jc")
-    (version "1.23.2")
+    (version "1.23.3")
     (source
      (origin
        ;; The PyPI tarball lacks the test suite.
@@ -4836,7 +4836,7 @@ LUKS volumes encrypted with the user's log-in password.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "17g2q0h3jwzfm80ldl8inpyh5y0qzzmgvyg10gkk1rp8i34wfgly"))))
+        (base32 "02rylrh2dr593xf2l865lvvxnsb9337nd4fiqbahfyz4cbqgzq3x"))))
     (build-system pyproject-build-system)
     (arguments
      (list #:phases
-- 
cgit 1.4.1


From 7a415ef535a8eeca9cc8411c256cdf6c1bb847e2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: inxi-minimal: Update to 3.3.28-1.

* gnu/packages/admin.scm (inxi-minimal): Update to 3.3.28-1.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 4d645bbc79..aea6d30bd2 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4406,7 +4406,7 @@ Python loading in HPC environments.")
   (let ((real-name "inxi"))
     (package
       (name "inxi-minimal")
-      (version "3.3.25-1")
+      (version "3.3.28-1")
       (source
        (origin
          (method git-fetch)
@@ -4415,7 +4415,7 @@ Python loading in HPC environments.")
                (commit version)))
          (file-name (git-file-name real-name version))
          (sha256
-          (base32 "0mak2f06xzalccgaij9fsi20600sg05v0pmg0blvy6hvq5kh97k3"))))
+          (base32 "0h00dasmw3crci8kwpa503jljy3c5r2fsdhpbbczhsgznhlr8pbi"))))
       (build-system trivial-build-system)
       (inputs
        (list bash-minimal
-- 
cgit 1.4.1


From 460a555ee779decf219161bd566cbe12c55e0b87 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:00 +0200
Subject: gnu: s-tui: Update to 1.1.4.

* gnu/packages/admin.scm (s-tui): Update to 1.1.4.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index aea6d30bd2..31e6a07f48 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2452,13 +2452,13 @@ development, not the kernel implementation of ACPI.")
 (define-public s-tui
   (package
     (name "s-tui")
-    (version "1.1.3")
+    (version "1.1.4")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "s-tui" version))
        (sha256
-        (base32 "1l2ik5iwmb8vxa2aqdy62zfy3zfzbpq5a0pgpka2vvlw9ivpqy5p"))))
+        (base32 "1vf9gpfk9x6sqpz7n420ijkn3ykws8g9b77kmbmlrjsm76dnp1dj"))))
     (build-system python-build-system)
     (inputs
      (list python-psutil python-urwid))
-- 
cgit 1.4.1


From aff442508b04374e24de67c8939bd5c94d5534fb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: sudo: Update to 1.9.14p1.

* gnu/packages/admin.scm (sudo): Update to 1.9.14p1.
[arguments]: Use a different filthy hack to quote _PATH_MV.
---
 gnu/packages/admin.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 31e6a07f48..a147684a60 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1958,7 +1958,7 @@ system administrator.")
 (define-public sudo
   (package
     (name "sudo")
-    (version "1.9.13p2")
+    (version "1.9.14p1")
     (source (origin
               (method url-fetch)
               (uri
@@ -1968,7 +1968,7 @@ system administrator.")
                                     version ".tar.gz")))
               (sha256
                (base32
-                "0kapjhgyzaqk2nfzzz04ss9x6cy61s79afd3vhgkn0y1wkyh886z"))
+                "1bwg2bn1sbc6l2gx2r9vfqyf8dyvgp7nad0wj3p5gn095vpza6z9"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -1987,9 +1987,9 @@ system administrator.")
 
              ;; 'visudo.c' expects _PATH_MV to be defined, but glibc doesn't
              ;; provide it.
-             (string-append "CPPFLAGS=-D_PATH_MV='\""
+             (string-append "CPPFLAGS=-D_PATH_MV=\\\""
                             (assoc-ref %build-inputs "coreutils")
-                            "/bin/mv\"'"))
+                            "/bin/mv\\\""))
 
        ;; Avoid non-determinism; see <http://bugs.gnu.org/21918>.
        #:parallel-build? #f
-- 
cgit 1.4.1


From 6dbcdb4b7f8aeedee619d661f350e948c843201d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: thermald: Update to 2.5.3.

* gnu/packages/admin.scm (thermald): Update to 2.5.3.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index a147684a60..2a716e61ba 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4217,7 +4217,7 @@ hard-coded.")
 (define-public thermald
   (package
     (name "thermald")
-    (version "2.5.2")
+    (version "2.5.3")
     (source
      (origin
       (method git-fetch)
@@ -4226,7 +4226,7 @@ hard-coded.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-       (base32 "08w0lanhk2rncvshrvxrpm84y9f9x7aa63vxi7fg6329c94cf78k"))))
+       (base32 "0hpk7pjlrnj62m5zdmih7gf3nihhyphyslh5xakdjb64cvx5z25d"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit 1.4.1


From 4eee59ef343188fa94ba52f042c7cddebf60dec8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: xchm: Update to 1.35.

* gnu/packages/ebook.scm (xchm): Update to 1.35.
---
 gnu/packages/ebook.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 993ebb8fc1..6962547c75 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -621,7 +621,7 @@ Some of the current features:
 (define-public xchm
   (package
     (name "xchm")
-    (version "1.33")
+    (version "1.35")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/rzvncj/xCHM"
@@ -629,7 +629,7 @@ Some of the current features:
                                   version "/xchm-" version ".tar.gz"))
               (sha256
                (base32
-                "0an09shap2wj9gzj5fsw5sc2i6paq3kc3mc52fnwg2bb2dan5qxk"))))
+                "19w9cmdncqgy20bk8njbvcz5xld15pq5slf7m477vhnvws8a373i"))))
     (build-system gnu-build-system)
     (inputs
      (list wxwidgets chmlib))
-- 
cgit 1.4.1


From c4c925a0691efccb39b6e81268cfde59b9e8ea61 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: emacs-ebuild-mode: Update to 1.65.

* gnu/packages/emacs-xyz.scm (emacs-ebuild-mode): Update to 1.65.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 838a62e64e..768e3ee3de 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15037,7 +15037,7 @@ Lua programming language}.")
 (define-public emacs-ebuild-mode
   (package
     (name "emacs-ebuild-mode")
-    (version "1.64")
+    (version "1.65")
     (source
      (origin
        (method url-fetch)
@@ -15046,7 +15046,7 @@ Lua programming language}.")
              "ebuild-mode-" version ".tar.xz"))
        (file-name (string-append name "-" version ".tar.xz"))
        (sha256
-        (base32 "180wjbi385fhafijmmimcf23fdympdk2km0yj9rv6pmfbfjgq2bv"))))
+        (base32 "07zla002lxkck4cgpfr5c5lmarxb12yfnldgflv9vf88yfa997xw"))))
     (build-system emacs-build-system)
     (arguments
      (list
-- 
cgit 1.4.1


From 77f43211f109b3c2c5764976153a05239218b8f8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: emacs-plz: Update to 0.7.

* gnu/packages/emacs-xyz.scm (emacs-plz): Update to 0.7.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 768e3ee3de..75896eb1fd 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19511,7 +19511,7 @@ multiplexer.")
 (define-public emacs-plz
   (package
     (name "emacs-plz")
-    (version "0.6")
+    (version "0.7")
     (source
      (origin
        (method git-fetch)
@@ -19520,7 +19520,7 @@ multiplexer.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "12hnsafv1bxkk1pb471i8hw0zy0yfla8afpcahlg4k4dni4dnqsm"))))
+        (base32 "18lq7v2gglfnax5r1svh9p0fcd5hs745js57nl8bk58ba047a9q8"))))
     (build-system emacs-build-system)
     (inputs (list curl))
     (arguments
-- 
cgit 1.4.1


From 05b242a9addfb2f5e9be6f58e7ce2728e988d416 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: emacs-svg-lib: Update to 0.2.6.

* gnu/packages/emacs-xyz.scm (emacs-svg-lib): Update to 0.2.6.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 75896eb1fd..748add0cae 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -23253,10 +23253,10 @@ within Emacs.")
 (define-public emacs-svg-lib
   ;; XXX: Upstream does not tag releases.  The commit hash below corresponds
   ;; to the version bump.
-  (let ((commit "0486c9453449771bc3f5872f70bc5cb23580d0f4"))
+  (let ((commit "5ba4e4ea2b5c66e8811beb53251dee13685b2cb2"))
     (package
       (name "emacs-svg-lib")
-      (version "0.2.5")
+      (version "0.2.6")
       (source
        (origin
          (method git-fetch)
@@ -23265,7 +23265,7 @@ within Emacs.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "059vd4k7bvskkriwaiz4n2yafc3inndrr018hqfpic4k02cbwzpv"))))
+          (base32 "1zpcw8arizwjiz7diky7f0nh65zkp0pmnpyqzb0h1qgqnlf734k4"))))
       (build-system emacs-build-system)
       (home-page "https://github.com/rougier/svg-lib")
       (synopsis "Emacs SVG library for creating tags, icons and bars")
-- 
cgit 1.4.1


From 88e3a3529f6ffae9a73ff6bb8c7e5459b47cd8f8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:02 +0200
Subject: gnu: linsmith: Update to 0.99.33.

* gnu/packages/engineering.scm (linsmith): Update to 0.99.33.
---
 gnu/packages/engineering.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index dee92bce4f..41cd89e057 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1289,7 +1289,7 @@ with the kernel and various utilities such as per-cpu counters.")
 (define-public linsmith
   (package
     (name "linsmith")
-    (version "0.99.31")
+    (version "0.99.33")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1297,7 +1297,7 @@ with the kernel and various utilities such as per-cpu counters.")
                     version "/linsmith-" version ".tar.gz"))
               (sha256
                (base32
-                "13qj7n9826qc9shkkgd1p6vcpj78v4h9d67wbg45prg7rbnzkzds"))))
+                "1629p29casy9pgy8hzva1bmgrvh923qk01ls3anik6zqn6swkjfn"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("CFLAGS=-fcommon")))
-- 
cgit 1.4.1


From a0c361cb3f7d7111476b1210c3e5d91eb8555d70 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 9 Jul 2023 02:00:01 +0200
Subject: gnu: linsmith: Fix input types.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/engineering.scm (linsmith)[native-inputs]:
Remove input labels.  Move gtk+-2 and libgnomeui from here…
[inputs]: …to here.
---
 gnu/packages/engineering.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 41cd89e057..070a372b5a 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1302,9 +1302,9 @@ with the kernel and various utilities such as per-cpu counters.")
     (arguments
      '(#:configure-flags '("CFLAGS=-fcommon")))
     (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("gtk" ,gtk+-2)
-       ("libgnome" ,libgnomeui)))
+     (list pkg-config))
+    (inputs
+     (list gtk+-2 libgnomeui))
     (home-page "https://jcoppens.com/soft/linsmith/index.en.php")
     (synopsis "Smith Charting program")
     (description "LinSmith is a Smith Charting program, mainly designed for
-- 
cgit 1.4.1


From f5c4e1999d83c2765765eaa18c3ac2cd0b4129f8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: vice: Update to 3.7.1.

* gnu/packages/emulators.scm (vice): Update to 3.7.1.
---
 gnu/packages/emulators.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index be76f81ff4..67950c1603 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -116,14 +116,14 @@
 (define-public vice
   (package
     (name "vice")
-    (version "3.6")
+    (version "3.7.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://sourceforge/vice-emu/releases/"
                            "vice-" version ".tar.gz"))
        (sha256
-        (base32 "1zfkl9j40v2417l1fmczdvl9yzh81jlpcy5cl2svjzb2rrffbgv5"))))
+        (base32 "165b1ixrarcqy1rl06yhaf46ni3j8lrbn8f3zf5nkc2d0bk12f3y"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags '("--disable-html-docs"
-- 
cgit 1.4.1


From d23105a329231dce72980202c15370ff1b6733ee Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: librnd: Update to 4.0.2.

* gnu/packages/engineering.scm (librnd): Update to 4.0.2.
---
 gnu/packages/engineering.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 070a372b5a..d281dbb74e 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -439,14 +439,14 @@ features.")))
 (define-public librnd
   (package
     (name "librnd")
-    (version "4.0.0")
+    (version "4.0.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://www.repo.hu/projects/librnd/releases/"
                                   "librnd-" version ".tar.bz2"))
               (sha256
                (base32
-                "1fqh7gf9imhghlfajrsgzjx61mynfmdasciwpcajk7pn85d4ymql"))))
+                "0z578x3sd8yjfbhivy1hz4hlgiy43qq6x7mnby872plpm08vgqxz"))))
     (build-system gnu-build-system)
     (arguments
      (list
-- 
cgit 1.4.1


From b175789352ae7fa4bb4fba55f941c5c79027bbd7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: librnd: Prepare for cross-compilation.

* gnu/packages/engineering.scm (librnd)[arguments]: Use CC-FOR-TARGET.
---
 gnu/packages/engineering.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index d281dbb74e..3f0325ecea 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -454,7 +454,7 @@ features.")))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'cc-is-gcc
-            (lambda _ (setenv "CC" "gcc")))
+            (lambda _ (setenv "CC" #$(cc-for-target))))
           (replace 'configure
             ;; The configure script doesn't tolerate most of our configure flags.
             (lambda _
-- 
cgit 1.4.1


From 479eb63f2a68cfac1866aefe245186a0bb3ef083 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: pcb-rnd: Update to 3.1.1.

* gnu/packages/engineering.scm (pcb-rnd): Update to 3.1.1.
---
 gnu/packages/engineering.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 3f0325ecea..f31d4bd04d 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -527,14 +527,14 @@ optimizer; and it can produce photorealistic and design review images.")
 (define-public pcb-rnd
   (package (inherit pcb)
     (name "pcb-rnd")
-    (version "3.1.0")
+    (version "3.1.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://repo.hu/projects/pcb-rnd/releases/"
                                   "pcb-rnd-" version ".tar.gz"))
               (sha256
                (base32
-                "0yw4sf4qrmmai48f3f5byn2fphc453myjszh3sy9z0dnfcz3x7fw"))))
+                "0szcsp2049wh3wslv7743wbjqllrmphi07yz0933sz4vf6f1c8dg"))))
     (arguments
      (list
       #:tests? #false                   ;no check target
-- 
cgit 1.4.1


From c8c78b08d228fd44df9b5df78452ee69d7407dd8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: pcb-rnd: Prepare for cross-compilation.

* gnu/packages/engineering.scm (pcb-rnd)[arguments]: Use CC-FOR-TARGET.
---
 gnu/packages/engineering.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index f31d4bd04d..4499d9e07c 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -541,7 +541,7 @@ optimizer; and it can produce photorealistic and design review images.")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'cc-is-gcc
-            (lambda _ (setenv "CC" "gcc")))
+            (lambda _ (setenv "CC" #$(cc-for-target))))
           (replace 'configure
             ;; The configure script doesn't tolerate most of our configure flags.
             (lambda _
-- 
cgit 1.4.1


From ba8dcfc511a71eb88cd8e9ee1ad90b990eb95746 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: python-dropbox: Update to 11.36.2.

* gnu/packages/file-systems.scm (python-dropbox): Update to 11.36.2.
---
 gnu/packages/file-systems.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 7cebdf841e..007203ae12 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -1698,13 +1698,13 @@ compatible directories.")
 (define-public python-dropbox
   (package
     (name "python-dropbox")
-    (version "11.36.0")
+    (version "11.36.2")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "dropbox" version))
         (sha256
-         (base32 "0iwbi1qdw9qr7isa37yys582am59k80dqrwvm6s0afdwv0ifa343"))
+         (base32 "00650gk8557x3f38nd8a1mdby7v1l8l4l72aq48qpiw6shb3v3fl"))
         (snippet
          '(begin
             (use-modules (guix build utils))
-- 
cgit 1.4.1


From 810b7b1c3c1a99cf7554003c125d3ab19b5095d3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: seabios: Update to 1.16.2.

* gnu/packages/firmware.scm (seabios): Update to 1.16.2.
---
 gnu/packages/firmware.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 3dcc882e0c..d6ce893120 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -575,7 +575,7 @@ executing in M-mode.")
 (define-public seabios
   (package
     (name "seabios")
-    (version "1.16.1")
+    (version "1.16.2")
     (source
      (origin
        (method git-fetch)
@@ -584,7 +584,7 @@ executing in M-mode.")
              (commit (string-append "rel-" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0gph1hf70jjpx55qc0lzx2yghkipg9dnsin07i4jajk0p1jpd2d0"))
+        (base32 "1mal2zqn4ppxdjxddrxcphm6z9n8n4rw97xl2hldd7spw57nwq97"))
        (modules '((guix build utils)))
        (snippet
         #~(begin
-- 
cgit 1.4.1


From a71c56d4bc26613bd260cee65e8162b509c54f47 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:03 +0200
Subject: gnu: endless-sky: Update to 0.10.2.

* gnu/packages/games.scm (endless-sky): Update to 0.10.2.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index f0d29f2367..c3b13206d1 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -8520,7 +8520,7 @@ your score gets higher, you level up and the blocks fall faster.")
 (define-public endless-sky
   (package
     (name "endless-sky")
-    (version "0.10.0")
+    (version "0.10.2")
     (source
      (origin
        (method git-fetch)
@@ -8529,7 +8529,7 @@ your score gets higher, you level up and the blocks fall faster.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1zbizmigxdwpi3m7sxv9hhf3aa18kbhsfrp48zy3iw2v64pw9l3r"))))
+        (base32 "07br25cij6g284p53nclcvw4y6mgn93milynpxa5ahrjdl5yfnsn"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags #~(list "-DES_USE_VCPKG=0"
-- 
cgit 1.4.1


From 9a1c4edfdde956f9e21d8d898ba08f4e52582ab1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: fheroes2: Update to 1.0.5.

* gnu/packages/games.scm (fheroes2): Update to 1.0.5.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c3b13206d1..2adafc1290 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -11280,7 +11280,7 @@ disassembly of the DOS version, extended with new features.")
 (define-public fheroes2
   (package
     (name "fheroes2")
-    (version "1.0.2")
+    (version "1.0.5")
     (source
      (origin
        (method git-fetch)
@@ -11289,7 +11289,7 @@ disassembly of the DOS version, extended with new features.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "18hl84lapmqc810rnh2wkd4p2mnfcl4gbmg5sizakqcfpahgsl33"))))
+        (base32 "0v7dxzb5cfjb55jydd8f61zzlvxq9mrgdy51hq19b06dmrx1dnc7"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f                      ; no tests
-- 
cgit 1.4.1


From b0efcee722425b95c0a74e257f6d8a7edbcd3abe Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:06 +0200
Subject: gnu: freeciv: Fix upstream source URL.

* gnu/packages/games.scm (freeciv)[source]: Fix upstream file name.  Use HTTPS.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2adafc1290..096a9f0d83 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -6283,8 +6283,8 @@ for Un*x systems with X11.")
     (origin
      (method url-fetch)
      (uri (list (string-append
-                  "http://files.freeciv.org/stable/freeciv-"
-                  version ".tar.bz2")
+                  "https://files.freeciv.org/stable/freeciv-"
+                  version ".tar.xz")
                 (string-append
                   "mirror://sourceforge/freeciv/Freeciv%20"
                   (version-major+minor version) "/" version
-- 
cgit 1.4.1


From 1db72854cfe880921ff390d62ca3f7bf563bd4a7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: freeciv: Update to 3.0.8.

* gnu/packages/games.scm (freeciv): Update to 3.0.8.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 096a9f0d83..de5827885f 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -6278,7 +6278,7 @@ for Un*x systems with X11.")
 (define-public freeciv
   (package
    (name "freeciv")
-   (version "3.0.7")
+   (version "3.0.8")
    (source
     (origin
      (method url-fetch)
@@ -6290,7 +6290,7 @@ for Un*x systems with X11.")
                   (version-major+minor version) "/" version
                   "/freeciv-" version ".tar.xz")))
      (sha256
-      (base32 "1i6sm2ich9bazbg8wjzn8z1c5hgmg541lgw8f899fgfhgvqhdrpn"))))
+      (base32 "1m3nwz0aad6p33zvmdldbw39riw2xqn99b6384bvx448c8ps6niv"))))
    (build-system gnu-build-system)
    (inputs
     (list curl cyrus-sasl gtk+ sdl-mixer zlib))
-- 
cgit 1.4.1


From 3aa9098bcbcab1ee041402ed7afaeef442522afd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: openttd-engine: Update to 13.3.

* gnu/packages/games.scm (openttd-engine): Update to 13.3.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index de5827885f..c1dc44950c 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4654,14 +4654,14 @@ world}, @uref{http://evolonline.org, Evol Online} and
 (define openttd-engine
   (package
     (name "openttd-engine")
-    (version "13.1")
+    (version "13.3")
     (source
      (origin (method url-fetch)
              (uri (string-append "https://cdn.openttd.org/openttd-releases/"
                                  version "/openttd-" version "-source.tar.xz"))
              (sha256
               (base32
-               "1fsq1azddk1l11w89r93mgmhna34kvarfak7xy2q48rmf39j5psy"))))
+               "14kiksw9qb37ryg6xkq4gahpvvd5yxwqz21sqws525k7zg91dyma"))))
     (build-system cmake-build-system)
     (inputs
      (list allegro
-- 
cgit 1.4.1


From e5830022d9c03d0d2978315a58d00c27e66ae321 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:03 +0200
Subject: gnu: wesnoth: Update to 1.16.9.

* gnu/packages/games.scm (wesnoth): Update to 1.16.9.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c1dc44950c..2b763b905e 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4521,7 +4521,7 @@ falling, themeable graphics and sounds, and replays.")
 (define-public wesnoth
   (package
     (name "wesnoth")
-    (version "1.16.6")
+    (version "1.16.9")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -4530,7 +4530,7 @@ falling, themeable graphics and sounds, and replays.")
               (file-name (string-append name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0hfvxmdnwn86w254blbjacia342j47rhhahm6ca79la9d04rlz3m"))))
+                "06gfgkg8f98jsj9vnbglw5lqflqzf0229n6wf3xl12carjzgaq9g"))))
     (build-system cmake-build-system)
     (arguments
      (list #:tests? #f)) ;no test target
-- 
cgit 1.4.1


From fd0f867571d0bf550b581fd5d72a5d4c8b2dfd59 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: xonotic: Update to 0.8.6.

* gnu/packages/games.scm (xonotic): Update to 0.8.6.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2b763b905e..b6b580ab62 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7994,7 +7994,7 @@ original.")
 (define-public xonotic
   (package
     (name "xonotic")
-    (version "0.8.5")
+    (version "0.8.6")
     (source
      (origin
        (method url-fetch)
@@ -8002,7 +8002,7 @@ original.")
                            version "-source.zip"))
        (file-name (string-append name "-" version ".zip"))
        (sha256
-        (base32 "0pgahai0gk8bjmvkwx948bl50l9f9dhmjzwffl4vyldibajipa51"))))
+        (base32 "1a0j825rb86i34xc5k6spsma41gcgp6yl8qs2affhjpz3iwar4lb"))))
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags
-- 
cgit 1.4.1


From 29a7bd209c7a37bbc0c46a18de6d81bf0569041b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:03 +0200
Subject: gnu: tetzle: Update to 2.2.2.

* gnu/packages/games.scm (tetzle): Update to 2.2.2.
[source]: Hard-code NAME.
---
 gnu/packages/games.scm | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index b6b580ab62..f58720e41a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2840,19 +2840,14 @@ available, as well as a single-player mode with AI-controlled ships.")
 (define-public tetzle
   (package
     (name "tetzle")
-    (version "2.2.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://gottcode.org/"
-                                  name
-                                  "/"
-                                  name
-                                  "-"
-                                  version
-                                  "-src.tar.bz2"))
-              (sha256
-               (base32
-                "1m4j4lzqp8fnwmvyglmzcn3vh14ix4hhh52ycmcsjgrsgj1w4p6a"))))
+    (version "2.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://gottcode.org/tetzle/"
+                           "tetzle-" version ".tar.bz2"))
+       (sha256
+        (base32 "0sybryg65j8gz5s7zbsfqky8wlkjwpppkrhksijj6xc7692lfii8"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f)) ; no tests
-- 
cgit 1.4.1


From 1cd3eb66b10ec49e2f9b176a0d06ec9f5ac9896d Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sun, 16 Jul 2023 08:07:48 +0200
Subject: gnu: frama-c: depend on zlib

* gnu/packages/maths.scm (frama-c) [inputs]: Add zlib.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 03f8a56ea0..cd9b0fc325 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8182,7 +8182,7 @@ of C, Java, or Ada programs.")
              (setenv "CONFIG_SHELL"
                      (search-input-file inputs "/bin/sh")))))))
     (inputs
-     (list gmp))
+     (list gmp zlib))
     (propagated-inputs
      (list ocaml-biniou
            ocaml-easy-format
-- 
cgit 1.4.1


From 72a0d8350a5edfe7d9e4b9c2665069a16c1cfbfd Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 18 Jul 2023 00:13:53 +0200
Subject: gnu: shepherd: Update to 0.10.2.

* gnu/packages/admin.scm (shepherd-0.10): Update to 0.10.2.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 2a716e61ba..dfd6bf0e41 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -370,14 +370,14 @@ interface and is based on GNU Guile.")
 (define-public shepherd-0.10
   (package
     (inherit shepherd-0.9)
-    (version "0.10.1")
+    (version "0.10.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/shepherd/shepherd-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1720czfchg4pzw44v0zj3rc3k6jhl3ixwnpw4v4v9bqx98ad49yw"))))
+                "0v9ld9gbqdp5ya380fbkdsxa0iqr90gi6yk004ccz3n792nq6wlj"))))
     (native-inputs (modify-inputs (package-native-inputs shepherd-0.9)
                      (replace "guile-fibers" guile-fibers-1.3)))
     (inputs (modify-inputs (package-inputs shepherd-0.9)
-- 
cgit 1.4.1


From 602e32c8e0e36d149e1424d8023a214abd3d34ba Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 5 Jul 2023 11:52:24 +0100
Subject: doc: Update GDB "guix shell" example to use autoconf-2.69
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* doc/environment-gdb.scm: Change to use autoconf-2.69.
* gnu/packages/autotools.scm: Remove outdated GDB comment.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 doc/environment-gdb.scm    | 2 +-
 gnu/packages/autotools.scm | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/environment-gdb.scm b/doc/environment-gdb.scm
index 0534e594de..9517200ffd 100644
--- a/doc/environment-gdb.scm
+++ b/doc/environment-gdb.scm
@@ -9,4 +9,4 @@
 (package
   (inherit gdb)
   (native-inputs (modify-inputs (package-native-inputs gdb)
-                   (prepend autoconf-2.64 automake texinfo))))
+                   (prepend autoconf-2.69 automake texinfo))))
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index fc6bb196f1..5ffefec4a1 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -158,7 +158,6 @@ know anything about Autoconf or M4.")
         "1fjm21k2na07f3vasf288a0zx66lbv0hd3l9bvv3q8p62s3pg569"))))))
 
 (define-public autoconf-2.64
-  ;; As of GDB 7.8, GDB is still developed using this version of Autoconf.
   (package (inherit autoconf)
     (version "2.64")
     (source
-- 
cgit 1.4.1


From 460b2afeb39733ee8d2730b35192c97630fc2a10 Mon Sep 17 00:00:00 2001
From: Bruno Victal <mirai@makinata.eu>
Date: Wed, 5 Jul 2023 17:34:04 +0100
Subject: gnu: Add mactelnet.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/admin.scm (mactelnet): New variable.
* gnu/packages/patches/mactelnet-remove-init.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/local.mk                                     |  1 +
 gnu/packages/admin.scm                           | 42 ++++++++++
 gnu/packages/patches/mactelnet-remove-init.patch | 98 ++++++++++++++++++++++++
 3 files changed, 141 insertions(+)
 create mode 100644 gnu/packages/patches/mactelnet-remove-init.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index b460d3bc91..2767f5290b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1568,6 +1568,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/lua-5.4-liblua-so.patch			\
   %D%/packages/patches/luit-posix.patch				\
   %D%/packages/patches/lvm2-static-link.patch			\
+  %D%/packages/patches/mactelnet-remove-init.patch		\
   %D%/packages/patches/mailutils-variable-lookup.patch		\
   %D%/packages/patches/make-impure-dirs.patch			\
   %D%/packages/patches/mariadb-rocksdb-atomic-linking.patch	\
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index dfd6bf0e41..f2378b0d8a 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -59,6 +59,7 @@
 ;;; 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>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5852,3 +5853,44 @@ file or files to several hosts.")
     (description "This package provides a graphical disk usage analyzer in
 text mode.")
     (license license:asl2.0)))
+
+(define-public mactelnet
+  (package
+    (name "mactelnet")
+    (version "0.4.4")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/haakonnessjoen/MAC-Telnet")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1z63dz22crrvrm0sh2cwpyqb7wqd9m45m6f2641mwmyp6hcpf4k4"))
+              (patches (search-patches "mactelnet-remove-init.patch"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f))  ; no tests
+    (native-inputs (list autoconf automake gettext-minimal))
+    (synopsis "MAC-Telnet utilities for communicating with RouterOS devices")
+    (description "This package provides an implementation of the MAC-Telnet protocol
+used by RouterOS devices.  It provides the following commands:
+@table @command
+@item{macping}
+Ping RouterOS devices or @command{mactelnetd} hosts.
+@item{mactelnetd}
+MAC-Telnet daemon.
+@item{mactelnet}
+MAC-Telnet client.
+@item{mndp}
+Discover other RouterOS devices or @command{mactelnetd} hosts.
+@end table")
+    (home-page "https://lunatic.no/2010/10/routeros-mac-telnet-application-for-linux-users/")
+    (license
+     (list license:gpl2+
+           ;; Note: applies to src/md5.{c,h}
+           ;; This file is likely to be gone in the next release.
+           license:zlib
+           ;; Bundled uthash-1.9.9.
+           license:bsd-2))))
diff --git a/gnu/packages/patches/mactelnet-remove-init.patch b/gnu/packages/patches/mactelnet-remove-init.patch
new file mode 100644
index 0000000000..82372e3fe4
--- /dev/null
+++ b/gnu/packages/patches/mactelnet-remove-init.patch
@@ -0,0 +1,98 @@
+From ca2dff0b97df0ceb8f6357de3a4375ebc09646dd Mon Sep 17 00:00:00 2001
+Message-Id: <ca2dff0b97df0ceb8f6357de3a4375ebc09646dd.1688572750.git.mirai@makinata.eu>
+From: Bruno Victal <mirai@makinata.eu>
+Date: Wed, 5 Jul 2023 16:43:31 +0100
+Subject: [PATCH] Skip installing init file.
+
+The file refers to hardcoded paths.
+---
+ Makefile.am             |  2 +-
+ config/Makefile.am      |  5 -----
+ config/mactelnetd.init  | 21 ---------------------
+ config/mactelnetd.users | 12 ------------
+ configure.ac            |  2 +-
+ 5 files changed, 2 insertions(+), 40 deletions(-)
+ delete mode 100644 config/Makefile.am
+ delete mode 100644 config/mactelnetd.init
+ delete mode 100644 config/mactelnetd.users
+
+diff --git a/Makefile.am b/Makefile.am
+index 4e67178..264d8ea 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = src doc config po
++SUBDIRS = src doc po
+ 
+ CFLAGS = --pedantic -Wall -std=c99 -O3 
+ LDFLAGS =
+diff --git a/config/Makefile.am b/config/Makefile.am
+deleted file mode 100644
+index 574a2e0..0000000
+--- a/config/Makefile.am
++++ /dev/null
+@@ -1,5 +0,0 @@
+-dist_sysconf_DATA = mactelnetd.users
+-
+-install-exec-hook:
+-	       chmod 600 $(DESTDIR)$(sysconfdir)/mactelnetd.users
+-				 chown root $(DESTDIR)$(sysconfdir)/mactelnetd.users
+diff --git a/config/mactelnetd.init b/config/mactelnetd.init
+deleted file mode 100644
+index b7ddddf..0000000
+--- a/config/mactelnetd.init
++++ /dev/null
+@@ -1,21 +0,0 @@
+-# mactelnetd - MAC-Telnet server
+-#
+-# The MAC-Telnet server provides telnet access via MAC addresses.
+-#
+-# Ubuntu upstart config:
+-
+-description	"MAC-Telnet server"
+-
+-start on filesystem
+-stop on runlevel [!2345]
+-
+-respawn
+-respawn limit 10 5
+-umask 022
+-
+-pre-start script
+-    test -O /etc/mactelnetd.users || { stop; exit 0; }
+-    test -x /usr/sbin/mactelnetd || { stop; exit 0; }
+-end script
+-
+-exec /usr/sbin/mactelnetd -f
+diff --git a/config/mactelnetd.users b/config/mactelnetd.users
+deleted file mode 100644
+index c140e36..0000000
+--- a/config/mactelnetd.users
++++ /dev/null
+@@ -1,12 +0,0 @@
+-# Users file for MAC-Telnetd
+-#
+-####################################################################
+-# WARNING: This file has passwords written in plain-text.          #
+-#          Make sure this file is owned and only readable by root. #
+-####################################################################
+-#
+-# Each line consists of a username and a password seperated by :.
+-# Usernames must be existing users from passwd.
+-#
+-# Format:
+-#username:password
+diff --git a/configure.ac b/configure.ac
+index c0fdda4..9d2f7d7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,4 +34,4 @@ AC_FUNC_MALLOC
+ AC_FUNC_STRNLEN
+ AC_CHECK_FUNCS([alarm bzero clock_gettime getpass gettimeofday inet_ntoa memset select setenv setlocale socket strcasecmp strerror strncasecmp sysinfo uname])
+ 
+-AC_OUTPUT(Makefile src/Makefile doc/Makefile config/Makefile po/Makefile.in)
++AC_OUTPUT(Makefile src/Makefile doc/Makefile po/Makefile.in)
+-- 
+2.40.1
+
-- 
cgit 1.4.1


From bdcf1de75621f443553b68d7ae1b99a020cf6bac Mon Sep 17 00:00:00 2001
From: Bruno Victal <mirai@makinata.eu>
Date: Wed, 5 Jul 2023 17:34:05 +0100
Subject: gnu: mactelnet: Unbundle uthash.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/admin.scm (mactelnet)[source]: Unbundle uthash.
[inputs]: Add uthash.
[license]: Remove bsd-2.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/admin.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index f2378b0d8a..ec32041055 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -114,6 +114,7 @@
   #:use-module (gnu packages cryptsetup)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages cyrus-sasl)
+  #:use-module (gnu packages datastructures)
   #:use-module (gnu packages dns)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages file)
@@ -5867,12 +5868,19 @@ text mode.")
               (sha256
                (base32
                 "1z63dz22crrvrm0sh2cwpyqb7wqd9m45m6f2641mwmyp6hcpf4k4"))
-              (patches (search-patches "mactelnet-remove-init.patch"))))
+              (patches (search-patches "mactelnet-remove-init.patch"))
+              (modules '((guix build utils)))
+              (snippet
+               #~(begin
+                   (delete-file "src/utlist.h")
+                   (substitute* (find-files "src/" "\\.c$")
+                     (("\"utlist\\.h\"") "<utlist.h>"))))))
     (build-system gnu-build-system)
     (arguments
      (list
       #:tests? #f))  ; no tests
     (native-inputs (list autoconf automake gettext-minimal))
+    (inputs (list uthash))
     (synopsis "MAC-Telnet utilities for communicating with RouterOS devices")
     (description "This package provides an implementation of the MAC-Telnet protocol
 used by RouterOS devices.  It provides the following commands:
@@ -5891,6 +5899,4 @@ Discover other RouterOS devices or @command{mactelnetd} hosts.
      (list license:gpl2+
            ;; Note: applies to src/md5.{c,h}
            ;; This file is likely to be gone in the next release.
-           license:zlib
-           ;; Bundled uthash-1.9.9.
-           license:bsd-2))))
+           license:zlib))))
-- 
cgit 1.4.1


From 70cd107dd5521b3500b9edae81ea8d0d5bf05040 Mon Sep 17 00:00:00 2001
From: Jean-Pierre De Jesus DIAZ <jean@foundationdevices.com>
Date: Thu, 6 Jul 2023 15:30:08 +0200
Subject: gnu: cppzmq: Update to 4.10.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/networking.scm (cppzmq): Update to 4.10.0.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/networking.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 587a400d33..1fbbbc1267 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1399,7 +1399,7 @@ between different versions of ØMQ.")
 (define-public cppzmq
   (package
     (name "cppzmq")
-    (version "4.8.1")
+    (version "4.10.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1407,7 +1407,7 @@ between different versions of ØMQ.")
                     (commit (string-append "v" version))))
               (sha256
                (base32
-                "0zzq20wzk5grshxfqhqgqqfwb38w3k83r821isvyaxghsglpwks3"))
+                "1074316b2n2sbvamnnm8c0p9s0xw2m0g84i9pac02vqbaxbmldqx"))
               (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (arguments
-- 
cgit 1.4.1


From f2359b15a5ecacc39c533c4ea19ca76ff0a3aa43 Mon Sep 17 00:00:00 2001
From: kiasoc5 <kiasoc5@disroot.org>
Date: Tue, 4 Jul 2023 14:27:51 -0400
Subject: gnu: x42-plugins: Update to 20230701.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/music.scm (x42-plugins): Update to 20230701.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 4f0a2d9d1f..bc7ea0ab7f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6133,7 +6133,7 @@ short-time Fourier transform, available as LV2 audio plugin and JACK client.")
 (define-public x42-plugins
   (package
     (name "x42-plugins")
-    (version "20221119")
+    (version "20230701")
     (source
      (origin
        (method url-fetch)
@@ -6141,7 +6141,7 @@ short-time Fourier transform, available as LV2 audio plugin and JACK client.")
         (string-append "https://gareus.org/misc/x42-plugins/x42-plugins-"
                        version ".tar.xz"))
        (sha256
-        (base32 "128h9x7yzhy6q6l0fqk2zd6l48wgs2lhf2pzbiba6h3n6l9n555b"))))
+        (base32 "1why4mkaxbd0p7qr4jrx3d903wnw2l8gya8v3y32z2vjz31w7jqn"))))
     (build-system gnu-build-system)
     (arguments
      (list
-- 
cgit 1.4.1


From de02a58e25c65756e90c3c5fd6eb6da65985a970 Mon Sep 17 00:00:00 2001
From: Bruno Victal <mirai@makinata.eu>
Date: Tue, 4 Jul 2023 23:22:01 +0100
Subject: gnu: Add python-gixy.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/check.scm (python-gixy): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/check.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 85eeac98a4..71dc9eb54b 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -44,6 +44,7 @@
 ;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
 ;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -812,6 +813,41 @@ and it supports a very flexible form of test discovery.")
 has been designed to be fast, light and unintrusive.")
     (license license:expat)))
 
+(define-public python-gixy
+  ;; The 0.1.20 release is missing some important fixes.
+  ;; XXX: Commit 'e9008dcbd11f43ccac109b0cf2bf98a94e76b449' breaks tests
+  ;; since it improperly removes an import.
+  (let ((commit "303eb6887ddecab18138b6e427b04ae77c41d2f1")
+        (revision "0")
+        (base-version "0.1.20"))
+    (package
+      (name "python-gixy")
+      (version (git-version base-version revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/yandex/gixy")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0gymjcnvjx9snyrzdbmjnk93ibb161q72xam29vnl3yyac4r1330"))))
+      (build-system pyproject-build-system)
+      (native-inputs (list python-nose))
+      (propagated-inputs
+       (list python-cached-property python-configargparse
+             python-jinja2 python-six
+             ;; XXX: gixy is incompatible with pyparsing >= 3.x.
+             ;; See <https://github.com/yandex/gixy/pull/132> and
+             ;; <https://github.com/yandex/gixy/pull/122>.
+             python-pyparsing-2.4.7))
+      (home-page "https://github.com/yandex/gixy")
+      (synopsis "Static NGINX configuration analyzer")
+      (description "Gixy is a static analyzer whose main goal is to help
+prevent common NGINX misconfigurations.  It provides the @command{gixy}
+command.")
+      (license license:mpl2.0))))
+
 (define-public go-github.com-smartystreets-gunit
   (package
     (name "go-github.com-smartystreets-gunit")
-- 
cgit 1.4.1


From 06b604ebbf8e76e9e28caddeb4e571ec899ea42b Mon Sep 17 00:00:00 2001
From: Zheng Junjie <873216071@qq.com>
Date: Tue, 4 Jul 2023 18:52:18 +0800
Subject: gnu: reptyr: Update to 0.10.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/screen.scm (reptyr): Update to 0.10.0.
[arguments]: use new style, fix cross-compilation.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/screen.scm | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index 21150394db..8f2aa51c53 100644
--- a/gnu/packages/screen.scm
+++ b/gnu/packages/screen.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,7 +27,9 @@
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
+  #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
@@ -153,7 +156,7 @@ window manager as well as the Tmux terminal multiplexer.")
 (define-public reptyr
   (package
     (name "reptyr")
-    (version "0.7.0")
+    (version "0.10.0")
     (source
      (origin
        (method git-fetch)
@@ -162,18 +165,18 @@ window manager as well as the Tmux terminal multiplexer.")
              (commit (string-append "reptyr-" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1hnijfz1ab34j2h2cxc3f43rmbclyihgn9x9wxa7jqqgb2xm71hj"))))
+        (base32 "03k95bf7b46g89j0hgfvra9d512z0ha7vw9358h9j67h9b5bylwf"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f                      ; no tests
-       #:make-flags
-       (list "CC=gcc"
-             (string-append "PREFIX=" (assoc-ref %outputs "out"))
-             (string-append "BASHCOMPDIR=" (assoc-ref %outputs "out")
-                            "/etc/bash_completion.d"))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure))))         ; no configure script
+     (list #:tests? #f                      ; no tests
+           #:make-flags
+           #~(list (string-append "CC=" #$(cc-for-target))
+                   (string-append "PREFIX=" #$output)
+                   (string-append "BASHCOMPDIR=" #$output
+                                  "/etc/bash_completion.d"))
+           #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure))))         ; no configure script
     (home-page "https://github.com/nelhage/reptyr")
     (synopsis "Tool for reparenting a running program to a new terminal")
     (description
-- 
cgit 1.4.1


From 8ef9ec6acd036d1c20962e2e320660e0bb9a0b1c Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Sun, 2 Jul 2023 17:06:02 +0800
Subject: gnu: qbittorrent-enhanced: Update to 4.5.4.10.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/bittorrent.scm (qbittorrent-enhanced): Update to 4.5.4.10.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/bittorrent.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 4266e7af1f..fde1bd06d8 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -503,7 +503,7 @@ features.")
   (package
     (inherit qbittorrent)
     (name "qbittorrent-enhanced")
-    (version "4.5.2.10")
+    (version "4.5.4.10")
     (source
      (origin
        (method git-fetch)
@@ -513,7 +513,7 @@ features.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "18z4panaqbmhbw5i1yn17wpqzslhy6w08zcc5bx2hhlg8slp1r9j"))))
+         "0qwk69mgcyh7fij4nsi4ndd17aa61p2c6cxn9l402w4cf1dy6hfs"))))
     (home-page "https://github.com/c0re100/qBittorrent-Enhanced-Edition")
     (description
      "qBittorrent Enhanced is a bittorrent client based on qBittorrent with
-- 
cgit 1.4.1


From 2d691ee8ce493a71e2b0508feccbbfa63311fbc8 Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Thu, 29 Jun 2023 01:55:30 +0800
Subject: gnu: tree-sitter-json: Update to 0.20.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/tree-sitter.scm (tree-sitter-json): Update to 0.20.0.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/tree-sitter.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index f7e35a062c..117c2acb0c 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -432,10 +432,13 @@ will be used in description and synopsis."
    "0.20.0"))
 
 (define-public tree-sitter-json
-  (tree-sitter-grammar
-   "json" "JSON"
-   "06pjh31bv9ja9hlnykk257a6zh8bsxg2fqa54al7qk1r4n9ksnff"
-   "0.19.0"))
+  ;; Not tagged
+  (let ((commit "5d992d9dd42d533aa25618b3a0588f4375adf9f3"))
+    (tree-sitter-grammar
+     "json" "JSON"
+     "08kxzqyyl900al8mc0bwigxlkzsh2f14qzjyb5ki7506myxlmnql"
+     "0.20.0"
+     #:commit commit)))
 
 (define-public tree-sitter-julia
   (tree-sitter-grammar
-- 
cgit 1.4.1


From f5ee879de8ac16b28029b71c99a71c03dc0ca06d Mon Sep 17 00:00:00 2001
From: gemmaro <gemmaro.dev@gmail.com>
Date: Thu, 29 Jun 2023 00:20:21 +0900
Subject: gnu: Add perl-json-parse.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/perl.scm (perl-json-parse): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/perl.scm | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 15d4f3a9bc..13bf3fa84c 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -33,7 +33,7 @@
 ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022, 2023 Evgeny Pisemsky <evgeny@pisemsky.com>
-;;; Copyright © 2022 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2022, 2023 gemmaro <gemmaro.dev@gmail.com>
 ;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
 ;;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2023 Jake Leporte <jakeleporte@outlook.com>
@@ -6036,6 +6036,28 @@ it tries to load Cpanel::JSON::XS, then JSON::XS, then JSON::PP in order, and
 either uses the first module it finds or throws an error.")
     (license (package-license perl))))
 
+(define-public perl-json-parse
+  (package
+    (name "perl-json-parse")
+    (version "0.62")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-" version
+                    ".tar.gz"))
+              (sha256
+               (base32
+                "1nb6zxf6p42dmdmdv4c8x0dnra2sdxq21n6nvl0p8jcjjc7ihwv2"))))
+    (build-system perl-build-system)
+    (home-page "https://metacpan.org/release/JSON-Parse")
+    (synopsis "Perl Module for parsing JSON")
+    (description "@code{JSON::Parse} is a module for parsing JSON.  It offers
+@code{parse_json} which takes a string containing JSON and returns an
+equivalent Perl structure, @code{valid_json} which returns true or false
+depending on whether the JSON is correct or not, @code{assert_valid_json}
+which produces a descriptive fatal error if the JSON is invalid, and so on.")
+    (license (package-license perl))))
+
 (define-public perl-json-xs
   (package
     (name "perl-json-xs")
-- 
cgit 1.4.1


From 56a7e20f4abf29c9b478ea3b61cedab1f9e9cf84 Mon Sep 17 00:00:00 2001
From: gemmaro <gemmaro.dev@gmail.com>
Date: Thu, 29 Jun 2023 00:20:22 +0900
Subject: gnu: gnucash: Update to 5.3.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/gnucash.scm (gnucash): Update to 5.3
  [arguments]<phase>: Replace disable-unsupported-test phase with
  disable-online-test, which enables all tests but online_wiggle.
  [inputs]: Add perl-json-parse and bash-minimal.
* gnu/packages/gnucash.scm (gnucash-doc): Update to 5.3.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/gnucash.scm | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm
index 178162a4a0..f750b975eb 100644
--- a/gnu/packages/gnucash.scm
+++ b/gnu/packages/gnucash.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2019, 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com>
 ;;; Copyright © 2020 Christopher Lam <christopher.lck@gmail.com>
+;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,6 +29,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
@@ -64,14 +66,14 @@
   ;; directory.
   (package
     (name "gnucash")
-    (version "5.0")
+    (version "5.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
                            version "/gnucash-" version ".tar.bz2"))
        (sha256
-        (base32 "09482f1w4yawrdw5c2wi0jb8hwlp1x9mdvq552bf9n5f66mkphfg"))))
+        (base32 "0npilq0spalpg1ma956j7vlbn0yc5f0z5imy4kbyksl5ql4cnn0l"))))
     (outputs '("out" "doc" "debug" "python"))
     (build-system cmake-build-system)
     (arguments
@@ -87,13 +89,11 @@
                   (guix build utils))
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'disable-unsupported-test
-               ;; test test-gnc-quotes neeeds perl JSON::Parse
-               ;; not packaged in Guix yet
+          (add-after 'unpack 'disable-online-test
             (lambda _
-              (substitute* "libgnucash/app-utils/test/CMakeLists.txt"
-                    (("gnc_add_test\\(test-gnc-quotes")
-                     "#gnc_add_test\\(test-gnc-quotes"))))
+              (call-with-output-file "libgnucash/app-utils/test/CMakeLists.txt"
+                (lambda (port)
+                  (display "set(CTEST_CUSTOM_TESTS_IGNORE online_wiggle)" port)))))
           (add-after 'unpack 'set-env-vars
             (lambda* (#:key inputs #:allow-other-keys)
               ;; At least one test is time-related and requires this
@@ -171,6 +171,7 @@
            swig))
     (inputs
      (list aqbanking
+           bash-minimal
            boost
            glib
            gtk+
@@ -183,6 +184,7 @@
            libxslt
            perl-date-manip
            perl-finance-quote
+           perl-json-parse
            python
            tzdata-for-tests
            webkitgtk-with-libsoup2))
@@ -212,11 +214,13 @@ installed as well as Yelp, the Gnome help browser.")
       (source
        (origin
          (method url-fetch)
+         ;; The filename for version 5.3 is gnucash-docs-5.2.tar.gz, not
+         ;; gnucash-docs-5.3.tar.gz.
          (uri (string-append
                "mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
-               version "/gnucash-docs-" version revision ".tar.gz"))
+               version "/gnucash-docs-5.2" revision ".tar.gz"))
          (sha256
-          (base32 "1cgdb5qrwrx6yf6dsc8zlhi67lbyjs1g82i0n53sw6n6v38dd882"))))
+          (base32 "16xlxwdgc0w4cg9kxg4w2f1y974cb16wq2c9icq5qrh3nj0nbsxr"))))
       (build-system cmake-build-system)
       ;; These are native-inputs because they are only required for building the
       ;; documentation.
-- 
cgit 1.4.1


From 3a3752400d7a70a295a27b66f29457aeeaa2cf27 Mon Sep 17 00:00:00 2001
From: Florian Pelz <pelzflorian@pelzflorian.de>
Date: Mon, 17 Jul 2023 20:58:49 +0200
Subject: doc: Fix typos.

* doc/guix.texi (Creating a Channel): Fix typos.
---
 doc/guix.texi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 9af1b4417b..ee03de04dc 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -5776,7 +5776,7 @@ a package collection.  This involves the following steps:
 
 @enumerate
 @item
-Channels live in a Git repository so the first step, when creating a
+A channel lives in a Git repository so the first step, when creating a
 channel, is to create its repository:
 
 @example
@@ -5790,7 +5790,7 @@ The next step is to create files containing package modules
 (@pxref{Package Modules}), each of which will contain one or more
 package definitions (@pxref{Defining Packages}).  A channel can provide
 things other than packages, such as build systems or services; we're
-using packages as most common use case.
+using packages as it's the most common use case.
 
 For example, Alice might want to provide a module called @code{(alice
 packages greetings)} that will provide her favorite ``hello world''
@@ -5815,7 +5815,7 @@ that.
 @item
 With this first module in place, the next step is to test the packages
 it provides.  This can be done with @command{guix build}, which needs to
-be fold to look for modules in the Git checkout.  For example, assuming
+be told to look for modules in the Git checkout.  For example, assuming
 @code{(alice packages greetings)} provides a package called
 @code{hi-from-alice}, Alice will run this command from the Git checkout:
 
@@ -5856,7 +5856,7 @@ example, @code{(alice packages greetings)} will automatically be found
 by the @command{guix} command.
 @end enumerate
 
-Voilà!  
+Voilà!
 
 @c What follows stems from discussions at
 @c <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=22629#134> as well as
-- 
cgit 1.4.1


From 08870dc3bc2a82e8df0b9fb1487bef5769127648 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Tue, 18 Jul 2023 13:10:51 +0200
Subject: gnu: insight-toolkit: Fix compilation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously, code would be compiled with '-std=c++11', leading to
compilation errors in VNL:

  vnl_bignum.cxx:738:37: error: ‘numeric_limits’ is not a member of ‘std’

* gnu/packages/image-processing.scm (insight-toolkit)[arguments]: Pass
"-DCMAKE_CXX_STANDARD=17".
---
 gnu/packages/image-processing.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 3a846cbe25..d8a20c08aa 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -1288,7 +1288,8 @@ libraries designed for computer vision research and implementation.")
          ;; This prevents "GTest::GTest" from being added to the ITK_LIBRARIES
          ;; variable in the installed CMake files.  This is necessary as other
          ;; packages using insight-toolkit could not be configured otherwise.
-         "-DGTEST_ROOT=gtest")
+         "-DGTEST_ROOT=gtest"
+         "-DCMAKE_CXX_STANDARD=17")
 
        #:phases
        (modify-phases %standard-phases
-- 
cgit 1.4.1


From b910dedff0e5296b116f7f95fc201206958b0b2f Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Tue, 18 Jul 2023 13:17:07 +0200
Subject: gnu: insight-toolkit: Really disable '-mtune=native'.

* gnu/packages/image-processing.scm (insight-toolkit)[arguments]: Fix
typo in 'do-not-tune' phase.
---
 gnu/packages/image-processing.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index d8a20c08aa..a6af0ce626 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -1296,8 +1296,7 @@ libraries designed for computer vision research and implementation.")
          (add-after 'unpack 'do-not-tune
            (lambda _
              (substitute* "CMake/ITKSetStandardCompilerFlags.cmake"
-               (("-mute=native") ""))
-             #t)))))
+               (("-mtune=native") "")))))))
     (inputs
      `(("eigen" ,eigen)
        ("expat" ,expat)
-- 
cgit 1.4.1


From 437687b7151f722bb76b2e9550910e0611572d10 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Tue, 18 Jul 2023 13:26:50 +0200
Subject: gnu: insight-toolkit: Remove input labels and use gexps.

* gnu/packages/image-processing.scm (insight-toolkit)[arguments]: Use
gexps.
[inputs]: Remove labels.
(insight-toolkit-4)[arguments]: Use gexps.
---
 gnu/packages/image-processing.scm | 74 +++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index a6af0ce626..6a72209f96 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -1279,39 +1279,38 @@ libraries designed for computer vision research and implementation.")
         (base32 "0bs63mk4q8jmx38f031jy5w5n9yy5ng9x8ijwinvjyvas8cichqi"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f            ; tests require network access and external data
-       #:configure-flags
-       '("-DITK_USE_GPU=ON"
-         "-DITK_USE_SYSTEM_LIBRARIES=ON"
-         "-DITK_USE_SYSTEM_GOOGLETEST=ON"
-         "-DITK_BUILD_SHARED=ON"
-         ;; This prevents "GTest::GTest" from being added to the ITK_LIBRARIES
-         ;; variable in the installed CMake files.  This is necessary as other
-         ;; packages using insight-toolkit could not be configured otherwise.
-         "-DGTEST_ROOT=gtest"
-         "-DCMAKE_CXX_STANDARD=17")
+     (list #:tests? #f ; tests require network access and external data
+           #:configure-flags #~'("-DITK_USE_GPU=ON"
+                                 "-DITK_USE_SYSTEM_LIBRARIES=ON"
+                                 "-DITK_USE_SYSTEM_GOOGLETEST=ON"
+                                 "-DITK_BUILD_SHARED=ON"
+                                 ;; This prevents "GTest::GTest" from being added to the ITK_LIBRARIES
+                                 ;; variable in the installed CMake files.  This is necessary as other
+                                 ;; packages using insight-toolkit could not be configured otherwise.
+                                 "-DGTEST_ROOT=gtest"
+                                 "-DCMAKE_CXX_STANDARD=17")
 
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'do-not-tune
-           (lambda _
-             (substitute* "CMake/ITKSetStandardCompilerFlags.cmake"
-               (("-mtune=native") "")))))))
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'do-not-tune
+                          (lambda _
+                            (substitute* "CMake/ITKSetStandardCompilerFlags.cmake"
+                              (("-mtune=native")
+                               "")))))))
     (inputs
-     `(("eigen" ,eigen)
-       ("expat" ,expat)
-       ("fftw" ,fftw)
-       ("fftwf" ,fftwf)
-       ("hdf5" ,hdf5)
-       ("libjpeg" ,libjpeg-turbo)
-       ("libpng" ,libpng)
-       ("libtiff" ,libtiff)
-       ("mesa" ,mesa-opencl)
-       ("perl" ,perl)
-       ("python" ,python)
-       ("tbb" ,tbb)
-       ("vxl" ,vxl-1)
-       ("zlib" ,zlib)))
+     (list eigen
+           expat
+           fftw
+           fftwf
+           hdf5
+           libjpeg-turbo
+           libpng
+           libtiff
+           mesa-opencl
+           perl
+           python
+           tbb
+           vxl-1
+           zlib))
     (native-inputs
      (list googletest pkg-config))
     (home-page "https://github.com/InsightSoftwareConsortium/ITK/")
@@ -1338,13 +1337,12 @@ combine the information contained in both.")
        (sha256
         (base32 "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns"))))
     (arguments
-     `(#:tests? #f            ; tests require network access and external data
-       #:configure-flags
-       '("-DITKV3_COMPATIBILITY=ON"     ; needed for itk-snap
-         "-DITK_USE_GPU=ON"
-         "-DITK_USE_SYSTEM_LIBRARIES=ON"
-         "-DITK_USE_SYSTEM_GOOGLETEST=ON"
-         "-DITK_USE_SYSTEM_VXL=ON")))))
+     (list #:tests? #f ; tests require network access and external data
+           #:configure-flags #~'("-DITKV3_COMPATIBILITY=ON" ; needed for itk-snap
+                                 "-DITK_USE_GPU=ON"
+                                 "-DITK_USE_SYSTEM_LIBRARIES=ON"
+                                 "-DITK_USE_SYSTEM_GOOGLETEST=ON"
+                                 "-DITK_USE_SYSTEM_VXL=ON")))))
 
 (define-public insight-toolkit-4.12
   (package (inherit insight-toolkit-4)
-- 
cgit 1.4.1


From 377dc49f2443644866b180b3b162d7d4aab88531 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Tue, 18 Jul 2023 13:29:36 +0200
Subject: gnu: insight-toolkit: Mark as tunable.

* gnu/packages/image-processing.scm (insight-toolkit)[properties]: New
field.
---
 gnu/packages/image-processing.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 6a72209f96..965eca82b7 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -1313,6 +1313,12 @@ libraries designed for computer vision research and implementation.")
            zlib))
     (native-inputs
      (list googletest pkg-config))
+
+    ;; The 'CMake/ITKSetStandardCompilerFlags.cmake' file normally sets
+    ;; '-mtune=native -march=corei7', suggesting there's something to be
+    ;; gained from CPU-specific optimizations.
+    (properties '((tunable? . #t)))
+
     (home-page "https://github.com/InsightSoftwareConsortium/ITK/")
     (synopsis "Scientific image processing, segmentation and registration")
     (description "The Insight Toolkit (ITK) is a toolkit for N-dimensional
-- 
cgit 1.4.1


From d2c6d1d818ebd0ebeb94252e439f80e59e850207 Mon Sep 17 00:00:00 2001
From: kiasoc5 <kiasoc5@disroot.org>
Date: Tue, 20 Jun 2023 21:00:54 -0400
Subject: gnu: Add firejail.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/linux.scm (firejail): New variable.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/linux.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e099c5cc83..39503de6ff 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -95,6 +95,7 @@
   #:use-module (gnu packages acl)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages algebra)
+  #:use-module (gnu packages apparmor)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages avahi)
@@ -10165,6 +10166,42 @@ suggestions from various sources, including:
 This tool supports checking Kconfig options and kernel cmdline parameters.")
     (license license:gpl3)))
 
+(define-public firejail
+  (package
+    (name "firejail")
+    (version "0.9.72")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/netblue30/firejail/releases/download/" version
+                    "/firejail-" version ".tar.xz" ))
+              (sha256
+               (base32
+                "1x77xy1mwfgjrcsymdda82bjnqgl7z2yymcb10mzd1zwik27gqc2"))))
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (with-directory-excursion "test"
+                       (invoke "make"))))))))
+    (build-system gnu-build-system)
+    (inputs
+     (list apparmor xdg-dbus-proxy))
+    (synopsis "Linux namespaces sandbox program")
+    (description
+     "Firejail is a SUID sandbox program that reduces the risk of security
+breaches by restricting the running environment of untrusted applications
+using Linux namespaces, seccomp-bpf and Linux capabilities.  The software
+includes sandbox profiles for a number of common Linux programs.  Firejail
+should be added to the list of setuid programs in the system configuration to
+work properly.")
+    (home-page "https://github.com/netblue30/firejail")
+    (supported-systems
+     (filter (cut string-suffix? "-linux" <>) %supported-systems))
+    (license license:gpl2+)))
+
 (define-public edac-utils
   (package
     (name "edac-utils")
-- 
cgit 1.4.1


From a6eb936d281a988d0c83f4bdaacc72c43f9644ad Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@member.fsf.org>
Date: Sat, 8 Jul 2023 08:40:29 +0800
Subject: gnu: newick-utils: Skip tests on riscv64-linux.

* gnu/packages/bioinformatics.scm (newick-utils)[arguments]: Skip tests
when building on riscv64-linux.
---
 gnu/packages/bioinformatics.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 4acba4f3c9..3ebfdcc385 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7279,7 +7279,8 @@ program for nucleotide and protein sequences.")
                   "1hkw21rq1mwf7xp0rmbb2gqc0i6p11108m69i7mr7xcjl268pxnb"))))
       (build-system gnu-build-system)
       (arguments
-       '(#:make-flags (list "CFLAGS=-O2 -g -fcommon")))
+       `(#:tests? ,(not (target-riscv64?)) ;XXX: stuck on riscv64-linux
+         #:make-flags (list "CFLAGS=-O2 -g -fcommon")))
       (inputs
        ;; XXX: TODO: Enable Lua and Guile bindings.
        ;; https://github.com/tjunier/newick_utils/issues/13
-- 
cgit 1.4.1


From 1bd3b7d2c7c2ad22f0aba200ed613425e3a11223 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 6 Jul 2023 10:13:41 +0100
Subject: gnu: libupnp: Update to 1.14.17.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/upnp.scm (libupnp): Update to 1.14.17.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/upnp.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
index df94dc8f8b..bc93f51563 100644
--- a/gnu/packages/upnp.scm
+++ b/gnu/packages/upnp.scm
@@ -96,14 +96,14 @@ over IRC, instant messaging, network games, and most server software.")
 (define-public libupnp
   (package
     (name "libupnp")
-    (version "1.14.15")
+    (version "1.14.17")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "https://github.com/pupnp/pupnp/releases/download"
                           "/release-" version "/libupnp-" version".tar.bz2"))
       (sha256
-       (base32 "1133wv3jrjpa355hnjxwp26igxq5l3xf3qi9m4jnyic3xb394kkr"))))
+       (base32 "1yvgrfdhvsz6br3i7k37pigcw25rnzkxdx4sjizqqhm0xd1751wv"))))
     (native-inputs
      (list pkg-config))
     (build-system gnu-build-system)
-- 
cgit 1.4.1


From 2c19706fd83051fdad7a919d6a89d16eee6e3340 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 6 Jul 2023 10:08:32 +0100
Subject: gnu: libnatpmp: Update to 20230423.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/networking.scm (libnatpmp): Update to 20230423.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/networking.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 1fbbbc1267..3ddf9e7a27 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1426,7 +1426,7 @@ files contain direct mappings of the abstractions provided by the ØMQ C API.")
 (define-public libnatpmp
   (package
     (name "libnatpmp")
-    (version "20150609")
+    (version "20230423")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1434,7 +1434,7 @@ files contain direct mappings of the abstractions provided by the ØMQ C API.")
                     name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1"))))
+                "0w7wvf4yi8qv659dg9d3ndqvh3bqhgm21gd135spwhq6hhnfv106"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-- 
cgit 1.4.1


From 30403c7c3fa9f700edc11fb6584590a68f26b1a5 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 5 Jul 2023 09:46:23 +0100
Subject: gnu: mingw: Update to 11.0.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mingw.scm (mingw): Update to 11.0.0.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mingw.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm
index ae8bea1009..d47f918ac4 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 "10.0.0")
+      (version "11.0.0")
       (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 "15089y4rlj6g1m2m3cm3awndw3rbzhznl7skd0vkmikjxl546sxs"))
+          (base32 "0pycbxlqh8gj2zp3k531p0r4m7ay6f4nhs9sq9620c6q7dis23mx"))
          (patches
           (search-patches "mingw-w64-6.0.0-gcc.patch"
                           "mingw-w64-dlltool-temp-prefix.patch"
-- 
cgit 1.4.1


From f610821edae47611ce534afe0659a83f8479cd75 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 5 Jul 2023 09:49:20 +0100
Subject: gnu: mingw-w64-tools: Update to 11.0.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mingw.scm (mingw-w64-tools): Update to 11.0.0.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mingw.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm
index d47f918ac4..2b0b45457e 100644
--- a/gnu/packages/mingw.scm
+++ b/gnu/packages/mingw.scm
@@ -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 "10.0.0")
+    (version "11.0.0")
     (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 "15089y4rlj6g1m2m3cm3awndw3rbzhznl7skd0vkmikjxl546sxs"))))
+        (base32 "0pycbxlqh8gj2zp3k531p0r4m7ay6f4nhs9sq9620c6q7dis23mx"))))
     (build-system gnu-build-system)
     (arguments
      `(#:modules ((guix build gnu-build-system)
-- 
cgit 1.4.1


From 65974e8aa7fceaa3dd861f92af4304fc36f80d9b Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 4 Jul 2023 18:07:40 +0100
Subject: gnu: nsis: Update to 3.09.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/installers.scm (make-nsis): Update to 3.09.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/installers.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm
index 79738598cb..9879359be7 100644
--- a/gnu/packages/installers.scm
+++ b/gnu/packages/installers.scm
@@ -34,14 +34,14 @@
          (xgcc (cross-gcc triplet #:libc xlibc)))
     (package
       (name (string-append "nsis-" machine))
-      (version "3.08")
+      (version "3.09")
       (source (origin
                 (method url-fetch)
                 (uri (string-append "http://prdownloads.sourceforge.net/nsis/nsis-"
                                     version "-src.tar.bz2"))
                 (sha256
                  (base32
-                  "11qy1n1qdcqwal9hn8cmzm7gxjdyx7by6w14rfz2l646afnp0lm8"))
+                  "1qjnvhnj89a40ac10k2mbln0yqscdmawmgw71816i465x734dn0c"))
                 (patches (search-patches "nsis-env-passthru.patch"))))
       (build-system scons-build-system)
       (native-inputs `(("xgcc" ,xgcc)
-- 
cgit 1.4.1


From bf6727fadf59dcd14f727a572b49c61bb9092108 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@disroot.org>
Date: Mon, 3 Jul 2023 22:52:17 +0200
Subject: gnu: ardour: Update to 7.5.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/audio.scm (ardour): Update to 7.5.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/audio.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 1156be5f65..e35e44febb 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -739,7 +739,7 @@ purposes developed at Queen Mary, University of London.")
 (define-public ardour
   (package
     (name "ardour")
-    (version "7.4")
+    (version "7.5")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -756,7 +756,7 @@ purposes developed at Queen Mary, University of London.")
 namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }")))))
               (sha256
                (base32
-                "0v66h9fghjyjinldw9yfhhlfi3my235x6n4dpxx432z35lka2h89"))
+                "18pgxnxfp0pqsy24cmf3hanr6vh0pnimsh48x5nfbflqy7ljsrkj"))
               (file-name (string-append name "-" version))))
     (build-system waf-build-system)
     (arguments
-- 
cgit 1.4.1


From d1a76ac512cb0dab5fb8401e4d587f83042a7758 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@disroot.org>
Date: Mon, 3 Jul 2023 22:52:18 +0200
Subject: gnu: ardour: Install bundled MIDI loops.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/audio.scm (ardour)[#:phases]: Add install-bundled-media.
[native-inputs]: Add unzip.
[license]: Add cc0 and expat.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/audio.scm | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e35e44febb..2e2632f356 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -736,6 +736,14 @@ purposes developed at Queen Mary, University of London.")
                          libdir "/surfaces" ":"
                          libdir "/vamp" "\"]"))))))
 
+(define ardour-bundled-media
+  (origin
+    (method url-fetch)
+    (uri "http://stuff.ardour.org/loops/ArdourBundledMedia.zip")
+    (sha256
+     (base32
+      "0k135sm559yywfidrya7h5cddwqa2p2abhimrar2khydf43f03d0"))))
+
 (define-public ardour
   (package
     (name "ardour")
@@ -794,7 +802,14 @@ namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \
          (add-after 'install 'install-man-page
            (lambda* (#:key outputs #:allow-other-keys)
              (install-file "ardour.1" (string-append (assoc-ref outputs "out")
-                                                     "/share/man/man1")))))
+                                                     "/share/man/man1"))))
+         (add-after 'install 'install-bundled-media
+           (lambda* (#:key outputs #:allow-other-keys)
+             (invoke "unzip" "-d" (string-append (assoc-ref outputs "out")
+                                                 "/share/ardour"
+                                                 ,(version-major version)
+                                                 "/media/")
+                     ,ardour-bundled-media))))
        #:test-target "test"))
     (inputs
      (list alsa-lib
@@ -849,14 +864,17 @@ namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \
            gettext-minimal
            itstool
            perl
-           pkg-config))
+           pkg-config
+           unzip))
     (home-page "https://ardour.org")
     (synopsis "Digital audio workstation")
     (description
      "Ardour is a multi-channel digital audio workstation, allowing users to
 record, edit, mix and master audio and MIDI projects.  It is targeted at audio
 engineers, musicians, soundtrack editors and composers.")
-    (license license:gpl2+)))
+    (license (list license:gpl2+
+                   license:cc0 ;used by MIDI Beats
+                   license:expat)))) ;used by MIDI Chords and Progressions
 
 (define-public audacity
   (package
-- 
cgit 1.4.1


From 3c79f4b50abba1e370da4d2a808cc6bfc4336654 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@disroot.org>
Date: Mon, 3 Jul 2023 22:52:19 +0200
Subject: gnu: ardour: Inline ardour-rpath-phase into its definition.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/audio.scm (ardour)[#:phases]: Inline ardour-rpath-phase.
(ardour-rpath-phase): Delete variable.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/audio.scm | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 2e2632f356..8a11d2d6cc 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -721,21 +721,6 @@ streams from live audio.")
 purposes developed at Queen Mary, University of London.")
     (license license:gpl2+)))
 
-(define (ardour-rpath-phase major-version)
-  `(lambda* (#:key outputs #:allow-other-keys)
-     (let ((libdir (string-append (assoc-ref outputs "out")
-                                  "/lib/ardour" ,major-version)))
-       (substitute* "wscript"
-         (("linker_flags = \\[\\]")
-          (string-append "linker_flags = [\""
-                         "-Wl,-rpath="
-                         libdir ":"
-                         libdir "/backends" ":"
-                         libdir "/engines" ":"
-                         libdir "/panners" ":"
-                         libdir "/surfaces" ":"
-                         libdir "/vamp" "\"]"))))))
-
 (define ardour-bundled-media
   (origin
     (method url-fetch)
@@ -777,7 +762,20 @@ namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'set-rpath-in-LDFLAGS
-          ,(ardour-rpath-phase (version-major version)))
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((libdir (string-append (assoc-ref outputs "out")
+                                          "/lib/ardour"
+                                          ,(version-major version))))
+               (substitute* "wscript"
+                 (("linker_flags = \\[\\]")
+                  (string-append "linker_flags = [\""
+                                 "-Wl,-rpath="
+                                 libdir ":"
+                                 libdir "/backends" ":"
+                                 libdir "/engines" ":"
+                                 libdir "/panners" ":"
+                                 libdir "/surfaces" ":"
+                                 libdir "/vamp" "\"]"))))))
          (add-after 'install 'install-freedesktop-files
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out   (assoc-ref outputs "out"))
-- 
cgit 1.4.1


From bd0e7c5e177df3183ad5f4f5a74d249897c92ed2 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Tue, 20 Jun 2023 18:55:35 +0000
Subject: gnu: zsh: Update to 5.9.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/shells.scm (zsh): Update to 5.9.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/shells.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 16a4bba92f..0dae9ee954 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -460,7 +460,7 @@ history mechanism, job control and a C-like syntax.")
 (define-public zsh
   (package
     (name "zsh")
-    (version "5.8.1")
+    (version "5.9")
     (source (origin
               (method url-fetch)
               (uri (list (string-append
@@ -471,7 +471,7 @@ history mechanism, job control and a C-like syntax.")
                            ".tar.xz")))
               (sha256
                (base32
-                "06crvpqbpm8sq5c215f4b985z7npwnqnj0i0g53hnq6fp8h3b5xn"))
+                "1mdc8lnq8qxq1ahxp8610n799pd7a9kqg3liy7xq2pjvvp71x3cv"))
               (patches (search-patches "zsh-egrep-failing-test.patch"))))
     (build-system gnu-build-system)
     (arguments `(#:configure-flags
-- 
cgit 1.4.1


From 94f83088d237ecd032c411bb94e2d647a2931990 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 18 Jul 2023 14:14:36 +0200
Subject: gnu: Remove unused gnumach patch.

This is a followup to commit
    2edd67d34b85715e97b222f4a46da7b156973616
    gnu: gnumach: Update to 1.8+git20221224.

* gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch:
Remove.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 ...missing-const_mach_port_name_array_t-type.patch | 32 ----------------------
 2 files changed, 33 deletions(-)
 delete mode 100644 gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 2767f5290b..0d0f8c1937 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1290,7 +1290,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/gnome-session-support-elogind.patch	\
   %D%/packages/patches/gnome-tweaks-search-paths.patch		\
   %D%/packages/patches/gnumach-support-noide.patch		\
-  %D%/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch \
   %D%/packages/patches/gnupg-default-pinentry.patch		\
   %D%/packages/patches/gnupg-1-build-with-gcc10.patch		\
   %D%/packages/patches/gnutls-skip-trust-store-test.patch	\
diff --git a/gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch b/gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch
deleted file mode 100644
index 73c99ade23..0000000000
--- a/gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 17335d49a3c9e866a81abc051420d73a59d669bf Mon Sep 17 00:00:00 2001
-Message-Id: <17335d49a3c9e866a81abc051420d73a59d669bf.1678745341.git.dev@jpoiret.xyz>
-From: Josselin Poiret <dev@jpoiret.xyz>
-Date: Sun, 28 Aug 2022 01:17:34 +0200
-Subject: [PATCH] Add missing const_mach_port_name_array_t type
-
-From: Samuel Thibault <samuel.thibault@ens-lyon.org>
-
----
- include/mach/port.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/mach/port.h b/include/mach/port.h
-index 3c226f6c..d25eb0b4 100644
---- a/include/mach/port.h
-+++ b/include/mach/port.h
-@@ -43,6 +43,7 @@
-  */
- typedef unsigned int mach_port_name_t;
- typedef mach_port_name_t *mach_port_name_array_t;
-+typedef const mach_port_name_t *const_mach_port_name_array_t;
- 
- /*
-  * A port is represented
-
-base-commit: 3e1702a65fb3caf50c8d09a1b383b0056a5efc82
-prerequisite-patch-id: 4688654277aef235ccd1797a72dce27d52b04616
-prerequisite-patch-id: 8f1e7dd6429c15cc8ed1d411dba0a75b6e745236
-prerequisite-patch-id: 605553ee086473ad9bc24e59c91d49a12dbf8631
--- 
-2.39.1
-
-- 
cgit 1.4.1


From 3d1b7cf1fa1fb58fb5fa9dff9a7537c989f0ce54 Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Mon, 17 Jul 2023 16:00:44 +0800
Subject: gnu: font-sarasa-gothic: Update to 0.41.3.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/fonts.scm (font-sarasa-gothic): Update to 0.41.3.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/fonts.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 1c4cccb6ae..6e276623d2 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1858,7 +1858,7 @@ programming.  Iosevka is completely generated from its source code.")
 (define-public font-sarasa-gothic
   (package
     (name "font-sarasa-gothic")
-    (version "0.40.7")
+    (version "0.41.3")
     (source
      (origin
        (method url-fetch)
@@ -1866,7 +1866,7 @@ programming.  Iosevka is completely generated from its source code.")
                            "/releases/download/v" version
                            "/sarasa-gothic-ttc-" version ".7z"))
        (sha256
-        (base32 "01iqc93dmi48n4g3xf472602hxhf9zfwfawy7vhn4rf06yhndv4s"))))
+        (base32 "11ldfkdc86kxbpwypggkyx2k5pj2rnq34r7gp0pmpzz61m1wk2v0"))))
     (build-system font-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
-- 
cgit 1.4.1


From a8c79839d57acf96df720630b8e6ddee8a8c2cf8 Mon Sep 17 00:00:00 2001
From: Michael Ford <fanquake@gmail.com>
Date: Thu, 30 Dec 2021 16:46:16 +0800
Subject: gnu: Add font-tuffy.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/fonts.scm (font-tuffy): New variable.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/fonts.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 6e276623d2..bc43a9866b 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -3260,6 +3260,29 @@ minor tweaks to improve readability (a matter of taste of course).
 Most characters are just 4px wide, which is brilliant for low dpi(90-120) displays.")
     (license license:silofl1.1)))
 
+(define-public font-tuffy
+  (package
+    (name "font-tuffy")
+    (version "20120614")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://tulrich.com/fonts/tuffy-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "02vf72bgrp30vrbfhxjw82s115z27dwfgnmmzfb0n9wfhxxfpyf6"))
+       (snippet '(delete-file "._Tuffy.otf"))))
+    (build-system font-build-system)
+    (home-page "http://tulrich.com/fonts/")
+    (synopsis "The Tuffy Truetype Font Family")
+    (description
+     "Thatcher Ulrich's first outline font design.  He started with the goal
++of producing a neutral, readable sans-serif text font.  There are lots of
++\"expressive\" fonts out there, but he wanted to start with something very
++plain and clean, something he might want to actually use.")
+    (license license:public-domain)))
+
 (define-public font-velvetyne-jgs
   ;; There are no releases nor tags.
   (let ((revision "1")
-- 
cgit 1.4.1


From 4e11cac6be68a674c16965dc74e7da54cd3168df Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 18 Jul 2023 17:18:40 +0200
Subject: gnu: mig: Update to 1.8+git20230520.

This reinstates 999a6ac0cfd9339e138007ed9e4e544a55e92e3e, which was
reverted by a041bbb4bf98cce72b14c554369fc56eeacc2f5d, but without
resorting to 'git-fetch'.

* gnu/packages/hurd.scm (mig): Update to 1.8+git20220827.
[source]: Remove patch.
* gnu/packages/patches/mig-cpu.h-generation.patch: Delete.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                    |  1 -
 gnu/packages/hurd.scm                           |  7 +++----
 gnu/packages/patches/mig-cpu.h-generation.patch | 16 ----------------
 3 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 gnu/packages/patches/mig-cpu.h-generation.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 0d0f8c1937..b85be30838 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1594,7 +1594,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/mia-vtk9.patch				\
   %D%/packages/patches/mia-vtk92.patch				\
   %D%/packages/patches/mia-vtk-version.patch			\
-  %D%/packages/patches/mig-cpu.h-generation.patch 		\
   %D%/packages/patches/mingw-w64-6.0.0-gcc.patch		\
   %D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch	\
   %D%/packages/patches/mingw-w64-reproducible-gendef.patch	\
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 3785c47750..b184657fb9 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -91,10 +91,10 @@
 (define-public mig
   (package
     (name "mig")
-    (version "1.8+git20220827")
+    (version "1.8+git20230520")
     (source (origin
               (method url-fetch)
-              ;; XXX: Version 2.35 of glibc can only be built with an
+              ;; XXX: Versions 2.35 and 2.37 of glibc can only be built with an
               ;; unreleased version of MiG:
               ;; <https://lists.gnu.org/archive/html/bug-hurd/2023-03/msg00025.html>.
               ;; It cannot be fetched from Git though, as the extra dependency
@@ -103,8 +103,7 @@
                                   version ".tar.gz"))
               (sha256
                (base32
-                "163d37s9lscd6zxyfng421m9nl857464mgjj90xsrcl5ykbng5p2"))
-              (patches (search-patches "mig-cpu.h-generation.patch"))))
+                "1ap31jd9jkvvz3vb88hg19cyqmqzmra724yl1xhcrv7gcgnan7d9"))))
     (build-system gnu-build-system)
     ;; Flex is needed both at build and run time.
     (inputs (list gnumach-headers flex))
diff --git a/gnu/packages/patches/mig-cpu.h-generation.patch b/gnu/packages/patches/mig-cpu.h-generation.patch
deleted file mode 100644
index 3030eaeaa6..0000000000
--- a/gnu/packages/patches/mig-cpu.h-generation.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Backport MiG commit 73fbf2504ae606dda81372701a67dad6fee0865e:
-
-  From: Flavio Cruz <flaviocruz@gmail.com>
-  Subject: Generate cpu.h with -ffreestanding
-
---- a/Makefile.in	2023-03-26 23:02:51.384318331 +0200
-+++ b/Makefile.in	2023-03-26 23:03:03.300329369 +0200
-@@ -1051,7 +1051,7 @@ uninstall-am: uninstall-binSCRIPTS unins
- .sym.symc:
- 	$(AWK_V) $(AWK) -f $(srcdir)/gensym.awk $< > $@
- .symc.symo:
--	$(AM_V_CC) $(TARGET_CC) -S $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -x c -o $@ $<
-+	$(AM_V_CC) $(TARGET_CC) -S $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -ffreestanding -x c -o $@ $<
- .symo.h:
- 	$(AM_V_GEN) sed -e '/^[^*].*$$/d' -e 's/^[*]/#define/' -e 's/mAgIc[^-0-9]*//' \
- 	    $< > $@
-- 
cgit 1.4.1


From 3f22dabc2a15154bb7fc03d9abf38a40854bf854 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 6 May 2023 07:26:01 +0200
Subject: guix: texlive-build-system: Improvements on non-trivial packages.

* guix/build/texlive-build-system.scm (build): Ignore temporary build files
when moving runfiles around.  Remove ".drv" source files prior to compiling
files.  Remove need for #:TEX-DIRECTORY keyword.  Handle ".ins" and ".dtx"
files in different directories.
(install): Install docfiles in "doc" output when available.
* guix/build-system/texlive.scm (texlive-build): Remove #:TEX-DIRECTORY.
* doc/guix.texi (Build Systems): Remove reference to #:TEX-DIRECTORY in
TEXLIVE-BUILD-SYSTEM documentation.  Also mention it now tries to compile
".dtx" files when there is no ".ins" file.
---
 doc/guix.texi                       |  15 +++--
 guix/build-system/texlive.scm       |   2 -
 guix/build/texlive-build-system.scm | 115 +++++++++++++++++++++++++++++++-----
 3 files changed, 107 insertions(+), 25 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index ee03de04dc..a1b624ad6f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10001,17 +10001,16 @@ used to build TeX packages in batch mode with a specified engine.  The
 build system sets the @env{TEXINPUTS} variable to find all TeX source
 files in the inputs.
 
-By default it runs @code{luatex} on all files ending on @code{ins}.  A
-different engine and format can be specified with the
-@code{#:tex-format} argument.  Different build targets can be specified
-with the @code{#:build-targets} argument, which expects a list of file
-names.  The build system adds only @code{texlive-bin} and
+By default it tries to run @code{luatex} on all @file{.ins} files, and
+if it fails to find any, on all @file{.dtx} files.  A different engine
+and format can be specified with the @code{#:tex-format} argument.
+Different build targets can be specified with the @code{#:build-targets}
+argument, which expects a list of file names.
+
+The build system adds only @code{texlive-bin} and
 @code{texlive-latex-base} (both from @code{(gnu packages tex}) to the
 inputs.  Both can be overridden with the arguments @code{#:texlive-bin}
 and @code{#:texlive-latex-base}, respectively.
-
-The @code{#:tex-directory} parameter tells the build system where to
-install the built files under the texmf tree.
 @end defvar
 
 @defvar ruby-build-system
diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm
index aefd573d11..55e9cfee81 100644
--- a/guix/build-system/texlive.scm
+++ b/guix/build-system/texlive.scm
@@ -130,7 +130,6 @@ level package ID."
                         #:key
                         source
                         (tests? #f)
-                        tex-directory
                         (build-targets #f)
                         (tex-engine #f)
 
@@ -161,7 +160,6 @@ level package ID."
           #$(with-build-variables inputs outputs
               #~(texlive-build #:name #$name
                                #:source #+source
-                               #:tex-directory #$tex-directory
                                #:build-targets #$build-targets
                                #:tex-engine #$(if tex-engine
                                                   tex-engine
diff --git a/guix/build/texlive-build-system.scm b/guix/build/texlive-build-system.scm
index 353fb934a6..9bc0ce31c1 100644
--- a/guix/build/texlive-build-system.scm
+++ b/guix/build/texlive-build-system.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
+;;; Copyright © 2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,8 +23,9 @@
   #:use-module ((guix build gnu-build-system) #:prefix gnu:)
   #:use-module (guix build utils)
   #:use-module (guix build union)
-  #:use-module (ice-9 match)
+  #:use-module (ice-9 format)
   #:use-module (ice-9 ftw)
+  #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:export (%standard-phases
@@ -35,33 +37,116 @@
 ;;
 ;; Code:
 
-(define (compile-with-latex engine format file)
+(define (runfiles-root-directories)
+  "Return list of root directories containing runfiles."
+  (scandir "."
+           (negate
+            (cut member <> '("." ".." "build" "doc" "source")))))
+
+(define* (delete-drv-files #:rest _)
+  "Delete pre-generated \".drv\" files in order to prevent build failures."
+  (when (file-exists? "source")
+    (for-each delete-file (find-files "source" "\\.drv$"))))
+
+(define (compile-with-latex engine format output file)
   (invoke engine
           "-interaction=nonstopmode"
-          "-output-directory=build"
+          (string-append "-output-directory=" output)
           (if format (string-append "&" format) "-ini")
           file))
 
 (define* (build #:key inputs build-targets tex-engine tex-format
                 #:allow-other-keys)
-  (mkdir "build")
-  (for-each (cut compile-with-latex tex-engine tex-format <>)
-            (if build-targets build-targets
-                (scandir "." (cut string-suffix? ".ins" <>)))))
+  (let ((targets
+         (cond
+          (build-targets
+           ;; Collect the relative file names of all the specified targets.
+           (append-map (lambda (target)
+                         (find-files "source"
+                                     (lambda (f _)
+                                       (string-suffix? (string-append "/" target)
+                                                       f))))
+                       build-targets))
+          ((directory-exists? "source")
+           ;; Prioritize ".ins" files over ".dtx" files.  There's no
+           ;; scientific reasoning here; it just seems to work better.
+           (match (find-files "source" "\\.ins$")
+             (() (find-files "source" "\\.dtx$"))
+             (files files)))
+          (else '()))))
+    (unless (null? targets)
+      (let ((output (string-append (getcwd) "/build")))
+        (mkdir-p output)
+        (for-each (lambda (target)
+                    (with-directory-excursion (dirname target)
+                      (compile-with-latex tex-engine
+                                          tex-format
+                                          output
+                                          (basename target))))
+                  targets))
+      ;; Now move generated files from the "build" directory into the rest of
+      ;; the source tree, effectively replacing downloaded files.
+
+      ;; Documentation may have been generated, but replace only runfiles,
+      ;; i.e., files that belong neither to "doc" nor "source" trees.
+      ;;
+      ;; In TeX Live, all packages are fully pre-generated.  As a consequence,
+      ;; a generated file from the "build" top directory absent from the rest
+      ;; of the tree is deemed unnecessary and can safely be ignored.
+      (let ((runfiles (append-map (cut find-files <>)
+                                  (runfiles-root-directories))))
+        (for-each (lambda (file)
+                    (match (filter
+                            (cut string-suffix?
+                                 (string-drop file (string-length "build"))
+                                 <>)
+                            runfiles)
+                      ;; Current file is not a runfile.  Ignore it.
+                      (() #f)
+                      ;; One candidate only.  Replace it with the one just
+                      ;; generated.
+                      ((destination)
+                       (let ((target (dirname destination)))
+                         (install-file file target)
+                         (format #t "re-generated file ~s in ~s~%"
+                                 (basename file)
+                                 target)))
+                      ;; Multiple candidates!  Not much can be done.
+                      ;; Hopefully, this should never happen.
+                      (_
+                       (format (current-error-port)
+                               "warning: ambiguous localization of file ~s; \
+ignoring it~%"
+                               (basename file)))))
+                  ;; Preserve the relative file name of the generated file in
+                  ;; order to be more accurate when looking for the
+                  ;; corresponding runfile in the tree.
+                  (find-files "build"))))))
 
-(define* (install #:key outputs tex-directory #:allow-other-keys)
-  (let* ((out (assoc-ref outputs "out"))
-         (target (string-append
-                  out "/share/texmf-dist/tex/" tex-directory)))
-    (mkdir-p target)
-    (for-each delete-file (find-files "." "\\.(log|aux)$"))
-    (for-each (cut install-file <> target)
-              (find-files "build" ".*"))))
+(define* (install #:key outputs #:allow-other-keys)
+  (let ((out (assoc-ref outputs "out"))
+        (doc (assoc-ref outputs "doc")))
+    ;; Take care of documentation.
+    (when (directory-exists? "doc")
+      (unless doc
+        (format (current-error-port)
+                "warning: missing 'doc' output for package documentation~%"))
+      (let ((doc-dir (string-append (or doc out) "/share/texmf-dist/doc")))
+        (mkdir-p doc-dir)
+        (copy-recursively "doc" doc-dir)))
+    ;; Handle runfiles.
+    (let ((texmf (string-append (assoc-ref outputs "out") "/share/texmf-dist")))
+      (for-each (lambda (root)
+                  (let ((destination (string-append texmf "/" root)))
+                    (mkdir-p destination)
+                    (copy-recursively root destination)))
+                (runfiles-root-directories)))))
 
 (define %standard-phases
   (modify-phases gnu:%standard-phases
     (delete 'bootstrap)
     (delete 'configure)
+    (add-before 'build 'delete-drv-files delete-drv-files)
     (replace 'build build)
     (delete 'check)
     (replace 'install install)))
-- 
cgit 1.4.1


From bc3384923e704ffa7c1f091d4700a701c39f0d33 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 3 May 2023 19:56:27 +0200
Subject: gnu: Simplify simple-texlive-package for non-trivial packages.

* gnu/packages/tex.scm (simple-texlive-package): When #:TRIVIAL keyword is not
set, do not add any phase, and let TRIVIAL-BUILD-SYSTEM proceed.  With this
change, `simple-texlive-package' can be removed piece-wise in texlive packages
without breakage, assuming spurious `chdir' and `copy-files' phases are
removed.
(texlive-bidi):
(texlive-alphalph):
(texlive-mflogo):
(texlive-amsfonts):
(texlive-halloweenmath):
(texlive-atveryend):
(texlive-auxhook):
(texlive-epstopdf-pkg):
(texlive-filecontents):
(texlive-graphics):
(texlive-hycolor):
(texlive-xcolor):
(texlive-hyperref):
(texlive-oberdiek):
(texlive-rerunfilecheck):
(texlive-onedown):
(texlive-tools):
(texlive-fontspec):
(texlive-stringenc):
(texlive-amsmath):
(texlive-mathdots):
(texlive-amscls):
(texlive-babel):
(texlive-babel-french):
(texlive-babel-swedish):
(texlive-pict2e):
(texlive-psnfss):
(texlive-bigfoot):
(texlive-firstaid):
(texlive-pdftexcmds):
(texlive-refcount):
(texlive-capt-of):
(texlive-makecmds):
(texlive-metalogo):
(texlive-paralist):
(texlive-polyglossia):
(texlive-fancyhdr):
(texlive-letltxmacro):
(texlive-listings):
(texlive-kvoptions):
(texlive-zref):
(texlive-eso-pic):
(texlive-pdfpages):
(texlive-stmaryrd):
(texlive-subfigure):
(texlive-lh):
(texlive-acronym):
(texlive-ms):
(texlive-ncctools):
(texlive-numprint):
(texlive-atbegshi):
(texlive-bigintcalc):
(texlive-bitset):
(texlive-etexcmds):
(texlive-gettitlestring):
(texlive-infwarerr):
(texlive-intcalc):
(texlive-kvdefinekeys):
(texlive-kvsetkeys):
(texlive-ltxcmds):
(texlive-pdfescape):
(texlive-uniquecounter):
(texlive-pdfx):
(texlive-marginnote):
(texlive-tabu):
(texlive-siunitx):
(texlive-sectsty):
(texlive-morefloats):
(texlive-ifmtarg):
(texlive-pagenote):
(texlive-titling):
(texlive-ifoddpage):
(texlive-storebox):
(texlive-collectbox):
(texlive-grfext):
(texlive-adjustbox):
(texlive-qrcode):
(texlive-unicode-math):
(texlive-babel-czech):
(texlive-babel-dutch):
(texlive-babel-finnish):
(texlive-babel-danish):
(texlive-babel-polish):
(texlive-abstract):
(texlive-breqn):
(texlive-datatool):
(texlive-lastpage):
(texlive-soul):
(texlive-soulutf8):
(texlive-totcount):
(texlive-totpages): Remove `chdir' and `copy-files' phases.
---
 gnu/packages/tex.scm | 1447 +++++---------------------------------------------
 1 file changed, 125 insertions(+), 1322 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 65f8d901d7..bad86904c6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2020, 2021 Paul Garlick <pgarlick@tourbillion-technology.com>
 ;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
@@ -108,16 +109,21 @@
 downloading from a list of LOCATIONS in the TeX Live repository, and expecting
 the provided output HASH.  If TRIVIAL? is provided, all files will simply be
 copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used."
+  (set! locations
+        ;; Some locations may be manually inserted, so be tolerant with
+        ;; leading slashes.  Ignore them consistently.
+        (map (lambda (location)
+               (if (string-prefix? "/" location)
+                   (string-drop location 1)
+                   location))
+             locations))
   (define with-documentation?
-    (and trivial?
-         (any (lambda (location)
-                (string-prefix? "/doc" location))
-              locations)))
+    (any (lambda (l) (string-prefix? "doc/" l))
+         locations))
   (package
     (name name)
     (version (number->string %texlive-revision))
-    (source (texlive-origin name version
-                            locations hash))
+    (source (texlive-origin name version locations hash))
     (outputs (if with-documentation?
                  '("out" "doc")
                  '("out")))
@@ -126,25 +132,31 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used."
                       texlive-build-system))
     (arguments
      (let ((copy-files
-            `(lambda* (#:key outputs inputs #:allow-other-keys)
+            `(lambda* (#:key outputs inputs tex-directory #:allow-other-keys)
                (let (,@(if with-documentation?
                            `((doc (string-append (assoc-ref outputs "doc")
-                                                 "/share/texmf-dist/")))
+                                                 "/share/texmf-dist")))
                            '())
+                     (source (assoc-ref inputs "source"))
                      (out (string-append (assoc-ref outputs "out")
-                                         "/share/texmf-dist/")))
+                                         "/share/texmf-dist")))
                  ,@(if with-documentation?
                        '((mkdir-p doc)
                          (copy-recursively
-                          (string-append (assoc-ref inputs "source") "/doc")
+                          (string-append source "/doc")
                           (string-append doc "/doc")))
                        '())
                  (mkdir-p out)
                  (copy-recursively "." out)
-                 ,@(if with-documentation?
-                       '((delete-file-recursively (string-append out "/doc")))
-                       '())
-                 #t))))
+                 ;; In any case, if documentation exists, it is already in the
+                 ;; "doc" output, so remove it from regular one.
+                 (let ((doc (string-append out "/doc")))
+                   (when (file-exists? doc)
+                     (delete-file-recursively doc)))
+                 ;; Also remove all source files.
+                 (let ((srcfiles (string-append out "/source")))
+                   (when (file-exists? srcfiles)
+                     (delete-file-recursively srcfiles)))))))
        (if trivial?
            `(#:tests? #f
              #:phases
@@ -152,9 +164,7 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used."
                (delete 'configure)
                (replace 'build (const #t))
                (replace 'install ,copy-files)))
-           `(#:phases
-             (modify-phases %standard-phases
-               (add-after 'install 'copy-files ,copy-files))))))
+           `())))
     (home-page #f)
     (synopsis #f)
     (description #f)
@@ -628,20 +638,6 @@ This package contains the binaries.")
                 "09nfvsjfnms3pclyd2rcivyb5qvzw48b934i3bcl83hv69ix2ks7"))))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list
-      #:tex-directory "xelatex/bidi"
-      #:phases #~(modify-phases %standard-phases
-                   (add-after 'unpack 'chdir
-                     (lambda _
-                       (chdir "source/xelatex/bidi")))
-                   (add-after 'install 'install-doc
-                     (lambda* (#:key outputs #:allow-other-keys)
-                       (let ((doc (string-append (assoc-ref outputs "doc")
-                                                 "/share/texmf-dist/doc")))
-                         (mkdir-p doc)
-                         (copy-recursively (string-append #$source "/doc")
-                                           doc)))))))
     (propagated-inputs (list texlive-iftex
                              texlive-ltxcmds
                              texlive-hyperref
@@ -706,24 +702,8 @@ executables.  It is maintained as a part of TeX Live.")))
       (outputs '("out" "doc"))
       (arguments
        (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/alphalph")
          ((#:build-targets _ '())
-          #~(list "alphalph.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/alphalph")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "alphalph.dtx"))))
       (propagated-inputs
        (list texlive-intcalc texlive-infwarerr))
       (home-page "https://ctan.org/pkg/alphalph")
@@ -1503,57 +1483,6 @@ symbol fonts.")
                     "1vb4mg7fh4k54g7nqwiw3qm4iir8whpfnspis76l4sddzar1amh7"))))
     (package
       (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:modules _ '())
-          '((guix build texlive-build-system)
-            (guix build utils)
-            (srfi srfi-1)
-            (srfi srfi-26)))
-         ((#:tex-directory _ #t)
-          "latex/mflogo")
-         ((#:phases phases '())
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _
-                 (chdir "source/latex/mflogo") #t))
-             (add-after 'build 'build-font-metrics
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (let ((root "../../..")
-                       (mf (assoc-ref inputs "texlive-metafont"))
-                       (kl (assoc-ref inputs "texlive-knuth-lib")))
-                   ;; Tell mf where to find mf.base
-                   (setenv "MFBASES"
-                           (string-append mf "/share/texmf-dist/web2c"))
-                   ;; Tell mf where to look for source files
-                   (setenv "MFINPUTS"
-                           (string-append root ":"
-                                          mf "/share/texmf-dist/metafont/base:"
-                                          kl "/share/texmf-dist/fonts/source/public/knuth-lib:"
-                                          root "/fonts/source/public/mflogo/"))
-                   (for-each (lambda (font)
-                               (format #t "building font ~a\n" font)
-                               (invoke "mf" "-progname=mf"
-                                       "-output-directory=build"
-                                       (string-append "\\"
-                                                      "mode:=ljfour; "
-                                                      "mag:=1; "
-                                                      "scrollmode; "
-                                                      "input " (basename font))))
-                             (find-files (string-append root
-                                                        "/fonts/source/public/mflogo/")
-                                         "\\.mf$")))
-                 #t))
-             (add-before 'install 'install-fonts
-               (lambda* (#:key outputs #:allow-other-keys)
-                 (let* ((out (assoc-ref outputs "out"))
-                        (tfm (string-append
-                              out "/share/texmf-dist/fonts/tfm/public/mflogo")))
-                   (for-each (lambda (file)
-                               (install-file file tfm)
-                               (delete-file file))
-                             (find-files "build" "\\.tfm"))
-                   #t)))))))
       (native-inputs
        (list texlive-bin texlive-metafont texlive-knuth-lib))
       (home-page "http://www.ctan.org/pkg/mflogo")
@@ -1607,20 +1536,7 @@ Taco Hoekwater.")
       (arguments
        (substitute-keyword-arguments (package-arguments template)
          ((#:build-targets _ #t)
-          '(list "amsfonts.ins"))
-         ((#:tex-directory _ #t)
-          "latex/amsfonts")
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/amsfonts")))
-             (add-before 'copy-files 'unchdir
-               (lambda _ (chdir "../../..")))
-             (add-after 'copy-files 'remove-extra-files
-               (lambda* (#:key outputs #:allow-other-keys)
-                 (delete-file-recursively
-                  (string-append (assoc-ref outputs "out")
-                                 "/share/texmf-dist/source/latex/amsfonts/build/"))))))))
+          '(list "amsfonts.ins"))))
       (home-page "https://www.ctan.org/pkg/amsfonts")
       (synopsis "TeX fonts from the American Mathematical Society")
       (description
@@ -1751,26 +1667,15 @@ discussed in the book).")
          ((#:build-targets _ '()) '(list "halloweenmath.ins"))
          ((#:phases phases)
           #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _ (chdir "source/latex/halloweenmath/")))
               (add-after 'chdir 'non-interactive-build
                 ;; When it realizes it cannot employ the usedir directive, the
                 ;; build process stops and waits for an input before inserting
                 ;; generated files in the working directory.  Do not ask for
                 ;; an input.
                 (lambda _
-                  (substitute* "halloweenmath.ins"
+                  (substitute* "source/latex/halloweenmath/halloweenmath.ins"
                     (("\\Ask.*") "")
-                    (("\\(your .*? will be ignored\\).*") ""))))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+                    (("\\(your .*? will be ignored\\).*") ""))))))))
       (native-inputs
        (list texlive-bin
              texlive-kpathsea
@@ -3244,29 +3149,8 @@ contain.")
       (outputs '("out" "doc"))
       (arguments
        (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "latex/atveryend")
          ((#:build-targets _ #t)
-          #~(list "atveryend.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/atveryend/")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))
-              (add-after 'copy-files 'remove-generated-file
-                (lambda* (#:key outputs #:allow-other-keys)
-                  (with-directory-excursion #$output
-                    (for-each delete-file
-                              (find-files "." "\\.(drv|ins)$")))))))))
+          #~(list "atveryend.dtx"))))
       (home-page "https://ctan.org/macros/latex/contrib/atveryend")
       (synopsis "Hooks at the very end of a document")
       (description
@@ -3293,24 +3177,8 @@ the @file{.aux} file.")
       (outputs '("out" "doc"))
       (arguments
        (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/auxhook")
          ((#:build-targets _ '())
-          #~(list "auxhook.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/auxhook")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "auxhook.dtx"))))
       (home-page "https://www.ctan.org/pkg/auxhook")
       (synopsis "Hooks for auxiliary files")
       (description
@@ -3335,21 +3203,7 @@ the @file{.aux} file.")
         ((#:tex-directory _ '())
          "latex/epstopdf-pkg")
         ((#:build-targets _ '())
-         #~(list "epstopdf.ins"))
-        ((#:phases phases)
-         #~(modify-phases #$phases
-             (add-after 'unpack 'chdir
-               (lambda _
-                 (chdir "source/latex/epstopdf-pkg")))
-             (replace 'copy-files
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (let ((origin (assoc-ref inputs "source"))
-                       (source (string-append #$output
-                                              "/share/texmf-dist/source"))
-                       (doc (string-append #$output:doc
-                                           "/share/texmf-dist/doc")))
-                   (copy-recursively (string-append origin "/source") source)
-                   (copy-recursively (string-append origin "/doc") doc))))))))
+         #~(list "epstopdf.ins"))))
      (propagated-inputs
       (list texlive-grfext
             texlive-infwarerr
@@ -3377,12 +3231,7 @@ a process to convert the EPS to PDF, using the script @command{epstopdf}.")
       (inherit template)
       (arguments
        (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '()) "latex/filecontents")
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/filecontents")))))))
+         ((#:tex-directory _ '()) "latex/filecontents")))
       (home-page "https://ctan.org/pkg/filecontents")
       (synopsis "Create an external file from within a LaTeX document")
       (description
@@ -3509,29 +3358,7 @@ set default \"driver\" options for the color and graphics packages.")
          ((#:tex-directory _ '())
           "latex/graphics")
          ((#:build-targets _ '())
-          #~(list "graphics-drivers.ins" "graphics.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/graphics")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc)
-                    ;; This file is not generated from the sources.
-                    (install-file
-                     (string-append
-                      origin
-                      "/tex/latex/graphics/graphics-2017-06-25.sty")
-                     (string-append
-                      #$output
-                      "/share/texmf-dist/tex/latex/graphics")))))))))
+          #~(list "graphics-drivers.ins" "graphics.ins"))))
       (propagated-inputs (list texlive-graphics-def texlive-graphics-cfg))
       (home-page "https://ctan.org/macros/latex/required/graphics")
       (synopsis "The LaTeX standard graphics bundle")
@@ -3577,21 +3404,7 @@ for Greek text font encodings for use with fontenc.")
          ((#:tex-directory _ '())
           "latex/hycolor")
          ((#:build-targets _ '())
-          #~(list "hycolor.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/hycolor")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "hycolor.dtx"))))
       (home-page "https://www.ctan.org/pkg/latex-graphics")
       (synopsis "Color for hyperref and bookmark")
       (description
@@ -3618,26 +3431,7 @@ used by @code{hyperref} and @code{bookmark}.")
          ((#:tex-directory _ '())
           "latex/xcolor")
          ((#:build-targets _ '())
-          #~(list "xcolor.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _ (chdir "source/latex/xcolor")))
-              (replace 'copy-files
-                (lambda* (#:key inputs outputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc)
-                    (let ((share (string-append #$output
-                                                "/share/texmf-dist")))
-                      (mkdir-p (string-append share "/dvips/xcolor"))
-                      (rename-file
-                       (string-append share "/tex/latex/xcolor/xcolor.pro")
-                       (string-append share "/dvips/xcolor/xcolor.pro"))))))))))
+          #~(list "xcolor.ins"))))
       ;; TODO: Propagate texlive-hyperref and many others in the next rebuild
       ;; cycle.  Grep for '\usepackage' to see what packages it requires.
       ;; (propagated-inputs (list texlive-hyperref ...))
@@ -3737,32 +3531,7 @@ XML, using UTF-8 or a suitable 8-bit encoding.")
          ((#:tex-directory _ '())
           "latex/hyperref")
          ((#:build-targets _ '())
-          #~(list "hyperref.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/hyperref")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc)
-                    ;; XXX: These files are not auto-generated from the
-                    ;; sources.
-                    (for-each (lambda (f)
-                                (install-file
-                                 (string-append origin "/tex/latex/hyperref/" f)
-                                 (string-append
-                                  #$output
-                                  "/share/texmf-dist/tex/latex/hyperref")))
-                              '("minitoc-hyper.sty"
-                                "ntheorem-hyper.sty"
-                                "xr-hyper.sty")))))))))
+          #~(list "hyperref.ins"))))
       (propagated-inputs
        (list texlive-atbegshi
              texlive-auxhook
@@ -3816,37 +3585,7 @@ pdf and HTML backends.  The package is distributed with the @code{backref} and
          ((#:tex-directory _ '())
           "latex/oberdiek")
          ((#:build-targets _ '())
-          #~(list "oberdiek.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/oberdiek")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc)
-                    ;; XXX: `#:tex-directory' is limited to one location, but
-                    ;; the package needs to install files elsewhere, so we do
-                    ;; that manually here.
-                    (with-directory-excursion origin
-                      (let ((extra '("bibtex/bib/oberdiek"
-                                     "tex/generic/oberdiek")))
-                        (for-each
-                         (lambda (d)
-                           (for-each (lambda (f)
-                                       (install-file
-                                        f
-                                        (string-append #$output
-                                                       "/share/texmf-dist/"
-                                                       d)))
-                                     (find-files d)))
-                         extra))))))))))
+          #~(list "oberdiek.ins"))))
       (propagated-inputs
        (list texlive-auxhook
              texlive-grfext
@@ -3881,21 +3620,7 @@ arrows; record information about document class(es) used; and many more.")
          ((#:tex-directory _ '())
           "latex/rerunfilecheck")
          ((#:build-targets _ '())
-          #~(list "rerunfilecheck.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/rerunfilecheck")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "rerunfilecheck.dtx"))))
       (propagated-inputs
        (list texlive-atveryend
              texlive-infwarerr
@@ -3925,24 +3650,7 @@ files have changed.  It is based on MD5 checksum, provided by pdfTeX.")
       (outputs '("doc" "out"))
       (arguments
        (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t) "latex/onedown")
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _ (chdir "source/latex/onedown/")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (texmf (string-append #$output "/share/texmf-dist"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (for-each
-                     (lambda (directory)
-                       (copy-recursively (string-append origin directory)
-                                         (string-append texmf directory)))
-                     '("/source" "/tex/latex/onedown"))
-                    (copy-recursively (string-append origin "/doc")
-                                      doc))))))))
+         ((#:tex-directory _ #t) "latex/onedown")))
       (home-page "https://ctan.org/pkg/onedown")
       (synopsis "Typeset bridge diagrams")
       (description
@@ -3971,33 +3679,7 @@ output of bridge terms.")
          ((#:tex-directory _ '())
           "latex/tools")
          ((#:build-targets _ '())
-          #~(list "tools.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/tools")))
-              (replace 'copy-files
-                (lambda _
-                  (let ((origin #$(package-source this-package))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc)
-                    ;; These files are not generated.
-                    (let ((directory "/tex/latex/tools"))
-                      (with-directory-excursion (string-append origin directory)
-                        (for-each
-                         (lambda (f)
-                           (install-file f (string-append #$output
-                                                          "/share/texmf-dist"
-                                                          directory)))
-                         '("array-2016-10-06.sty"
-                           "array-2020-02-10.sty"
-                           "multicol-2017-04-11.sty"
-                           "varioref-2016-02-16.sty")))))))))))
+          #~(list "tools.ins"))))
       (home-page "https://www.ctan.org/tex-archive/macros/latex/required/tools/")
       (synopsis "LaTeX standard tools bundle")
       (description "This package provides a collection of simple tools that
@@ -4214,11 +3896,7 @@ here are defined for the dvips engine only.")
       (arguments
        (substitute-keyword-arguments (package-arguments template)
          ((#:tex-directory _ #t)
-          "latex/fontspec")
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/fontspec/") #t))))))
+          "latex/fontspec")))
       (propagated-inputs
        (list texlive-cm texlive-latex-l3packages texlive-lm))
       (home-page "https://www.ctan.org/pkg/fontspec")
@@ -4275,23 +3953,7 @@ is a stub that just loads @code{graphicx}.")
          ((#:tex-directory _ #t)
           "generic/stringenc")
          ((#:build-targets _ #t)
-          '(list "stringenc.dtx"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/stringenc/")))
-             (add-after 'copy-files 'clean-up
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 (delete-file-recursively
-                  (string-append (assoc-ref outputs "out") "/share/texmf-dist/build"))
-                 (delete-file
-                  (string-append (assoc-ref outputs "out") "/share/texmf-dist/stringenc.dtx"))
-                 (install-file
-                  (string-append (assoc-ref inputs "source") "/source/latex/stringenc/stringenc.dtx")
-                  (string-append (assoc-ref outputs "out") "/share/texmf-dist/source/latex/stringenc/"))
-                 (install-file
-                  (string-append (assoc-ref inputs "source") "/doc/latex/stringenc/README.md")
-                  (string-append (assoc-ref outputs "doc") "/doc/latex/stringenc/"))))))))
+          '(list "stringenc.dtx"))))
       (home-page "https://www.ctan.org/pkg/stringenc")
       (synopsis "Converting a string between different encodings")
       (description
@@ -4433,19 +4095,7 @@ loading fonts by their proper names instead of file names.")
       (arguments
        (substitute-keyword-arguments (package-arguments template)
          ((#:tex-directory _ #t)
-          "latex/amsmath")
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/amsmath/")))
-             (add-before 'copy-files 'unchdir
-               (lambda _
-                 (chdir "../../..")))
-             (add-after 'copy-files 'delete-extra-files
-               (lambda* (#:key outputs #:allow-other-keys)
-                 (delete-file-recursively
-                  (string-append (assoc-ref outputs "out")
-                                 "/share/texmf-dist/source/latex/amsmath/build"))))))))
+          "latex/amsmath")))
       (propagated-inputs
        (list texlive-amsfonts))
       (home-page "https://www.ctan.org/pkg/amsmath")
@@ -4482,21 +4132,7 @@ definitions.")
          ((#:tex-directory _ '())
           "generic/mathdots")
          ((#:build-targets _ '())
-          '(list "mathdots.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/generic/mathdots")))
-              (replace 'copy-files
-                (lambda* (#:key inputs outputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append (assoc-ref outputs "out")
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append (assoc-ref outputs "doc")
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          '(list "mathdots.ins"))))
       (home-page "https://ctan.org/macros/generic/mathdots")
       (synopsis "Commands to produce dots in math that respect font size")
       (description
@@ -4520,11 +4156,7 @@ commands.  The commands may also be used in plain TeX.")
       (arguments
        (substitute-keyword-arguments (package-arguments template)
          ((#:tex-directory _ #t)
-          "latex/amscls")
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/amscls/") #t))))))
+          "latex/amscls")))
       (home-page "https://www.ctan.org/pkg/amscls")
       (synopsis "AMS document classes for LaTeX")
       (description
@@ -4553,28 +4185,12 @@ distribution.")
           "generic/babel")
          ((#:phases phases)
           `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/babel/")))
              ;; This package tries to produce babel.aux twice but refuses to
              ;; overwrite the first one.
              (add-before 'build 'fix-ins
                (lambda _
-                 (substitute* "babel.ins"
+                 (substitute* "source/latex/babel/babel.ins"
                    (("askonceonly") "askforoverwritefalse"))))
-           (add-before 'copy-files 'unchdir
-             (lambda _
-               (chdir "../../..")))
-           (add-after 'copy-files 'delete-extra-files
-             (lambda* (#:key outputs #:allow-other-keys)
-               (delete-file-recursively
-                (string-append (assoc-ref outputs "out")
-                               "/share/texmf-dist/source/latex/babel/build"))
-               (delete-file
-                (string-append (assoc-ref outputs "out")
-                               "/share/texmf-dist/tex/generic/babel/bbind.ist"))
-               (delete-file
-                (string-append (assoc-ref outputs "out")
-                               "/share/texmf-dist/tex/generic/babel/bbglo.ist"))))
              (add-after 'install 'install-locales
                (lambda* (#:key outputs #:allow-other-keys)
                  (let ((locale-directory
@@ -4697,20 +4313,7 @@ for Canadian and USA text.")
           "generic/babel-french")
          ((#:build-targets _ '())
           ;; TODO: use dtx and build documentation.
-          '(list "frenchb.ins"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/generic/babel-french")))
-             (replace 'copy-files
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 (let ((origin (assoc-ref inputs "source"))
-                       (source (string-append (assoc-ref outputs "out")
-                                              "/share/texmf-dist/source"))
-                       (doc (string-append (assoc-ref outputs "doc")
-                                           "/share/texmf-dist/doc")))
-                   (copy-recursively (string-append origin "/source") source)
-                   (copy-recursively (string-append origin "/doc") doc))))))))
+          '(list "frenchb.ins"))))
       (home-page "https://ctan.org/macros/latex/contrib/babel-contrib/french")
       (synopsis "Babel contributed support for French")
       (description
@@ -4757,11 +4360,7 @@ Swiss varieties of German.")
          ((#:tex-directory _ '())
           "generic/babel-swedish")
          ((#:build-targets _ '())
-          ''("swedish.ins")) ; TODO: use dtx and build documentation
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/generic/babel-swedish")))))))
+          ''("swedish.ins"))))
       (home-page "https://www.ctan.org/pkg/babel-swedish")
       (synopsis "Babel support for Swedish")
       (description "This package provides the language definition file for
@@ -4808,8 +4407,6 @@ language that is written in a Cyrillic alphabet.")
          ((#:build-targets _ '()) '(list "pict2e.ins"))
          ((#:phases phases)
           #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _ (chdir "source/latex/pict2e/")))
               (add-after 'build 'build-doc
                 (lambda _
                   (copy-file "p2e-drivers.dtx" "build/p2e-drivers.dtx")
@@ -4818,16 +4415,7 @@ language that is written in a Cyrillic alphabet.")
                     (delete-file "p2e-drivers.dtx")
                     ;; texlive.tlpbd expects a "pict2e.cfg" configuration file
                     ;; instead of "pict2e-example.cfg".  Please it.
-                    (rename-file "pict2e-example.cfg" "pict2e.cfg"))))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+                    (rename-file "pict2e-example.cfg" "pict2e.cfg"))))))))
       (home-page "https://ctan.org/pkg/pict2e")
       (native-inputs
        (list (texlive-updmap.cfg)))
@@ -4943,40 +4531,7 @@ with the LaTeX @code{picture} environment.")
       (arguments
        (substitute-keyword-arguments (package-arguments template)
          ((#:tex-directory _ #t)
-          "latex/psnfss")
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _
-                 (chdir "source/latex/psnfss")))
-             (add-after 'install 'chdir-back
-               (lambda _
-                 (chdir "../../..")))
-             (add-after 'chdir-back 'clean-installed-files
-               (lambda _
-                 ;; Remove the generated .sty files from the build area as
-                 ;; these were already copied to the default output in the
-                 ;; "install" phase.
-                 (delete-file-recursively "source/latex/psnfss/build")))
-             (add-after 'clean-installed-files 'move-doc-files
-               (lambda* (#:key outputs #:allow-other-keys)
-                 (let* ((doc (assoc-ref outputs "doc"))
-                        (doc-root (string-append doc "/share/texmf-dist"))
-                        (doc-path "doc/latex/psnfss")
-                        (source-path "source/latex/psnfss"))
-                   ;; Move the PDF documentation to the "doc" output.
-                   (let* ((file-name "psnfss2e.pdf")
-                          (source (string-append doc-path "/" file-name))
-                          (target-dir (string-append doc-root "/" doc-path)))
-                     (mkdir-p target-dir)
-                     (copy-file source
-                                (string-append target-dir "/" file-name))
-                     (delete-file source))
-
-                   ;; Keep the remaining files together with the package's
-                   ;; source, as per the installation instructions.
-                   (copy-recursively doc-path source-path)
-                   (delete-file-recursively "doc"))))))))
+          "latex/psnfss")))
       (native-inputs
        (list texlive-cm))
       (home-page "https://www.ctan.org/pkg/psnfss")
@@ -5202,20 +4757,9 @@ conjunction with BibTeX or as a replacement for BibTeX.")
          ((#:build-targets _ '()) '(list "bigfoot.ins"))
          ((#:phases phases)
           #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _ (chdir "source/latex/bigfoot/")))
               (add-after 'chdir 'delete-drv-files
                 (lambda _
-                  (for-each delete-file (find-files "." "\\.drv$"))))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+                  (for-each delete-file (find-files "." "\\.drv$"))))))))
       (propagated-inputs
        (list texlive-etex texlive-ncctools))
       (home-page "https://ctan.org/pkg/bigfoot")
@@ -5514,20 +5058,7 @@ corresponding italics: light, regular, medium, bold, ...")
       (arguments
        (substitute-keyword-arguments (package-arguments template)
          ((#:tex-directory _ #t) "tex/latex/firstaid")
-         ((#:build-targets _ '()) '(list "firstaid.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _ (chdir "source/latex/firstaid/")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+         ((#:build-targets _ '()) '(list "firstaid.ins"))))
       (home-page "https://ctan.org/macros/latex/required/firstaid")
       (synopsis
        "First aid for external LaTeX files and packages that need updating")
@@ -5638,21 +5169,7 @@ Unicode option of @code{inputenc} or @code{inputenx}, or by XeLaTeX/LuaLaTeX.")
          ((#:tex-directory _ '())
           "generic/pdftexcmds")
          ((#:build-targets _ '())
-          #~(list "pdftexcmds.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/generic/pdftexcmds")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "pdftexcmds.dtx"))))
       (propagated-inputs
        (list texlive-iftex texlive-infwarerr texlive-ltxcmds))
       (home-page "https://www.ctan.org/pkg/pdftexcmds")
@@ -5736,21 +5253,7 @@ re-processing.")
          ((#:tex-directory _ '())
           "latex/refcount")
          ((#:build-targets _ '())
-          #~(list "refcount.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/refcount")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "refcount.dtx"))))
       (home-page "https://www.ctan.org/pkg/refcount")
       (synopsis "Counter operations with label references")
       (description
@@ -5903,21 +5406,7 @@ space-stripped macros.")
          ((#:tex-directory _ '())
           "latex/capt-of")
          ((#:build-targets _ '())
-          '(list "capt-of.ins"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _
-                 (chdir "source/latex/capt-of")))
-             (replace 'copy-files
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 (let ((origin (assoc-ref inputs "source"))
-                       (source (string-append (assoc-ref outputs "out")
-                                              "/share/texmf-dist/source"))
-                       (doc (string-append (assoc-ref outputs "doc")
-                                           "/share/texmf-dist/doc")))
-                   (copy-recursively (string-append origin "/source") source)
-                   (copy-recursively (string-append origin "/doc") doc))))))))
+          '(list "capt-of.ins"))))
       (home-page "https://www.ctan.org/pkg/capt-of")
       (synopsis "Captions on more than floats")
       (description
@@ -6248,28 +5737,7 @@ array environments; verbatim handling; and syntax diagrams.")
     (outputs '("out" "doc"))
     (arguments
      (list
-      #:tex-directory "latex/makecmds"
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'chdir
-            (lambda _
-              (setenv "ROOT_DIR" (getcwd))
-              (chdir "source/latex/makecmds")))
-          (add-after 'build 'build-doc
-            (lambda _
-              (copy-file "makecmds.dtx" "build/makecmds.dtx")
-              (chdir "build")
-              (invoke "pdflatex" "makecmds.dtx"))) ;generate makecmds.pdf
-          (replace 'install
-            (lambda* (#:key outputs tex-directory #:allow-other-keys)
-              (let ((doc (string-append (assoc-ref outputs "doc")
-                                        "/share/doc/" tex-directory))
-                    (out (string-append #$output "/share/texmf-dist/tex/"
-                                        tex-directory)))
-                (install-file "makecmds.pdf" doc)
-                (install-file (car (find-files (getenv "ROOT_DIR") "README"))
-                              doc)
-                (install-file "makecmds.sty" out)))))))
+      #:tex-directory "latex/makecmds"))
     (native-inputs (list (texlive-updmap.cfg
                           (list texlive-amsfonts
                                 texlive-cm))))
@@ -6318,13 +5786,9 @@ routine.")
       #:tex-directory "latex/metalogo"
       #:phases
       #~(modify-phases %standard-phases
-          (add-before 'build 'chdir
+          (add-after 'unpack 'patch-metalogo.dtx
             (lambda _
-              (setenv "ROOT_DIR" (getcwd))
-              (chdir "source/latex/metalogo")))
-          (add-after 'chdir 'patch-metalogo.dtx
-            (lambda _
-              (substitute* "metalogo.dtx"
+              (substitute* "source/latex/metalogo/metalogo.dtx"
                 ;; Prevent embedding a build time date, for reproducibility.
                 (("^% \\\\date.*") "")
                 ;; These fonts are not free.
@@ -6337,30 +5801,8 @@ routine.")
                 ;; The 'stix' texlive font package has been obsoleted by
                 ;; stix2.
                 (("^\\\\newfontfamily\\\\stixgeneral\\{STIXGeneral}")
-                 "\\newfontfamily\\stixgeneral{STIX Two Text}"))))
-          (add-after 'build 'build-doc
-            (lambda* (#:key outputs tex-directory #:allow-other-keys)
-              (define doc-sources (string-append (getenv "ROOT_DIR")
-                                                 "/doc/latex/metalogo"))
-              (copy-file "metalogo.dtx" "build/metalogo.dtx")
-              (mkdir "build/graphics")
-              (copy-file (string-append doc-sources "/TeXoutline.pdf")
-                         "build/graphics/TeXoutline.pdf")
-              (copy-file (string-append doc-sources "/eLaToutline.pdf")
-                         "build/graphics/eLaToutline.pdf")
-              (chdir "build")
-              (invoke "xelatex" "metalogo.dtx"))) ;generate metalogo.pdf
-          (replace 'install
-            (lambda* (#:key outputs tex-directory #:allow-other-keys)
-              (let ((doc (string-append (assoc-ref outputs "doc")
-                                        "/share/doc/" tex-directory))
-                    (out (string-append #$output "/share/texmf-dist/tex/"
-                                        tex-directory)))
-                (install-file "metalogo.pdf" doc)
-                (install-file (car (find-files (getenv "ROOT_DIR") "README"))
-                              doc)
-                (install-file "metalogo.sty" out)))))))
-    (native-inputs (list fontconfig     ;for XDG_DATA_DIRS, to locate OTF fonts
+                 "\\newfontfamily\\stixgeneral{STIX Two Text}")))))))
+    (native-inputs (list fontconfig    ;for XDG_DATA_DIRS, to locate OTF fonts
                          texlive-booktabs
                          texlive-cm
                          texlive-fontspec
@@ -6391,28 +5833,7 @@ written especially for XeLaTeX users.")
     (outputs '("out" "doc"))
     (arguments
      (list
-      #:tex-directory "latex/paralist"
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'chdir
-            (lambda _
-              (setenv "ROOT_DIR" (getcwd))
-              (chdir "source/latex/paralist")))
-          (add-after 'build 'build-doc
-            (lambda* (#:key outputs tex-directory #:allow-other-keys)
-              (copy-file "paralist.dtx" "build/paralist.dtx")
-              (chdir "build")
-              (invoke "pdflatex" "paralist.dtx")))
-          (replace 'install
-            (lambda* (#:key outputs tex-directory #:allow-other-keys)
-              (let ((doc (string-append (assoc-ref outputs "doc")
-                                        "/share/doc/" tex-directory))
-                    (out (string-append #$output "/share/texmf-dist/tex/"
-                                        tex-directory)))
-                (install-file "paralist.pdf" doc)
-                (install-file (car (find-files (getenv "ROOT_DIR") "README"))
-                              doc)
-                (install-file "paralist.sty" out)))))))
+      #:tex-directory "latex/paralist"))
     (native-inputs (list texlive-latex-base
                          (texlive-updmap.cfg
                           (list texlive-cm
@@ -6458,8 +5879,7 @@ also provides compacted versions of enumerate and itemize.")
             (lambda _
               ;; This is so the build can find the files not part of the .dtx.
               (setenv "TEXINPUTS" (string-append (getcwd)
-                                                 "/tex/latex/polyglossia:"))
-              (chdir "source/latex/polyglossia")))
+                                                 "/tex/latex/polyglossia:"))))
           (add-after 'chdir 'substitute-nonfree-fonts
             (lambda _
               (substitute* "polyglossia.dtx"
@@ -6467,13 +5887,7 @@ also provides compacted versions of enumerate and itemize.")
                  "{FreeSans}"))))
           (add-after 'substitute-nonfree-fonts 'extract-dtx
             (lambda* (#:key tex-format #:allow-other-keys)
-              (invoke tex-format "polyglossia.dtx")))
-          (add-after 'install 'install-doc
-            (lambda* (#:key outputs tex-directory #:allow-other-keys)
-              (let ((doc (string-append (assoc-ref outputs "doc")
-                                        "/share/texmf-dist/doc" tex-directory)))
-                (install-file "README.md" doc)
-                (install-file "polyglossia.pdf" doc)))))))
+              (invoke tex-format "polyglossia.dtx"))))))
     (native-inputs (list fontconfig     ;for XDG_DATA_DIRS (to locate fonts)
                          font-amiri
                          font-dejavu
@@ -6872,20 +6286,7 @@ floats, center, flushleft, and flushright, lists, and pages.")
          ((#:tex-directory _ '())
           "latex/fancyhdr")
          ((#:build-targets _ '())
-          #~(list "fancyhdr.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _ (chdir "source/latex/fancyhdr")))
-              (replace 'copy-files
-                (lambda* (#:key inputs outputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "fancyhdr.ins"))))
       (home-page "https://www.ctan.org/pkg/fancyhdr")
       (synopsis "Extensive control of page headers and footers in LaTeX2e")
       (description
@@ -6960,21 +6361,7 @@ footnotes with symbols rather than numbers.")
          ((#:tex-directory _ '())
           "latex/letltxmacro")
          ((#:build-targets _ '())
-          #~(list "letltxmacro.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/letltxmacro")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "letltxmacro.dtx"))))
       (home-page "https://www.ctan.org/pkg/letltxmacro")
       (synopsis "Let assignment for macros")
       (description
@@ -7041,21 +6428,7 @@ BibTeX bibliography style.  The individual packages are: @code{abbrevs},
          ((#:tex-directory _ '())
           "latex/listings")
          ((#:build-targets _ '())
-          #~(list "listings.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/listings")))
-              (replace 'copy-files
-                (lambda* (#:key inputs outputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "listings.ins"))))
       (home-page "https://www.ctan.org/pkg/listings")
       (synopsis "Typeset source code listings using LaTeX")
       (description
@@ -7122,21 +6495,7 @@ in SGML; use maths minus in text as appropriate; simple Young tableaux.")
          ((#:tex-directory _ '())
           "latex/kvoptions")
          ((#:build-targets _ '())
-          #~(list "kvoptions.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/kvoptions")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "kvoptions.dtx"))))
       (propagated-inputs
        (list texlive-kvsetkeys texlive-ltxcmds))
       (home-page "https://www.ctan.org/pkg/kvoptions")
@@ -7389,20 +6748,7 @@ format under XeTeX.")
     (arguments
      (list
       #:build-targets #~(list "zref.dtx")
-      #:tex-directory "latex/zref"
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (setenv "ROOT_DIR" (getcwd))
-              (chdir "source/latex/zref")))
-          (add-after 'install 'install-doc
-            (lambda* (#:key outputs #:allow-other-keys)
-              (define doc (string-append (assoc-ref outputs "doc")
-                                         "/share/texmf-dist/doc"))
-              (mkdir-p doc)
-              (copy-recursively (string-append (getenv "ROOT_DIR") "/doc")
-                                doc))))))
+      #:tex-directory "latex/zref"))
     (propagated-inputs (list texlive-atbegshi
                              texlive-gettitlestring
                              texlive-iftex
@@ -7539,28 +6885,7 @@ one of the packages @code{calrsfs} and @code{mathrsfs}.")
          ((#:tex-directory _ '())
           "latex/eso-pic")
          ((#:build-targets _ '())
-          #~(list "eso-pic.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/eso-pic")))
-              (replace 'copy-files
-                (lambda _
-                  (let ((origin #$(package-source this-package))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc)
-                    ;; This file is not generated.
-                    (install-file
-                     (string-append origin
-                                    "/tex/latex/eso-pic/showframe.sty")
-                     (string-append
-                      #$output
-                      "/share/texmf-dist/tex/latex/eso-pic")))))))))
+          #~(list "eso-pic.ins"))))
       (home-page "https://ctan.org/macros/latex/contrib/eso-pic")
       (synopsis "Add picture commands (or backgrounds) to every page")
       (description
@@ -7785,21 +7110,7 @@ package also defines some associated length commands.")
          ((#:tex-directory _ '())
           "latex/pdfpages")
          ((#:build-targets _ '())
-          #~(list "pdfpages.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/pdfpages")))
-              (replace 'copy-files
-                (lambda _
-                  (let ((origin #$(package-source this-package))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "pdfpages.ins"))))
       (propagated-inputs
        (list texlive-tools texlive-oberdiek texlive-graphics texlive-eso-pic))
       (home-page "https://ctan.org/macros/latex/contrib/pdfpages")
@@ -7887,25 +7198,12 @@ captions sideways.  Options include @code{outercaption}, @code{innercaption},
                     "latex/stmaryrd")
                    ((#:phases phases)
                     `(modify-phases ,phases
-                       (add-after 'unpack 'chdir
-                         (lambda _
-                           (chdir "source/fonts/stmaryrd")
-                           #t))
-                       (add-after 'chdir 'patch-ins
+                       (add-after 'unpack 'patch-ins
                          (lambda _
-                           (substitute* "stmaryrd.ins"
+                           (substitute* "source/fonts/stmaryrd/stmaryrd.ins"
                              (("^%% LaTeX2e.*") "\\input docstrip\n")
                              (("fontdef\\}\\}" line)
-                              (string-append line "\n\\endbatchfile")))
-                           #t))
-                       (add-before 'copy-files 'unchdir
-                         (lambda _
-                           (chdir "../../..")))
-                       (add-after 'copy-files 'delete-extra-files
-                         (lambda* (#:key outputs #:allow-other-keys)
-                           (delete-file-recursively
-                            (string-append (assoc-ref outputs "out")
-                                           "/share/texmf-dist/source/fonts/stmaryrd/build"))))))))
+                              (string-append line "\n\\endbatchfile")))))))))
       (home-page "https://www.ctan.org/pkg/stmaryrd")
       (synopsis "St Mary Road symbols for theoretical computer science")
       (description
@@ -7934,21 +7232,7 @@ the whole font.")
          ((#:tex-directory _ '())
           "latex/subfigure")
          ((#:build-targets _ '())
-          #~(list "subfigure.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/subfigure")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "subfigure.ins"))))
       (home-page "https://www.ctan.org/pkg/subfigure")
       (synopsis "Figures divided into subfigures")
       (description
@@ -8361,26 +7645,7 @@ now contains a package @code{fix-cm},f which performs the task of
          ((#:tex-directory _ #t)
           "latex/lh")
          ((#:build-targets _ '())
-          ''("nfssfox.ins" "lcyfonts.ins" "ot2fonts.ins" "t2ccfonts.ins"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/lh")))
-             (replace 'copy-files
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 (let* ((source (assoc-ref inputs "source"))
-                        (doc (string-append (assoc-ref outputs "doc")
-                                           "/share/texmf-dist/doc"))
-                        (target (string-append (assoc-ref outputs "out")
-                                               "/share/texmf-dist"))
-                        (tex (string-append target "/tex/latex/lh/")))
-                   (copy-recursively "build/" tex)
-                   (copy-recursively (string-append source "/fonts/source/lh")
-                                     (string-append target "/fonts/source/lh"))
-                   (copy-recursively (string-append source "/tex/plain/lh")
-                                     (string-append target "/tex/plain/lh"))
-                   (copy-recursively (string-append source "/doc")
-                                     doc))))))))
+          ''("nfssfox.ins" "lcyfonts.ins" "ot2fonts.ins" "t2ccfonts.ins"))))
       (home-page "https://www.ctan.org/pkg/lh")
       (synopsis "Cyrillic fonts that support LaTeX standard encodings")
       (description
@@ -8672,20 +7937,7 @@ files.")
       (arguments
        (substitute-keyword-arguments (package-arguments template)
          ((#:tex-directory _ #t) "latex/acronym")
-         ((#:build-targets _ '()) '(list "acronym.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _ (chdir "source/latex/acronym/")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+         ((#:build-targets _ '()) '(list "acronym.ins"))))
       (propagated-inputs
        (list texlive-bigfoot texlive-relsize texlive-xstring))
       (home-page "https://ctan.org/pkg/acronym")
@@ -9380,21 +8632,7 @@ It also ensures compatibility with the @code{media9} and @code{animate} packages
           "latex/ms")
          ((#:tex-format _ "latex") "latex")
          ((#:build-targets _ '())
-          #~(list "count1to.ins" "multitoc.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/ms")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "count1to.ins" "multitoc.ins"))))
       (home-page "https://ctan.org/macros/latex/contrib/ms")
       (synopsis "Various LaTeX packages by Martin Schroder")
       (description
@@ -9419,20 +8657,7 @@ typeset the table of contents in multiple columns.")
       (arguments
        (substitute-keyword-arguments (package-arguments template)
          ((#:tex-directory _ #t) "latex/ncctools")
-         ((#:build-targets _ '()) '(list "ncctools.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _ (chdir "source/latex/ncctools/")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+         ((#:build-targets _ '()) '(list "ncctools.ins"))))
       (propagated-inputs
        (list texlive-amsmath texlive-graphics))
       (home-page "https://ctan.org/pkg/ncctools")
@@ -9485,21 +8710,7 @@ toc-entries;
          ((#:tex-directory _ '())
           "latex/numprint")
          ((#:build-targets _ '())
-          '(list "numprint.ins"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _
-                 (chdir "source/latex/numprint")))
-             (replace 'copy-files
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 (let ((origin (assoc-ref inputs "source"))
-                       (source (string-append (assoc-ref outputs "out")
-                                              "/share/texmf-dist/source"))
-                       (doc (string-append (assoc-ref outputs "doc")
-                                           "/share/texmf-dist/doc")))
-                   (copy-recursively (string-append origin "/source") source)
-                   (copy-recursively (string-append origin "/doc") doc))))))))
+          '(list "numprint.ins"))))
       (home-page "https://www.ctan.org/pkg/numprint")
       (synopsis "Print numbers with separators and exponent if necessary")
       (description
@@ -9756,21 +8967,7 @@ typearea (which are the main parts of the bundle).")
          ((#:tex-directory _ '())
           "generic/atbegshi")
          ((#:build-targets _ '())
-          #~(list "atbegshi.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/atbegshi")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "atbegshi.dtx"))))
       (home-page "https://www.ctan.org/pkg/atbegshi")
       (synopsis "Execute commands at @code{\\shipout} time")
       (description
@@ -9798,21 +8995,7 @@ be used either with LaTeX or with plain TeX.")
          ((#:tex-directory _ '())
           "generic/bigintcalc")
          ((#:build-targets _ '())
-          #~(list "bigintcalc.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/bigintcalc")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "bigintcalc.dtx"))))
       (propagated-inputs
        (list texlive-pdftexcmds))
       (home-page "https://www.ctan.org/pkg/bigintcalc")
@@ -9840,21 +9023,7 @@ integers that can exceed TeX's number limits.")
          ((#:tex-directory _ '())
           "generic/bitset")
          ((#:build-targets _ '())
-          #~(list "bitset.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/bitset")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "bitset.dtx"))))
       (propagated-inputs
        (list texlive-bigintcalc texlive-infwarerr texlive-intcalc))
       (home-page "https://www.ctan.org/pkg/bitset")
@@ -9883,21 +9052,7 @@ can be manipulated.")
          ((#:tex-directory _ '())
           "generic/etexcmds")
          ((#:build-targets _ '())
-          #~(list "etexcmds.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/etexcmds")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "etexcmds.dtx"))))
       (propagated-inputs
        (list texlive-iftex texlive-infwarerr))
       (home-page "https://www.ctan.org/pkg/etexcmds")
@@ -9927,21 +9082,7 @@ adding a prefix to e-TeX’s commands.  For example, ε-TeX’s
          ((#:tex-directory _ '())
           "generic/gettitlestring")
          ((#:build-targets _ '())
-          #~(list "gettitlestring.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/gettitlestring")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "gettitlestring.dtx"))))
       (home-page "https://www.ctan.org/pkg/gettitlestring")
       (synopsis "Clean up title references")
       (description
@@ -9968,21 +9109,7 @@ strings.")
          ((#:tex-directory _ '())
           "generic/infwarerr")
          ((#:build-targets _ '())
-          #~(list "infwarerr.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/infwarerr")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "infwarerr.dtx"))))
       (home-page "https://www.ctan.org/pkg/infwarerr")
       (synopsis "Information/warning/error macros")
       (description
@@ -10010,21 +9137,7 @@ complete implementations.")
          ((#:tex-directory _ '())
           "generic/intcalc")
          ((#:build-targets _ '())
-          #~(list "intcalc.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/intcalc")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "intcalc.dtx"))))
       (home-page "https://www.ctan.org/pkg/intcalc")
       (synopsis "Expandable arithmetic operations with integers")
       (description
@@ -10050,21 +9163,7 @@ using the e-TeX extension @code{\\numexpr} if it is available.")
          ((#:tex-directory _ '())
           "generic/kvdefinekeys")
          ((#:build-targets _ '())
-          #~(list "kvdefinekeys.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/kvdefinekeys")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "kvdefinekeys.dtx"))))
       (home-page "https://www.ctan.org/pkg/kvdefinekeys")
       (synopsis "Define keys for use in the @code{kvsetkeys} package")
       (description
@@ -10090,21 +9189,7 @@ keyval’s @code{\\define@@key}, to define keys for use by @code{kvsetkeys}.")
          ((#:tex-directory _ '())
           "generic/kvsetkeys")
          ((#:build-targets _ '())
-          #~(list "kvsetkeys.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/kvsetkeys")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "kvsetkeys.dtx"))))
       (home-page "https://www.ctan.org/pkg/kvsetkeys")
       (synopsis "Key value parser with default handler support")
       (description
@@ -10166,21 +9251,7 @@ these items with a simple syntax.")
          ((#:tex-directory _ '())
           "generic/ltxcmds")
          ((#:build-targets _ '())
-          #~(list "ltxcmds.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/generic/ltxcmds")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "ltxcmds.dtx"))))
       (home-page "https://www.ctan.org/pkg/ltxcmds")
       (synopsis "LaTeX kernel commands extracted for general use")
       (description
@@ -10207,21 +9278,7 @@ as plain TeX.")
          ((#:tex-directory _ '())
           "generic/pdfescape")
          ((#:build-targets _ '())
-          #~(list "pdfescape.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/pdfescape")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "pdfescape.dtx"))))
       (home-page "https://www.ctan.org/pkg/pdfescape")
       (synopsis "pdfTeX's escape features for plain TeX")
       (description
@@ -10248,21 +9305,7 @@ using TeX or e-TeX.")
          ((#:tex-directory _ '())
           "generic/uniquecounter")
          ((#:build-targets _ '())
-          #~(list "uniquecounter.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/uniquecounter")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+          #~(list "uniquecounter.dtx"))))
       (propagated-inputs
        (list texlive-bigintcalc texlive-infwarerr))
       (home-page "https://www.ctan.org/pkg/uniquecounter")
@@ -10676,18 +9719,10 @@ the file to which it applies.")
           "latex/pdfx")
          ((#:phases phases)
           `(modify-phases ,phases
-             (add-after 'unpack 'delete-generated-file
+             (add-after 'unpack 'fix-encoding
                (lambda _
-                 ;; Generate this file from sources
-                 (delete-file "tex/latex/pdfx/pdfx.sty")
-                 #t))
-             (add-after 'delete-generated-file 'chdir
-               (lambda _ (chdir "source/latex/pdfx") #t))
-             (add-after 'chdir 'fix-encoding
-               (lambda _
-                 (substitute* "pdfx.dtx"
-                   (("    .+umaczy") "umaczy"))
-                 #t))))))
+                 (substitute* "source/latex/pdfx/pdfx.dtx"
+                   (("    .+umaczy") "umaczy"))))))))
       (propagated-inputs
        (list texlive-pdftex))
       (home-page "https://www.ctan.org/pkg/pdfx")
@@ -10800,11 +9835,7 @@ of the old package @code{pst-char}.")
          ((#:tex-directory _ '())
           "latex/marginnote")
          ((#:build-targets _ '())
-          ''("marginnote.dtx"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/marginnote") #t))))))
+          ''("marginnote.dtx"))))
       (synopsis "Notes in the margin")
       (description "This package provides the command @code{\\marginnote} that
 may be used instead of @code{\\marginpar} at almost every place where
@@ -10852,20 +9883,7 @@ LuaTeX (respectively) is not the engine in use.")
          ((#:tex-directory _ '())
           "latex/tabu")
          ((#:build-targets _ '())
-          '(list "tabu.dtx"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/tabu")))
-             (replace 'copy-files
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 (let ((origin (assoc-ref inputs "source"))
-                       (source (string-append (assoc-ref outputs "out")
-                                              "/share/texmf-dist/source"))
-                       (doc (string-append (assoc-ref outputs "doc")
-                                           "/share/texmf-dist/doc")))
-                   (copy-recursively (string-append origin "/source") source)
-                   (copy-recursively (string-append origin "/doc") doc))))))))
+          '(list "tabu.dtx"))))
       (propagated-inputs (list texlive-varwidth))
       (home-page "https://ctan.org/macros/latex/contrib/tabu")
       (synopsis "Flexible LaTeX tabulars")
@@ -11002,11 +10020,7 @@ The behaviour in standalone mode may adjusted using a configuration file
     (build-system texlive-build-system)
     (arguments
      '(#:tex-directory "latex/siunitx"
-       #:build-targets '("siunitx.dtx")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'chdir
-           (lambda _ (chdir "source/latex/siunitx") #t)))))
+       #:build-targets '("siunitx.dtx")))
     (propagated-inputs
      (list texlive-latex-l3kernel texlive-latex-l3packages))
     (home-page "http://www.ctan.org/pkg/siunitx")
@@ -11683,11 +10697,7 @@ LY1 encoding.")
           "latex/sectsty")
          ((#:build-targets _ '())
           ''("sectsty.ins"))
-         ((#:tex-format _ "latex") "latex")
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/sectsty")))))))
+         ((#:tex-format _ "latex") "latex")))
       (home-page "https://www.ctan.org/pkg/sectsty")
       (synopsis "Control sectional headers")
       (description "This is a LaTeX2ε package to help change the style of any or
@@ -11709,11 +10719,7 @@ Examples include the addition of rules above or below a section title.")
          ((#:tex-directory _ '())
           "latex/morefloats")
          ((#:build-targets _ '())
-          ''("morefloats.ins"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/morefloats")))))))
+          ''("morefloats.ins"))))
       (home-page "https://www.ctan.org/pkg/morefloats")
       (synopsis "Increase the number of simultaneous LaTeX floats")
       (description "LaTeX can, by default, only cope with 18 outstanding floats;
@@ -11740,11 +10746,7 @@ floats merely delays the arrival of the inevitable error message.")
           "latex/ifmtarg")
          ((#:build-targets _ '())
           ''("ifmtarg.ins"))
-         ((#:tex-format _ "latex") "latex")
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/ifmtarg")))))))
+         ((#:tex-format _ "latex") "latex")))
       (inputs
        (list texlive-filecontents))
       (home-page "https://www.ctan.org/pkg/ifmtarg")
@@ -11767,11 +10769,7 @@ testing whether an argument is empty.")
          ((#:tex-directory _ '())
           "latex/pagenote")
          ((#:build-targets _ '())
-          ''("pagenote.ins"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/pagenote")))))))
+          ''("pagenote.ins"))))
       (propagated-inputs
        (list texlive-ifmtarg))
       (home-page "https://www.ctan.org/pkg/pagenote")
@@ -11795,11 +10793,7 @@ page (also known as ‘end notes’).")
           "latex/titling")
          ((#:build-targets _ '())
           ''("titling.ins"))
-         ((#:tex-format _ "latex") "latex")
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/titling")))))))
+         ((#:tex-format _ "latex") "latex")))
       (native-inputs
        (list texlive-cm))
       (home-page "https://www.ctan.org/pkg/titling")
@@ -11825,11 +10819,7 @@ a physical page.")
          ((#:tex-directory _ '())
           "latex/ifoddpage")
          ((#:build-targets _ '())
-          ''("ifoddpage.ins"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/ifoddpage")))))))
+          ''("ifoddpage.ins"))))
       (native-inputs
        (list texlive-ydoc))
       (home-page "https://www.ctan.org/pkg/ifoddpage")
@@ -11855,11 +10845,7 @@ the conditional @code{\\ifoddpageoronside} is provided which is also true in
          ((#:tex-directory _ '())
           "latex/storebox")
          ((#:build-targets _ '())
-          ''("storebox.ins"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/storebox")))))))
+          ''("storebox.ins"))))
       (native-inputs
        (list texlive-ydoc))
       (home-page "https://www.ctan.org/pkg/storebox")
@@ -11884,11 +10870,7 @@ DVI is output, store boxes behave the same as save boxes.")
          ((#:tex-directory _ '())
           "latex/collectbox")
          ((#:build-targets _ '())
-          ''("collectbox.ins"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/collectbox")))))))
+          ''("collectbox.ins"))))
       (native-inputs
        (list texlive-ydoc))
       (home-page "https://www.ctan.org/pkg/collectbox")
@@ -11920,26 +10902,7 @@ The macros were designed for use within other macros.")
          ((#:tex-directory _ #t)
           "latex/grfext")
          ((#:build-targets _ #t)
-          #~(list "grfext.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _
-                  (chdir "source/latex/grfext")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))
-              (add-after 'copy-files 'remove-generated-file
-                (lambda* (#:key outputs #:allow-other-keys)
-                  (with-directory-excursion #$output
-                    (for-each delete-file
-                              (find-files "." "\\.(drv|ins)$")))))))))
+          #~(list "grfext.dtx"))))
       (home-page "https://github.com/ho-tex/grfext")
       (synopsis "Manipulate the graphics package's list of extensions")
       (description "This package provides macros for adding to, and reordering
@@ -11960,11 +10923,7 @@ the list of graphics file extensions recognised by package graphics.")
          ((#:tex-directory _ '())
           "latex/adjustbox")
          ((#:build-targets _ '())
-          ''("adjustbox.ins"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/adjustbox")))))))
+          ''("adjustbox.ins"))))
       (native-inputs
        (list texlive-ydoc))
       (propagated-inputs
@@ -11999,29 +10958,7 @@ provided box macros are @code{\\lapbox}, @code{\\marginbox},
     (outputs '("out" "doc"))
     (arguments
      (list
-      #:tex-directory "latex/qrcode"
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'chdir
-            (lambda _
-              (setenv "ROOT_DIR" (getcwd))
-              (chdir "source/latex/qrcode")))
-          (add-after 'build 'build-doc
-            (lambda _
-              (copy-file "qrcode.dtx" "build/qrcode.dtx")
-              (chdir "build")
-              (invoke "xelatex" "qrcode.dtx")
-              (invoke "xelatex" "qrcode.dtx"))) ;generate qrcode.pdf
-          (replace 'install
-            (lambda* (#:key tex-directory #:allow-other-keys)
-              (let ((doc (string-append #$output:doc "/share/doc/"
-                                        tex-directory))
-                    (out (string-append #$output "/share/texmf-dist/tex/"
-                                        tex-directory)))
-                (install-file "qrcode.pdf" doc)
-                (install-file (car (find-files (getenv "ROOT_DIR") "README"))
-                              doc)
-                (install-file "qrcode.sty" out)))))))
+      #:tex-directory "latex/qrcode"))
     (propagated-inputs
      (list texlive-lm
            texlive-latex-xkeyval
@@ -12266,10 +11203,7 @@ accompanied by various configuration commands.")
                 ;; Install unicode-math-table.tex, which is not
                 ;; built.
                 (install-file "tex/latex/unicode-math/unicode-math-table.tex"
-                              tex))))
-          (add-after 'copy-files 'chdir
-            (lambda* (#:key tex-directory #:allow-other-keys)
-              (chdir (string-append "source/" tex-directory)))))))
+                              tex)))))))
     (home-page "https://ctan.org/pkg/unicode-math")
     (synopsis "Unicode mathematics support for XeTeX and LuaTeX")
     (description "This package will provide a complete implementation of
@@ -12663,12 +11597,7 @@ fnlineno package.")
          ((#:tex-directory _ '())
           "generic/babel-czech")
          ((#:build-targets _ '())
-          ''("czech.ins")) ; TODO: use dtx and build documentation
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _
-                 (chdir "source/generic/babel-czech")))))))
+          ''("czech.ins"))))
       (home-page "https://www.ctan.org/pkg/babel-czech")
       (synopsis "Babel support for Czech")
       (description
@@ -12690,11 +11619,7 @@ Czech of standard ``LaTeX names''.")
          ((#:tex-directory _ '())
           "generic/babel-dutch")
          ((#:build-targets _ '())
-          ''("dutch.ins")) ; TODO: use dtx and build documentation
-         ((#:phases phases) `(modify-phases ,phases
-                               (add-after 'unpack 'chdir
-                                 (lambda _
-                                   (chdir "source/generic/babel-dutch")))))))
+          ''("dutch.ins"))))
       (home-page "https://www.ctan.org/pkg/babel-dutch")
       (synopsis "Babel support for Dutch")
       (description
@@ -12716,12 +11641,7 @@ settings to typeset Dutch documents.")
          ((#:tex-directory _ '())
           "generic/babel-finnish")
          ((#:build-targets _ '())
-          ''("finnish.ins")) ; TODO: use dtx and build documentation
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _
-                 (chdir "source/generic/babel-finnish")))))))
+          ''("finnish.ins"))))
       (home-page "https://www.ctan.org/pkg/babel-finnish")
       (synopsis "Babel support for Finnish")
       (description
@@ -12764,12 +11684,7 @@ to Norsk of standard “LaTeX names”.")
          ((#:tex-directory _ '())
           "generic/babel-danish")
          ((#:build-targets _ '())
-          ''("danish.ins")) ; TODO: use dtx and build documentation
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _
-                 (chdir "source/generic/babel-danish")))))))
+          ''("danish.ins"))))
       (home-page "https://www.ctan.org/pkg/babel-danish")
       (synopsis "Babel support for Danish")
       (description
@@ -12791,12 +11706,7 @@ settings to typeset Danish documents.")
          ((#:tex-directory _ '())
           "generic/babel-polish")
          ((#:build-targets _ '())
-          ''("polish.ins")) ; TODO: use dtx and build documentation
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _
-                 (chdir "source/generic/babel-polish")))))))
+          ''("polish.ins"))))
       (home-page "https://www.ctan.org/pkg/babel-polish")
       (synopsis "Babel support for Polish")
       (description
@@ -13050,21 +11960,7 @@ loading @code{everyshi-2001-05-15}.")
          ((#:tex-directory _ #f)
           "latex/abstract")
          ((#:build-targets _ #t)
-          #~(list "abstract.ins"))
-         ((#:phases std-phases)
-          #~(modify-phases #$std-phases
-              (add-after 'unpack 'chdir
-                (lambda args
-                  (chdir "source/latex/abstract")))
-              (add-before 'copy-files 'unchdir
-                (lambda args
-                  (chdir "../../..")))
-              (add-after 'copy-files 'remove-extra-files
-                (lambda args
-                  (delete-file-recursively
-                   (string-append #$output
-                                  "/share/texmf-dist"
-                                  "/source/latex/abstract/build"))))))))
+          #~(list "abstract.ins"))))
       (home-page "https://ctan.org/pkg/abstract")
       (synopsis "Control the typesetting of the abstract environment")
       (description "The abstract package gives you control over the typesetting
@@ -13086,21 +11982,7 @@ abstract in a two column paper.")
          ((#:tex-directory _ #f)
           "latex/breqn")
          ((#:build-targets _ #t)
-          #~(list "breqnbundle.ins"))
-         ((#:phases std-phases)
-          #~(modify-phases #$std-phases
-              (add-after 'unpack 'chdir
-                (lambda args
-                  (chdir "source/latex/breqn")))
-              (add-before 'copy-files 'unchdir
-                (lambda args
-                  (chdir "../../..")))
-              (add-after 'copy-files 'remove-extra-files
-                (lambda args
-                  (delete-file-recursively
-                   (string-append #$output
-                                  "/share/texmf-dist"
-                                  "/source/latex/breqn/build"))))))))
+          #~(list "breqnbundle.ins"))))
       (home-page "https://wspr.io/breqn/")
       (synopsis "Automatic line breaking of displayed equations")
       (description "This package provides solutions to a number of common
@@ -13144,21 +12026,7 @@ controlled comment versions.")
          ((#:tex-directory _ #f)
           "latex/datatool")
          ((#:build-targets _ #t)
-          #~(list "datatool.ins"))
-         ((#:phases std-phases)
-          #~(modify-phases #$std-phases
-              (add-after 'unpack 'chdir
-                (lambda args
-                  (chdir "source/latex/datatool")))
-              (add-before 'copy-files 'unchdir
-                (lambda args
-                  (chdir "../../..")))
-              (add-after 'copy-files 'remove-extra-files
-                (lambda args
-                  (delete-file-recursively
-                   (string-append #$output
-                                  "/share/texmf-dist"
-                                  "/source/latex/datatool/build"))))))))
+          #~(list "datatool.ins"))))
       (home-page "https://ctan.org/pkg/datatool")
       (synopsis "Tools to load and manipulate data")
       (description "This package provides tools to create databases using LaTeX
@@ -13291,20 +12159,7 @@ fonts.")
       (arguments
        (substitute-keyword-arguments (package-arguments template)
          ((#:tex-directory _ #t) "latex/lastpage")
-         ((#:build-targets _ '()) '(list "lastpage.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _ (chdir "source/latex/lastpage/")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+         ((#:build-targets _ '()) '(list "lastpage.ins"))))
       (home-page "https://ctan.org/pkg/lastpage")
       (synopsis "Reference last page for Page N of M type footers")
       (description
@@ -13368,20 +12223,7 @@ defined ``tab stop''.")
       (arguments
        (substitute-keyword-arguments (package-arguments template)
          ((#:tex-directory _ #t) "generic/soul")
-         ((#:build-targets _ '()) '(list "soul.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _ (chdir "source/generic/soul/")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+         ((#:build-targets _ '()) '(list "soul.ins"))))
       (home-page "http://www.ctan.org/pkg/soul")
       (synopsis "Hyphenation for letterspacing, underlining, and more")
       (description
@@ -13409,20 +12251,7 @@ syllable.  The package itself does not support UTF-8 input in ordinary
       (arguments
        (substitute-keyword-arguments (package-arguments template)
          ((#:tex-directory _ #t) "generic/soulutf8")
-         ((#:build-targets _ '()) '(list "soulutf8.dtx"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _ (chdir "source/latex/soulutf8/")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+         ((#:build-targets _ '()) '(list "soulutf8.dtx"))))
       (propagated-inputs
        (list texlive-etexcmds
              texlive-infwarerr
@@ -13496,20 +12325,7 @@ are provided to:
        (substitute-keyword-arguments (package-arguments template)
          ((#:tex-directory _ #t) "latex/totcount")
          ((#:tex-format _ #t) "latex")
-         ((#:build-targets _ '()) '(list "totcount.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _ (chdir "source/latex/totcount/")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+         ((#:build-targets _ '()) '(list "totcount.ins"))))
       (propagated-inputs
        (list texlive-graphics))
       (home-page "https://ctan.org/pkg/totcount")
@@ -13538,20 +12354,7 @@ changed, the recorded value will usually be the maximum value.")
        (substitute-keyword-arguments (package-arguments template)
          ((#:tex-directory _ #t) "latex/totpages")
          ((#:tex-format _ #t) "latex")
-         ((#:build-targets _ '()) '(list "totpages.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'chdir
-                (lambda _ (chdir "source/latex/totpages/")))
-              (replace 'copy-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((origin (assoc-ref inputs "source"))
-                        (source (string-append #$output
-                                               "/share/texmf-dist/source"))
-                        (doc (string-append #$output:doc
-                                            "/share/texmf-dist/doc")))
-                    (copy-recursively (string-append origin "/source") source)
-                    (copy-recursively (string-append origin "/doc") doc))))))))
+         ((#:build-targets _ '()) '(list "totpages.ins"))))
       (native-inputs
        (list (texlive-updmap.cfg)))
       (propagated-inputs
-- 
cgit 1.4.1


From 4a245129ffc84ca9a173da82df6f91239c6b1fe6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 5 May 2023 17:22:03 +0200
Subject: guix: import: Update texlive importer according to new build system.

* guix/import/texlive.scm (tlpdb->package): Generate a package that doesn't
need SIMPLE-TEXLIVE-PACKAGE.
* guix/import/utils.scm (package->definition): Remove special case for
`simple-texlive-package'.
* tests/texlive.scm (%fake-tlpdb): Add test data.
("texlive->guix-package"): Update test.
("texlive->guix-package, no docfiles"): New test.
---
 guix/import/texlive.scm | 42 +++++++++++++-----------
 guix/import/utils.scm   |  3 --
 tests/texlive.scm       | 86 +++++++++++++++++++++++++++++++++++++------------
 3 files changed, 89 insertions(+), 42 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 086cd363a9..e5fcb7adf8 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -275,33 +275,37 @@ of those files are returned that are unexpectedly installed."
                         store ref (string-append name "-svn-multi-checkout")))))
     (values
      `(package
-        (inherit (simple-texlive-package
-                  ,name
-                  (list ,@dirs)
-                  (base32
-                   ,(bytevector->nix-base32-string
-                     (let-values (((port get-hash) (open-sha256-port)))
-                       (write-file source port)
-                       (force-output port)
-                       (get-hash))))
-                  ,@(if (assoc-ref data 'srcfiles) '() '(#:trivial? #true))))
-        ;; package->definition in (guix import utils) expects to see a
-        ;; version field.
-        (version ,version)
+        (name ,name)
+        (version (number->string %texlive-revision))
+        (source (texlive-origin
+                 name version
+                 (list ,@(sort locs string<))
+                 (base32
+                  ,(bytevector->nix-base32-string
+                    (let-values (((port get-hash) (open-sha256-port)))
+                      (write-file source port)
+                      (force-output port)
+                      (get-hash))))))
+        ,@(if (assoc-ref data 'docfiles)
+              '((outputs '("out" "doc")))
+              '())
+        (build-system texlive-build-system)
         ,@(match filtered-depends
             (() '())
             (inputs
              `((propagated-inputs
-                (list ,@(map
+                (list ,@(map-in-order
                          (lambda (tex-name)
                            (let ((name (guix-name tex-name)))
                              (string->symbol name)))
-                         inputs))))))
-        ,@(or (and=> (assoc-ref data 'name)
+                         ;; Sort inputs alphabetically.
+                         (reverse inputs)))))))
+        (home-page
+         ,(or (and=> (or (assoc-ref data 'catalogue)
+                         (assoc-ref data 'name))
                      (lambda (name)
-                       `((home-page ,(string-append "https://ctan.org/pkg/"
-                                                    name)))))
-              '((home-page "https://www.tug.org/texlive/")))
+                       (string-append "https://ctan.org/pkg/" name)))
+              "https://www.tug.org/texlive/"))
         (synopsis ,(assoc-ref data 'shortdesc))
         (description ,(and=> (assoc-ref data 'longdesc) beautify-description))
         (license ,(and=> (assoc-ref data 'catalogue-license)
diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index e9a0a7ecd7..5176f12a31 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -436,10 +436,7 @@ APPEND-VERSION?/string is a string, append this string."
   (match guix-package
     ((or
       ('package ('name name) ('version version) . rest)
-      ('package ('inherit ('simple-texlive-package name . _))
-                ('version version) . rest)
       ('let _ ('package ('name name) ('version version) . rest)))
-
      `(define-public ,(string->symbol
                        (cond
                         ((string? append-version?/string)
diff --git a/tests/texlive.scm b/tests/texlive.scm
index 7d7ad332b4..1493fc87bb 100644
--- a/tests/texlive.scm
+++ b/tests/texlive.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017, 2022 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,7 +32,15 @@
 (test-begin "texlive")
 
 (define %fake-tlpdb
-  '(("stricttex"
+  '(("example"
+     . ((name . "example")
+        (shortdesc . "Typeset examples...")
+        (longdesc . "The package makes it easier...")
+        (runfiles
+         .
+         ("texmf-dist/tex/latex/example/example.sty"))
+        (catalogue-license . "gpl")))
+    ("stricttex"
      . ((name
          . "stricttex")
         (shortdesc
@@ -69,7 +78,7 @@ theorems and proofs, centered or non-justified text, and listing computer
 code; Specialized macros for easily constructing ruled tables. TeXsis was
 originally developed for physicists, but others may also find it useful. It is
 completely compatible with Plain TeX.")
-        (depend . ("cm" "hyphen-base" "knuth-lib" "plain" "tex"))
+        (depend . ("tex" "plain" "knuth-lib" "hyphen-base" "cm"))
         (docfiles
          . ("texmf-dist/doc/man/man1/texsis.1"
             "texmf-dist/doc/man/man1/texsis.man1.pdf"
@@ -158,6 +167,40 @@ completely compatible with Plain TeX.")
             "texmf-dist/tex/texsis/config/texsis.ini"))
         (catalogue-license . "lppl")))))
 
+(test-assert "texlive->guix-package, no docfiles"
+  ;; Replace network resources with sample data.
+  (mock ((guix build svn) svn-fetch
+         (lambda* (url revision directory
+                       #:key (svn-command "svn")
+                       (user-name #f)
+                       (password #f)
+                       (recursive? #t))
+           (mkdir-p directory)
+           (with-output-to-file (string-append directory "/foo")
+             (lambda ()
+               (display "source")))))
+        (let ((result (texlive->guix-package "example"
+                                             #:package-database
+                                             (lambda _ %fake-tlpdb))))
+          (match result
+            (('package
+               ('name "texlive-example")
+               ('version _)
+               ('source ('texlive-origin
+                         'name 'version
+                         ('list "tex/latex/example/")
+                         ('base32 (? string? hash))))
+               ('build-system 'texlive-build-system)
+               ('home-page (? string?))
+               ('synopsis (? string?))
+               ('description (? string?))
+               ('license _))
+             #true)
+            (_
+             (begin
+               (format #t "~s~%" result)
+               (pk 'fail result #f)))))))
+
 (test-assert "texlive->guix-package"
   ;; Replace network resources with sample data.
   (mock ((guix build svn) svn-fetch
@@ -174,27 +217,30 @@ completely compatible with Plain TeX.")
                                              #:package-database
                                              (lambda _ %fake-tlpdb))))
           (match result
-            (`(package
-                (inherit (simple-texlive-package
-                          "texlive-texsis"
-                          (list "bibtex/bst/texsis/"
-                                "doc/man/man1/"
+            (('package
+               ('name "texlive-texsis")
+               ('version _)
+               ('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 ,(? string? hash))
-                          #:trivial? #t))
-                (version ,_)
-                (propagated-inputs
-                 (list texlive-cm
-                       texlive-hyphen-base
-                       texlive-knuth-lib
-                       texlive-plain
-                       texlive-tex))
-                (home-page ,(? string?))
-                (synopsis ,(? string?))
-                (description ,(? string?))
-                (license lppl))
+                         ('base32 (? string? hash))))
+               ('outputs ''("out" "doc"))
+               ('build-system 'texlive-build-system)
+               ('propagated-inputs
+                ('list 'texlive-cm
+                       'texlive-hyphen-base
+                       'texlive-knuth-lib
+                       'texlive-plain
+                       'texlive-tex))
+               ('home-page (? string?))
+               ('synopsis (? string?))
+               ('description (? string?))
+               ('license 'lppl))
              #true)
             (_
              (begin
-- 
cgit 1.4.1


From 7a6da1e22a93bcb0408bff4d7b5368dc289415a7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:45:54 +0200
Subject: guix: import: Improve home-page generation in texlive importer.

* guix/import/texlive.scm (tlpdb): Also register `catalogue' key.
(tlpdb->package): First try to use catalogue for the home-page, then the
name.
* tests/texlive.scm (%fake-tlpdb): Add tests data.
("texlive->guix-package, with catalogue entry, no inputs"): New test.
---
 guix/import/texlive.scm |  1 +
 tests/texlive.scm       | 57 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index e5fcb7adf8..8618ccd802 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -133,6 +133,7 @@
             '((name     . string)
               (shortdesc . string)
               (longdesc . string)
+              (catalogue . string)
               (catalogue-license . string)
               (catalogue-ctan . string)
               (srcfiles . list)
diff --git a/tests/texlive.scm b/tests/texlive.scm
index 1493fc87bb..19bb3bda1b 100644
--- a/tests/texlive.scm
+++ b/tests/texlive.scm
@@ -32,7 +32,25 @@
 (test-begin "texlive")
 
 (define %fake-tlpdb
-  '(("example"
+  '(("12many"
+     . ((name
+         . "12many")
+        (catalogue
+         . "one2many")
+        (shortdesc
+         . "Generalising mathematical index sets")
+        (longdesc
+         . "In the discrete branches of mathematics...")
+        (docfiles
+         . ("texmf-dist/doc/latex/12many/12many.pdf"
+            "texmf-dist/doc/latex/12many/README"))
+        (srcfiles
+         . ("texmf-dist/source/latex/12many/12many.dtx"
+            "texmf-dist/source/latex/12many/12many.ins"))
+        (runfiles
+         . ("texmf-dist/tex/latex/12many/12many.sty"))
+        (catalogue-license . "lppl")))
+    ("example"
      . ((name . "example")
         (shortdesc . "Typeset examples...")
         (longdesc . "The package makes it easier...")
@@ -247,4 +265,41 @@ completely compatible with Plain TeX.")
                (format #t "~s~%" result)
                (pk 'fail result #f)))))))
 
+(test-assert "texlive->guix-package, with catalogue entry, no inputs"
+  ;; Replace network resources with sample data.
+  (mock ((guix build svn) svn-fetch
+         (lambda* (url revision directory
+                       #:key (svn-command "svn")
+                       (user-name #f)
+                       (password #f)
+                       (recursive? #t))
+           (mkdir-p directory)
+           (with-output-to-file (string-append directory "/foo")
+             (lambda ()
+               (display "source")))))
+        (let ((result (texlive->guix-package "12many"
+                                             #:package-database
+                                             (lambda _ %fake-tlpdb))))
+          (match result
+            (('package
+               ('name "texlive-12many")
+               ('version _)
+               ('source ('texlive-origin
+                         'name 'version
+                         ('list "doc/latex/12many/"
+                                "source/latex/12many/"
+                                "tex/latex/12many/")
+                         ('base32 (? string? hash))))
+               ('outputs ''("out" "doc"))
+               ('build-system 'texlive-build-system)
+               ('home-page "https://ctan.org/pkg/one2many")
+               ('synopsis (? string?))
+               ('description (? string?))
+               ('license 'lppl))
+             #true)
+            (_
+             (begin
+               (format #t "~s~%" result)
+               (pk 'fail result #f)))))))
+
 (test-end "texlive")
-- 
cgit 1.4.1


From 308b3e83c3dc65987f7187e55b2fa549147882d1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 09:46:17 +0200
Subject: guix: import: texlive use full file names for generic directories.

Generic directories, such as "doc/info/" or "doc/man" are shared by multiple
packages.  With this change, the texlive importer specifies the full file name
of package-specific files there, making sure only them are downloaded.

* guix/import/texlive.scm (texlive-generic-locations): New variable.
(files->locations): Renamed from files->directories.
Provide full file names when necessary.
(tlpdb->package): Apply renaming.
---
 guix/import/texlive.scm | 57 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 8618ccd802..31abf533c4 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -48,6 +48,20 @@
 ;;;
 ;;; Code:
 
+;; Generic locations are parts of the tree shared by multiple packages.
+;; Package definitions should single out files stored there, or all files in
+;; the directory from all involved packages would be downloaded.
+(define texlive-generic-locations
+  (list "doc/generic/hyph-utf8/"
+        "doc/info/"
+        "doc/man/"
+        "doc/web2c/"
+        "scripts/texlive/"
+        "scripts/texlive-extra/"
+        "tex/generic/config/"
+        "tex/generic/hyphen/"
+        "web2c/"))
+
 (define string->license
   (match-lambda
     ("artistic2" 'gpl3+)
@@ -70,9 +84,9 @@
 
     ("lpplgpl" `(list lppl gpl1+))
     ("lppl" 'lppl)
-    ("lppl1" 'lppl1.0+) ; usually means "or later"
-    ("lppl1.2" 'lppl1.2+) ; usually means "or later"
-    ("lppl1.3" 'lppl1.3+) ; usually means "or later"
+    ("lppl1" 'lppl1.0+)                 ; usually means "or later"
+    ("lppl1.2" 'lppl1.2+)               ; usually means "or later"
+    ("lppl1.3" 'lppl1.3+)               ; usually means "or later"
     ("lppl1.3a" 'lppl1.3a)
     ("lppl1.3b" 'lppl1.3b)
     ("lppl1.3c" 'lppl1.3c)
@@ -234,25 +248,34 @@ of those files are returned that are unexpectedly installed."
         (lset-difference string=?
                          (map strip-directory-prefix existing) files))))
 
-(define (files->directories files)
+(define (files->locations files)
   (define name->parts (cut string-split <> #\/))
-  (map (cut string-join <> "/" 'suffix)
-       (delete-duplicates (map (lambda (file)
-                                 (drop-right (name->parts file) 1))
-                               (sort files string<))
-                          ;; Remove sub-directories, i.e. more specific
-                          ;; entries with the same prefix.
-                          (lambda (x y) (every equal? x y)))))
+  ;; Generic locations are shared by multiple packages.  Provide the full file
+  ;; name to make so as to extract only the files related to the package being
+  ;; imported.
+  (let-values (((generic specific)
+                (partition (lambda (f)
+                             (any (cut string-prefix? <> f)
+                                  texlive-generic-locations))
+                           files)))
+    (append generic
+            (map (cut string-join <> "/" 'suffix)
+                 (delete-duplicates (map (lambda (file)
+                                           (drop-right (name->parts file) 1))
+                                         (sort specific string<))
+                                    ;; Remove sub-directories, i.e. more
+                                    ;; specific entries with the same prefix.
+                                    (lambda (x y) (every equal? x y)))))))
 
 (define (tlpdb->package name version package-database)
   (and-let* ((data (assoc-ref package-database name))
-             (dirs (files->directories
-                    (filter-map (lambda (dir)
+             (locs (files->locations
+                    (filter-map (lambda (file)
                                   ;; Ignore any file not starting with the
                                   ;; expected prefix.  Nothing good can come
                                   ;; from this.
-                                  (and (string-prefix? "texmf-dist/" dir)
-                                       (string-drop dir (string-length "texmf-dist/"))))
+                                  (and (string-prefix? "texmf-dist/" file)
+                                       (string-drop file (string-length "texmf-dist/"))))
                                 (append (or (assoc-ref data 'docfiles) (list))
                                         (or (assoc-ref data 'runfiles) (list))
                                         (or (assoc-ref data 'srcfiles) (list))))))
@@ -263,7 +286,7 @@ of those files are returned that are unexpectedly installed."
              (ref (svn-multi-reference
                    (url (string-append "svn://www.tug.org/texlive/tags/"
                                        %texlive-tag "/Master/texmf-dist"))
-                   (locations dirs)
+                   (locations locs)
                    (revision %texlive-revision)))
              ;; Ignore arch-dependent packages.
              (filtered-depends
@@ -295,7 +318,7 @@ of those files are returned that are unexpectedly installed."
             (() '())
             (inputs
              `((propagated-inputs
-                (list ,@(map-in-order
+                (list ,@(map
                          (lambda (tex-name)
                            (let ((name (guix-name tex-name)))
                              (string->symbol name)))
-- 
cgit 1.4.1


From 3fc925aa84901072a1fc9a1d05b1b3efc24c47e2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 10:57:23 +0200
Subject: guix: import: Fix multiple licenses output in texlive importer.

* guix/import/texlive.scm (string->license): Add missing case and try first to
split license strings before giving up.
* tests/texlive.scm (%fake-tlpdb): Add test data.
("texlive->guix-package, multiple licenses"): New test.
---
 guix/import/texlive.scm |  3 ++-
 tests/texlive.scm       | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 31abf533c4..33a0e7d1d9 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -109,7 +109,8 @@
     ("cc-by-nc-nd-2.5" 'non-free)
     ("cc-by-nc-nd-3" 'non-free)
     ("cc-by-nc-nd-4" 'non-free)
-    ((x) (string->license x))
+    ((? string? x) (string->license (string-split x #\space)))
+    ((x) `(error unknown-license ,x))
     ((lst ...) `(list ,@(map string->license lst)))
     (x `(error unknown-license ,x))))
 
diff --git a/tests/texlive.scm b/tests/texlive.scm
index 19bb3bda1b..9f4c965139 100644
--- a/tests/texlive.scm
+++ b/tests/texlive.scm
@@ -50,6 +50,18 @@
         (runfiles
          . ("texmf-dist/tex/latex/12many/12many.sty"))
         (catalogue-license . "lppl")))
+    ("chs-physics-report"
+     . ((name . "ch-physics-report")
+        (shortdesc . "Physics lab reports...")
+        (longdesc . "This package may...")
+        (docfiles
+         .
+         ("texmf-dist/doc/latex/chs-physics-report/README.txt"
+          "texmf-dist/doc/latex/chs-physics-report/chs-physics-report.pdf"))
+        (runfiles
+         .
+         ("texmf-dist/tex/latex/chs-physics-report/chs-physics-report.sty"))
+        (catalogue-license . "pd cc-by-sa-3")))
     ("example"
      . ((name . "example")
         (shortdesc . "Typeset examples...")
@@ -302,4 +314,40 @@ completely compatible with Plain TeX.")
                (format #t "~s~%" result)
                (pk 'fail result #f)))))))
 
+(test-assert "texlive->guix-package, multiple licenses"
+  ;; Replace network resources with sample data.
+  (mock ((guix build svn) svn-fetch
+         (lambda* (url revision directory
+                       #:key (svn-command "svn")
+                       (user-name #f)
+                       (password #f)
+                       (recursive? #t))
+           (mkdir-p directory)
+           (with-output-to-file (string-append directory "/foo")
+             (lambda ()
+               (display "source")))))
+        (let ((result (texlive->guix-package "chs-physics-report"
+                                             #:package-database
+                                             (lambda _ %fake-tlpdb))))
+          (match result
+            (('package
+               ('name "texlive-chs-physics-report")
+               ('version _)
+               ('source ('texlive-origin
+                         'name 'version
+                         ('list "doc/latex/chs-physics-report/"
+                                "tex/latex/chs-physics-report/")
+                         ('base32 (? string? hash))))
+               ('outputs ''("out" "doc"))
+               ('build-system 'texlive-build-system)
+               ('home-page (? string?))
+               ('synopsis (? string?))
+               ('description (? string?))
+               ('license ('list 'public-domain 'cc-by-sa3.0)))
+             #true)
+            (_
+             (begin
+               (format #t "~s~%" result)
+               (pk 'fail result #f)))))))
+
 (test-end "texlive")
-- 
cgit 1.4.1


From dd9de5760861edf4a094e46d03a8f19e61b4a350 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 3 May 2023 20:16:51 +0200
Subject: gnu: texlive-latex-l3kernel -> texlive-l3kernel.

* gnu/packages/tex.scm (texlive-l3kernel): New variable.
(texlive-latex-l3kernel): Deprecate variable.
(texlive-latex-base):
(texlive-latex-l3packages):
(texlive-pstool):
(texlive-siunitx):
(texlive-latex-ebproof):
(texlive-xetex): Apply renaming.
---
 gnu/packages/tex.scm | 59 ++++++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bad86904c6..8096fd6c67 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3121,7 +3121,7 @@ formats.")
              texlive-unicode-data
              texlive-ukrhyph
              texlive-ruhyphen
-             texlive-latex-l3kernel
+             texlive-l3kernel
              texlive-latex-l3backend
              ;; TODO: This dependency isn't needed for LaTeX version 2021-06-01
              ;; and later. See:
@@ -3736,35 +3736,40 @@ the now obsolete teTeX distributions but are still used at the core of the TeX
 Live distribution.")
     (license license:public-domain)))
 
-(define-public texlive-latex-l3kernel
+(define-public texlive-l3kernel
   (package
-    (name "texlive-latex-l3kernel")
+    (name "texlive-l3kernel")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "l3kernel"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "068xkinrkl6qjf8r6a9i0msvnzp4y7a3gnd2h12ws0km1dv19r20"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/l3kernel/"
+                   "source/latex/l3kernel/"
+                   "tex/latex/l3kernel/")
+             (base32
+              "1y7wcb2643cfwda86f5zpbbw3hj01rji7r143ln77k8nr1919jj1")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     '(#:tex-directory "latex/l3kernel"
-       #:tex-engine "tex"
-       #:tex-format #f
-       #:texlive-latex-base #f))
+     (list
+      #:tex-engine "tex"
+      #:tex-format #f
+      #:texlive-latex-base #f))
     (native-inputs
      (list texlive-docstrip))
-    (home-page "https://www.ctan.org/pkg/l3kernel")
-    (synopsis "LaTeX3 programmers’ interface")
-    (description
-     "The l3kernel bundle provides an implementation of the LaTeX3
-programmers’ interface, as a set of packages that run under LaTeX 2e.  The
-interface provides the foundation on which the LaTeX3 kernel and other future
-code are built: it is an API for TeX programmers.  The packages are set up so
-that the LaTeX3 conventions can be used with regular LaTeX 2e packages.")
+    (propagated-inputs
+     (list texlive-l3backend))
+    (home-page "https://ctan.org/pkg/l3kernel")
+    (synopsis "LaTeX3 programming conventions")
+    (description
+     "The l3kernel bundle provides an implementation of the LaTeX3 programmers
+interface, as a set of packages that run under LaTeX2e.  The interface
+provides the foundation on which the LaTeX3 kernel and other future code are
+built: it is an API for TeX programmers.  The packages are set up so that the
+LaTeX3 conventions can be used with regular LaTeX2e packages.")
     (license license:lppl1.3c+)))
 
+(define-deprecated-package texlive-latex-l3kernel texlive-l3kernel)
+
 (define-public texlive-latex-l3backend
   (package
     (name "texlive-latex-l3backend")
@@ -3847,7 +3852,7 @@ an independent schedule.")
     (native-inputs
      (list texlive-docstrip))
     (propagated-inputs
-     (list texlive-latex-l3kernel))
+     (list texlive-l3kernel))
     (home-page "https://www.ctan.org/pkg/l3packages")
     (synopsis "High-level LaTeX3 concepts")
     (description
@@ -5220,7 +5225,7 @@ rotated.")
            texlive-filemod
            texlive-graphics
            texlive-latex-ifplatform
-           texlive-latex-l3kernel ; for expl3
+           texlive-l3kernel ; for expl3
            texlive-oberdiek
            texlive-latex-psfrag
            texlive-tools ; for shellesc
@@ -10022,7 +10027,7 @@ The behaviour in standalone mode may adjusted using a configuration file
      '(#:tex-directory "latex/siunitx"
        #:build-targets '("siunitx.dtx")))
     (propagated-inputs
-     (list texlive-latex-l3kernel texlive-latex-l3packages))
+     (list texlive-l3kernel texlive-latex-l3packages))
     (home-page "http://www.ctan.org/pkg/siunitx")
     (synopsis "Comprehensive SI units package")
     (description
@@ -11017,7 +11022,7 @@ parts.")
     (build-system texlive-build-system)
     (arguments '(#:tex-directory "latex/ebproof"))
     (propagated-inputs
-     (list texlive-latex-l3kernel))
+     (list texlive-l3kernel))
     (home-page "http://www.ctan.org/pkg/ebproof")
     (synopsis
      "Formal proofs in the style of sequent calculus")
@@ -12392,7 +12397,7 @@ itself may be shipped out to the DVI file.")
            texlive-latex-base
            texlive-fonts-latex
            texlive-latex-l3backend
-           texlive-latex-l3kernel
+           texlive-l3kernel
            texlive-latex-l3packages
            texlive-lm
            texlive-tex-ini-files
-- 
cgit 1.4.1


From b8fef5d92e1931062c0806ad313c86bf505b7ad1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 4 May 2023 19:51:14 +0200
Subject: gnu: texlive-latex-blindtext -> texlive-blindtext.

* gnu/packages/tex.scm (texlive-blindtext): New variable.
(texlive-latex-blindtext): Deprecate variable.
---
 gnu/packages/tex.scm | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8096fd6c67..31433e42d2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4783,20 +4783,22 @@ packages.")
 
 (define-deprecated-package texlive-latex-bigfoot texlive-bigfoot)
 
-(define-public texlive-latex-blindtext
+(define-public texlive-blindtext
   (package
-    (name "texlive-latex-blindtext")
+    (name "texlive-blindtext")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "blindtext"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1jrja9b1pzdh9zgv1jh807w4xijqja58n2mqny6dkwicv8qfgbfg"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/blindtext/"
+                   "source/latex/blindtext/"
+                   "tex/latex/blindtext/")
+             (base32
+              "1gakawih3mzm5jh01kb44sjpsa4r8c3zwzig5bac37g4ha2vqska")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/blindtext"))
-    (home-page "https://www.ctan.org/pkg/blindtext")
+    (propagated-inputs
+     (list texlive-tools))
+    (home-page "https://ctan.org/pkg/blindtext")
     (synopsis "Producing 'blind' text for testing")
     (description
      "The package provides the commands @code{\\blindtext} and
@@ -4808,6 +4810,8 @@ the @code{latin} option provides a short \"lorem ipsum\" (for a fuller \"lorem
 ipsum\" text, see the @code{lipsum} package).")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-blindtext texlive-blindtext)
+
 (define-public texlive-latex-dinbrief
   (package
     (name "texlive-latex-dinbrief")
-- 
cgit 1.4.1


From e9cd94df0dde71a0a495a67d359279e0d26a8f69 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 4 May 2023 21:15:07 +0200
Subject: gnu: texlive-latex-dinbrief -> texlive-dinbrief.

* gnu/packages/tex.scm (texlive-dinbrief): New variable.
(texlive-latex-dinbrief): Deprecate package.
---
 gnu/packages/tex.scm | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 31433e42d2..089adfe164 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4812,34 +4812,32 @@ ipsum\" text, see the @code{lipsum} package).")
 
 (define-deprecated-package texlive-latex-blindtext texlive-blindtext)
 
-(define-public texlive-latex-dinbrief
+(define-public texlive-dinbrief
   (package
-    (name "texlive-latex-dinbrief")
+    (name "texlive-dinbrief")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "dinbrief"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0lb0kiy8fxzl6cnhcw1sggy6jrjvcd6kj1kkw3k9lkimm388yjz6"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/dinbrief/"
+                   "source/latex/dinbrief/"
+                   "tex/latex/dinbrief/")
+             (base32
+              "0l6mmn3y07xglmh3h5f7pnpmyacqb2g6nqgq3q1p6k97kf708c5s")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     '(#:tex-directory "latex/dinbrief"
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-generated-file
-           (lambda _
-             (delete-file "dinbrief.drv")
-             #t))
-         (add-after 'unpack 'fix-encoding-error
-           (lambda _
-             (with-fluids ((%default-port-encoding "ISO-8859-1"))
-               (substitute* "dinbrief.dtx"
-                 (("zur Verf.+ung. In der Pr\"aambel")
-                  "zur Verf\"ung. In der Pr\"aambel")))
-             #t)))))
-    (home-page "https://www.ctan.org/pkg/dinbrief")
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-build
+            (lambda _
+              (with-fluids ((%default-port-encoding "ISO-8859-1"))
+                (with-directory-excursion "source/latex/dinbrief"
+                  (delete-file "dinbrief.drv")
+                  (substitute* "dinbrief.dtx"
+                    (("zur Verf.+ung. In der Pr\"aambel")
+                     "zur Verf\"ung. In der Pr\"aambel")))))))))
+    (home-page "https://ctan.org/pkg/dinbrief")
     (synopsis "German letter DIN style")
     (description
      "This package implements a document layout for writing letters according
@@ -4852,6 +4850,8 @@ addition there are example files showing how letters may be created with the
 package.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-dinbrief texlive-dinbrief)
+
 (define-public texlive-latex-draftwatermark
   (package
     (name "texlive-latex-draftwatermark")
-- 
cgit 1.4.1


From f675d02d2172ff001eeb3e6367eb4547e9fa88c5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 4 May 2023 22:28:23 +0200
Subject: gnu: Add texlive-everypage.

* gnu/packages/tex.scm (texlive-everypage): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 089adfe164..66e3562c4a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11909,6 +11909,29 @@ 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-everypage
+  (package
+    (name "texlive-everypage")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/everypage/"
+                   "source/latex/everypage/"
+                   "tex/latex/everypage/")
+             (base32
+              "1kw7n7az823sc8gjrd4gjkkak1780yn76zswlnwapxmvl62pv9xk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/everypage")
+    (synopsis "Provide hooks to be run on every page of a document")
+    (description
+     "The package provides hooks to perform actions on every page, or on the
+current page.  Specifically, actions are performed after the page is composed,
+but before it is shipped, so they can be used to prepare the output page in
+tasks like putting watermarks in the background, or in setting the next page
+layout, etc.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-everysel
   (package
     (inherit
-- 
cgit 1.4.1


From 1cca15cf732c27ef0f1804ec9854b20f3b5dc844 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 4 May 2023 22:24:39 +0200
Subject: gnu: texlive-latex-draftwatermark -> texlive-draftwatermark.

* gnu/packages/tex.scm (texlive-draftwatermark): New variable.
(texlive-latex-draftwatermark): Deprecate package.
(texlive-apa6): Apply renaming.
---
 gnu/packages/tex.scm | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 66e3562c4a..a83e7ac5b9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4852,28 +4852,30 @@ package.")
 
 (define-deprecated-package texlive-latex-dinbrief texlive-dinbrief)
 
-(define-public texlive-latex-draftwatermark
+(define-public texlive-draftwatermark
   (package
-    (name "texlive-latex-draftwatermark")
+    (name "texlive-draftwatermark")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "draftwatermark"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0rhn74ywv000b89w8qjf1i0qsk6kd1mjapfwis14jwjvbjqgvj95"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/draftwatermark/"
+                   "source/latex/draftwatermark/"
+                   "tex/latex/draftwatermark/")
+             (base32
+              "04l3gqiq0bhzbz8zxr7428fap2x1skkaq5ppbambc4lk8c7iw6da")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/draftwatermark"))
-    (home-page "https://www.ctan.org/pkg/draftwatermark")
+    (propagated-inputs
+     (list texlive-everypage texlive-graphics texlive-kvoptions))
+    (home-page "https://ctan.org/pkg/draftwatermark")
     (synopsis "Put a grey textual watermark on document pages")
     (description
-     "This package provides a means to add a textual, light grey watermark on
-every page or on the first page of a document.  Typical usage may consist in
-writing words such as DRAFT or CONFIDENTIAL across document pages.  The
+     "This package provides a means to add a textual, light grey watermark
+on every page or on the first page of a document.  Typical usage may consist
+in writing words such as DRAFT or CONFIDENTIAL across document pages.  The
 package performs a similar function to that of @code{draftcopy}, but its
 implementation is output device independent, and made very simple by relying
-on everypage.")
+on @code{everypage}.")
     (license license:lppl1.3+)))
 
 (define-public texlive-latex-environ
@@ -11456,12 +11458,12 @@ and selecting references used in a publication.")
     (propagated-inputs (list texlive-apacite
                              texlive-babel
                              texlive-booktabs
+                             texlive-draftwatermark
                              texlive-endnotes
                              texlive-etoolbox
                              texlive-fancyhdr
                              texlive-xstring
                              texlive-graphics
-                             texlive-latex-draftwatermark
                              texlive-latex-float
                              texlive-lm
                              texlive-substr
-- 
cgit 1.4.1


From ab95125765245c1e3bf2ede3a71da1eb3602e1e5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 9 May 2023 23:06:28 +0200
Subject: gnu: texlive-latex-trimspaces -> texlive-trimspaces.

* gnu/packages/tex.scm (texlive-trimspaces): New variable.
(texlive-latex-trimspaces):
(texlive-pstool):
* gnu/packages/python-xyz.scm (python-nbconvert):
---
 gnu/packages/python-xyz.scm |  2 +-
 gnu/packages/tex.scm        | 56 +++++++++++++++++++++++----------------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 973216c5ed..575e2b8d81 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15191,7 +15191,7 @@ time.")
            texlive-latex-jknapltx
            texlive-ms
            texlive-latex-parskip
-           texlive-latex-trimspaces
+           texlive-trimspaces
            texlive-latex-upquote
            texlive-stringenc
            texlive-tcolorbox
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a83e7ac5b9..e18c618f47 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5234,8 +5234,8 @@ rotated.")
            texlive-l3kernel ; for expl3
            texlive-oberdiek
            texlive-latex-psfrag
-           texlive-tools ; for shellesc
-           texlive-latex-trimspaces
+           texlive-tools                ; for shellesc
+           texlive-trimspaces
            texlive-latex-xkeyval))
     (home-page "https://www.ctan.org/pkg/pstool")
     (synopsis "Process PostScript graphics within pdfLaTeX documents")
@@ -5354,40 +5354,42 @@ and the ability to create new ‘List of ...’. The ToC @code{\\parskip} may
 be changed.")
     (license license:lppl1.3c+)))
 
-(define-public texlive-latex-trimspaces
+(define-public texlive-trimspaces
   (package
-    (name "texlive-latex-trimspaces")
+    (name "texlive-trimspaces")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "trimspaces"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0da00lb32am4g63mn96625wg48p3pj3spx79lajrk17d549apwqa"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/trimspaces/"
+                   "source/latex/trimspaces/"
+                   "tex/latex/trimspaces/")
+             (base32
+              "0if7pqaib533fbrj9r62mmr4h012hrpszdxs759rwhmyycikg6dk")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     '(#:tex-directory "latex/trimspaces"
-       #:tex-format "latex"
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-bug
-           (lambda _
-             ;; The "ins" file refers to the wrong source file.
-             (substitute* "trimspaces.ins"
-               (("pstool.tex") "trimspaces.tex"))
-             #t)))))
-    (inputs
+     (list
+      #:tex-format "latex"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-bug
+            (lambda _
+              ;; The "ins" file refers to the wrong source file.
+              (substitute* "source/latex/trimspaces/trimspaces.ins"
+                (("pstool\\.tex") "trimspaces.tex")))))))
+    (propagated-inputs
      (list texlive-filecontents))
-    (home-page "https://www.ctan.org/pkg/trimspaces")
+    (home-page "https://ctan.org/pkg/trimspaces")
     (synopsis "Trim spaces around an argument or within a macro")
     (description
-     "This very short package allows you to expandably remove spaces around a
-token list (commands are provided to remove spaces before, spaces after, or
-both); or to remove surrounding spaces within a macro definition, or to define
-space-stripped macros.")
+     "This package provides a very short package that allows you to expandably
+remove spaces around a token list (commands are provided to remove spaces
+before, spaces after, or both); or to remove surrounding spaces within a macro
+definition, or to define space-stripped macros.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-trimspaces texlive-trimspaces)
+
 (define-public texlive-calrsfs
   (package
     (inherit
-- 
cgit 1.4.1


From 3476b7438696d81a6d83b4b07362d34eb1b6e981 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 4 May 2023 22:34:46 +0200
Subject: gnu: texlive-latex-environ -> texlive-environ.

* gnu/packages/tex.scm (texlive-environ): New variable.
(texlive-latex-environ): Deprecate variable.
(texlive-tcolorbox): Apply renaming.
---
 gnu/packages/tex.scm | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e18c618f47..acbc8b7e77 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4878,21 +4878,22 @@ implementation is output device independent, and made very simple by relying
 on @code{everypage}.")
     (license license:lppl1.3+)))
 
-(define-public texlive-latex-environ
+(define-public texlive-environ
   (package
-    (name "texlive-latex-environ")
+    (name "texlive-environ")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "environ"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "06h28b26dyjkj9shksphgqfv4130jfkwhbw737hxn7d3yvdfffyd"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/environ/"
+                   "source/latex/environ/"
+                   "tex/latex/environ/")
+             (base32
+              "08a3vhyzc647b9zp3yifdklj0vch9cv2vajh7ig3y01jcdqhjy41")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/environ"))
-    (home-page "https://www.ctan.org/pkg/environ")
-    (synopsis "New interface for environments in LaTeX")
+    (propagated-inputs (list texlive-trimspaces))
+    (home-page "https://ctan.org/pkg/environ")
+    (synopsis "A new interface for environments in LaTeX")
     (description
      "This package provides the @code{\\collect@@body} command (as in
 @code{amsmath}), as well as a @code{\\long} version @code{\\Collect@@Body},
@@ -4900,6 +4901,8 @@ for collecting the body text of an environment.  These commands are used to
 define a new author interface to creating new environments.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-environ texlive-environ)
+
 (define-public texlive-latex-eqparbox
   (package
     (name "texlive-latex-eqparbox")
@@ -11001,7 +11004,7 @@ levels.  All functionality is provided by the single @code{\\qrcode} command.")
     (package
       (inherit template)
       (propagated-inputs
-       (list texlive-etoolbox texlive-latex-environ texlive-pgf texlive-tools))
+       (list texlive-etoolbox texlive-environ texlive-pgf texlive-tools))
       (home-page "https://www.ctan.org/pkg/tcolorbox")
       (synopsis "Colored boxes, for LaTeX examples and theorems, etc")
       (description "This package provides an environment for colored and
-- 
cgit 1.4.1


From 1a8e352119f1d5a87b43261cfb99841f1c238aba Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 4 May 2023 22:41:37 +0200
Subject: gnu: texlive-latex-eqparbox -> texlive-eqparbox.

* gnu/packages/tex.scm (texlive-eqparbox): New variable.
(texlive-latex-eqparbox): Deprecate variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index acbc8b7e77..b07fe853d5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4903,20 +4903,22 @@ define a new author interface to creating new environments.")
 
 (define-deprecated-package texlive-latex-environ texlive-environ)
 
-(define-public texlive-latex-eqparbox
+(define-public texlive-eqparbox
   (package
-    (name "texlive-latex-eqparbox")
+    (name "texlive-eqparbox")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "eqparbox"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1ib5xdwcj5wk23wgk41m2hdcjr1dzrs4l3wwnpink9mlapz12wjs"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/eqparbox/"
+                   "source/latex/eqparbox/"
+                   "tex/latex/eqparbox/")
+             (base32
+              "16c5dyd4bz45a2c1ppbq05h9ixg15srk5az5pld5gpv4j0zwzrqw")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/eqparbox"))
-    (home-page "https://www.ctan.org/pkg/eqparbox")
+    (propagated-inputs
+     (list texlive-environ texlive-tools))
+    (home-page "https://ctan.org/pkg/eqparbox")
     (synopsis "Create equal-widthed parboxes")
     (description
      "LaTeX users sometimes need to ensure that two or more blocks of text
@@ -4929,7 +4931,9 @@ where they are in the document---will stretch to fit the widest
 for a variety of alignment purposes, as is evidenced by the examples in
 @code{eqparbox}'s documentation.  Various derivatives of @code{\\eqparbox} are
 also provided.")
-    (license license:lppl1.3+)))
+    (license license:lppl1.3c)))
+
+(define-deprecated-package texlive-latex-eqparbox texlive-eqparbox)
 
 (define-public texlive-latex-etoc
   (package
-- 
cgit 1.4.1


From 376059576e02fbc312816410dcefddfffae7944d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 4 May 2023 22:47:22 +0200
Subject: gnu: texlive-latex-etoc -> texlive-etoc.

* gnu/packages/tex.scm (texlive-etoc): New variable.
(texlive-latex-etoc): Deprecate variable.
* gnu/packages/maths.scm (hypre): Apply renaming.
---
 gnu/packages/maths.scm |  2 +-
 gnu/packages/tex.scm   | 54 ++++++++++++++++++++++++++++----------------------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index cd9b0fc325..e829c30eb8 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5786,6 +5786,7 @@ set.")
                                      texlive-cm
                                      texlive-courier
                                      texlive-enumitem
+                                     texlive-etoc
                                      texlive-etoolbox
                                      texlive-fancyhdr
                                      texlive-fancyvrb
@@ -5799,7 +5800,6 @@ set.")
                                      texlive-generic-listofitems
                                      texlive-latex-cmap
                                      texlive-latex-colortbl
-                                     texlive-latex-etoc
                                      texlive-latex-float
                                      texlive-latex-fncychap
                                      texlive-latex-framed
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b07fe853d5..ea1b13f2b0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4935,36 +4935,42 @@ also provided.")
 
 (define-deprecated-package texlive-latex-eqparbox texlive-eqparbox)
 
-(define-public texlive-latex-etoc
+(define-public texlive-etoc
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-etoc"
-              '("/doc/latex/etoc/README.md"
-                "/doc/latex/etoc/etoc.pdf"
-                "/tex/latex/etoc/")
-              (base32
-               "0198cn75m1y8ggbfv1qlnif0d9275f6mxqsansyqw4np0rv6q9sv")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/etoc")
-    (synopsis "Completely customisable TOCs")
+    (name "texlive-etoc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/etoc/"
+                   "source/latex/etoc/"
+                   "tex/latex/etoc/")
+             (base32
+              "04vjfn4jadxbc38r08r9pwvpj7szvk88hiav35iqhl3p78xri7z4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/etoc")
+    (synopsis "Customisable table of contents")
     (description
-     "This package gives the user complete control of how the entries of
-the table of contents should be constituted from the name, number, and page
-number of each sectioning unit.  The layout is controlled by the definition
-of ‘line styles’ for each sectioning level used in the document.
+     "This package gives the user complete control of how the entries of the
+table of contents should be constituted from the name, number, and page number
+of each sectioning unit.  The layout is controlled by the definition of line
+styles for each sectioning level used in the document.
 
 The package provides its own custom line styles (which may be used as
-examples), and continues to support the standard formatting inherited from
-the LaTeX document classes, but the package can also allow the user to
-delegate the details to packages dealing with list making environments (such
-as enumitem).  The package’s default global style typesets tables of contents
-in a multi-column format, with either a standard heading, or a ruled title
+examples), and continues to support the standard formatting inherited from the
+LaTeX document classes, but the package can also allow the user to delegate
+the details to packages dealing with list making environments (such as
+@code{enumitem}).  The package's default global style typesets tables of
+contents in a multi-column format, with either a standard heading, or a ruled
+title
 (optionally with a frame around the table).
 
-The @code{\\tableofcontents} command may be used arbitrarily many times in
-the same document, while @code{\\localtableofcontents} provides a ‘local’
-table of contents.")
-    (license license:lppl1.3c+)))
+The @code{\\tableofcontents} command may be used arbitrarily many times in the
+same document, while @code{\\localtableofcontents} provides a local table of
+contents.")
+    (license license:lppl1.3c)))
+
+(define-deprecated-package texlive-latex-etoc texlive-etoc)
 
 (define-public texlive-latex-expdlist
   (package
-- 
cgit 1.4.1


From 92c0962c5a69185decc30ba91b520b208ef45d21 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 4 May 2023 22:54:13 +0200
Subject: gnu: texlive-latex-expdlist -> texlive-expdlist.

* gnu/packages/tex.scm (texlive-expdlist): New variable.
(texlive-latex-expdlist): Deprecate variable.
* gnu/packages/python-xyz.scm (python-numpy-documentation):
(python-matplotlib-documentation): Apply renaming.
---
 gnu/packages/python-xyz.scm |  4 ++--
 gnu/packages/tex.scm        | 42 ++++++++++++++++++------------------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 575e2b8d81..0d2da17edc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7250,8 +7250,8 @@ capabilities.")
            texlive-bin
            texlive-cbfonts
            texlive-cm-super
+           texlive-expdlist
            texlive-greek-fontenc
-           texlive-latex-expdlist
            texlive-polyglossia
            texlive-xindy))
     (inputs '())
@@ -8044,10 +8044,10 @@ toolkits.")
            texlive-amsfonts
            texlive-amsmath
            texlive-babel
+           texlive-expdlist
            texlive-fontspec
            texlive-unicode-math
            texlive-etoolbox
-           texlive-latex-expdlist
            texlive-underscore
            texlive-latex-type1cm
            texlive-times
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ea1b13f2b0..3d98f658d3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4972,37 +4972,31 @@ contents.")
 
 (define-deprecated-package texlive-latex-etoc texlive-etoc)
 
-(define-public texlive-latex-expdlist
+(define-public texlive-expdlist
   (package
-    (name "texlive-latex-expdlist")
+    (name "texlive-expdlist")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "expdlist"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1x7byk6x10njir3y9rm56glhdzrxwqag7gsnw2sqn1czlq525w7r"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/expdlist/"
+                   "source/latex/expdlist/"
+                   "tex/latex/expdlist/")
+             (base32
+              "1kylmj615hmbmjbynn5bfzhfz0wk1drxmg0kjqljnglffkb6irv6")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     '(#:tex-directory "latex/expdlist"
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-generated-file
-           (lambda _
-             (for-each delete-file
-                       (find-files "." "\\.drv$"))
-             #t)))))
-    (home-page "https://www.ctan.org/pkg/expdlist")
+    (home-page "https://ctan.org/pkg/expdlist")
     (synopsis "Expanded description environments")
     (description
-     "The package provides additional features for the LaTeX
-@code{description} environment, including adjustable left margin.  The package
-also allows the user to \"break\" a list (for example, to interpose a comment)
-without affecting the structure of the list (this works for @code{itemize} and
-@code{enumerate} lists, and numbered lists remain in sequence).")
+     "The package provides additional features for the LaTeX @code{description} environment,
+including adjustable left margin.  The package also allows the user to break
+a list (for example, to interpose a comment) without affecting the structure
+of the list (this works for itemize and eumerate lists and numbered lists
+remain in sequence).")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-expdlist texlive-expdlist)
+
 (define-public texlive-filemod
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From f380aa35608c0920998a0c7e8af4bdd9dbf98db3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 5 May 2023 18:43:49 +0200
Subject: gnu: Add texlive-minitoc.

* gnu/packages/tex.scm (texlive-minitoc): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3d98f658d3..9817e32567 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10264,6 +10264,30 @@ various fonts are provided.  An alternative package
 the bundle.")
       (license license:lppl1.3c))))
 
+(define-public texlive-minitoc
+  (package
+    (name "texlive-minitoc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/minitoc/"
+                   "tex/latex/minitoc/")
+             (base32
+              "0yd1na5b9m7z1j87a5fjwjqddfpiblfbpzcv0vlvql6lwh38mii7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/minitoc")
+    (synopsis "Produce a table of contents for each chapter, part or section")
+    (description
+     "The @code{minitoc} package allows you to add
+mini-tables-of-contents (minitocs) at the beginning of every chapter, part or
+section.  There is also provision for mini-lists of figures and of tables.  At
+the part level, they are parttocs, partlofs and partlots.  If the type of
+document does not use chapters, the basic provision is section level secttocs,
+sectlofs and sectlots.  The package has provision for language-specific
+configuration of its own fixed names, using @file{.mld} files.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-minted
   (let ((template (simple-texlive-package
                    "texlive-minted"
-- 
cgit 1.4.1


From ebc30bccb820ce7efbfdab648aff406561905538 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 5 May 2023 18:44:28 +0200
Subject: gnu: Add texlive-lwarp.

* gnu/packages/tex.scm (texlive-lwarp): New variable.
---
 gnu/packages/tex.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9817e32567..d0b4c70423 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1337,6 +1337,38 @@ family of fonts, in OpenType format.  For use with LuaLaTeX or XeLaTeX,
 support is available from the @code{unicode-math} package.")
     (license license:gfl1.0)))
 
+(define-public texlive-lwarp
+  (package
+    (name "texlive-lwarp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lwarp/"
+                   "scripts/lwarp/"
+                   "source/latex/lwarp/"
+                   "tex/latex/lwarp/")
+             (base32
+              "0pv3gvy01zkhk39ybjix5lh3x6q4r9pvabrx1wvqr96ma8gyzr5n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-minitoc))
+    (home-page "https://ctan.org/pkg/lwarp")
+    (synopsis "Converts LaTeX to HTML")
+    (description
+     "This package converts LaTeX to HTML by using LaTeX to process the user's
+document and generate HTML tags.  External utility programs are only used for
+the final conversion of text and images.  Math may be represented by SVG files
+or MathJax.  Hundreds of LaTeX packages are supported, and their load order is
+automatically verified.  Documents may be produced by LaTeX, LuaLaTeX,
+XeLaTeX, and by several CJK engines, classes, and packages.  A texlua script
+automates compilation, index, glossary, and batch image processing, and also
+supports latexmk.  Configuration is semi-automatic at the first manual
+compile.  Support files are self-generated.  Print and HTML versions of each
+document may coexist.  Assistance is provided for HTML import into EPUB
+conversion software and word processors.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-knuth-lib
   (let ((template (simple-texlive-package
                    "texlive-knuth-lib"
-- 
cgit 1.4.1


From 3e62196230dab1699d239e2337af93edf763f55c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 6 May 2023 07:45:13 +0200
Subject: gnu: Add texlive-xfor.

* gnu/packages/tex.scm (texlive-xfor): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d0b4c70423..2efbb98ef9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12510,6 +12510,29 @@ computers).  XeTeX's immediate output is an extended variant of DVI format,
 which is ordinarily processed by a tightly bound processor (called
 @code{xdvipdfmx}), that produces PDF.")
     (license license:x11)))
+
+(define-public texlive-xfor
+  (package
+    (name "texlive-xfor")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xfor/"
+                   "source/latex/xfor/"
+                   "tex/latex/xfor/")
+             (base32
+              "1j241j8sixqkaj2xmcvmrfwm1sdw6xdssnzml1bjs54rqzyh768a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xfor")
+    (synopsis "Reimplementation of the LaTeX @code{for-loop} macro")
+    (description
+     "The package redefines the LaTeX internal @code{\\@@for} macro so that
+the loop may be prematurely terminated.  The action is akin to the C/Java
+break statement, except that the loop does not terminate until the end of the
+current iteration.")
+    (license license:lppl)))
+
 ;;;
 ;;; 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
-- 
cgit 1.4.1


From f0555899b0d4653fd09343c05d3504ad3fb37f7e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 6 May 2023 07:51:59 +0200
Subject: gnu: Add texlive-mfirstuc.

* gnu/packages/tex.scm (texlive-mfirstuc): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2efbb98ef9..64b294a842 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -929,6 +929,34 @@ build fonts using the Metafont system.")
 
 (define-deprecated-package texlive-metafont-base texlive-metafont)
 
+(define-public texlive-mfirstuc
+  (package
+    (name "texlive-mfirstuc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mfirstuc/"
+                   "scripts/mfirstuc/"
+                   "source/latex/mfirstuc/"
+                   "tex/latex/mfirstuc/")
+             (base32
+              "033ymwwc6q0v6saq0x2jc20vc94d38hna0vb8cymj3d8irqy97x2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etoolbox))
+    (home-page "https://ctan.org/pkg/mfirstuc")
+    (synopsis "Uppercase the first letter of a word")
+    (description
+     "The package provides commands @code{\\makefirstuc} that uppercases the
+first letter in its argument (with a check for a semantic markup command at
+the start of the argument), and @code{\\xmakefirstuc} which expands the
+argument before uppercasing.  It also provides
+@code{\\capitalisewords@{phrase@}} which applies @code{\\makefirstuc} to each
+word in the phrase, where the words are separated by regular
+spaces.  (Exceptions can be made for words that shouldn't be converted.)")
+    (license license:lppl1.3+)))
+
 (define-public texlive-fontinst
   (let ((template (simple-texlive-package
                    "texlive-fontinst"
-- 
cgit 1.4.1


From b8fe63bb51d1da2232b37b33b26733b8ead3e968 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 6 May 2023 12:31:32 +0200
Subject: gnu: Add texlive-filehook.

* gnu/packages/tex.scm (texlive-filehook): New variable.
---
 gnu/packages/tex.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 64b294a842..a11c13ab26 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3306,6 +3306,35 @@ overwrite existing files and letting you use @code{filecontents}
 
 (define-deprecated-package texlive-latex-filecontents texlive-filecontents)
 
+(define-public texlive-filehook
+  (package
+    (name "texlive-filehook")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/filehook/"
+                   "source/latex/filehook/"
+                   "tex/latex/filehook/")
+             (base32
+              "03dsnv8fn111kn8h2fa281w2jvcdrqag1im6mkkfahvjgl1apk6k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs
+     (list texlive-ydoc))
+    (propagated-inputs
+     (list texlive-kvoptions
+           texlive-pgf))
+    (home-page "https://ctan.org/pkg/filehook")
+    (synopsis "Hooks for input files")
+    (description
+     "The package provides several file hooks (@code{AtBegin}, @code{AtEnd},
+...) for files read by @code{\\input}, @code{\\include} and
+@code{\\InputIfFileExists}.  General hooks for all such files (e.g., all
+@code{\\included} ones) and file specific hooks only used for named files are
+provided; two hooks are provided for the end of @code{\\included} files ---
+one before, and one after the final @code{\\clearpage}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-epsf
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From d851f8d7b9cc4bad89bff9dfbf6024f7112a273d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 6 May 2023 12:31:46 +0200
Subject: gnu: Add texlive-currfile.

* gnu/packages/tex.scm (texlive-currfile): New variable.
---
 gnu/packages/tex.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a11c13ab26..0ad2581996 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5486,6 +5486,37 @@ definition, or to define space-stripped macros.")
 
 (define-deprecated-package texlive-latex-trimspaces texlive-trimspaces)
 
+(define-public texlive-currfile
+  (package
+    (name "texlive-currfile")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/currfile/" "source/latex/currfile/"
+                   "tex/latex/currfile/")
+             (base32
+              "1l9win5msf80yzgzfx580d1hw8lza1advhqkhpz83i080020asji")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs
+     (list texlive-ydoc))
+    (propagated-inputs
+     (list texlive-filehook
+           texlive-kvoptions))
+    (home-page "https://ctan.org/pkg/currfile")
+    (synopsis "Provide file name and path of input files")
+    (description
+     "The package provides macros holding file name information (directory,
+base name, extension, full name and full path) for files read by LaTeX
+@code{\\input} and @code{\\include} macros; it uses the file hooks provided by
+the author's @code{filehook}.  In particular, it restores the parent file name
+after the trailing @code{\\clearpage} of an @code{\\included} file; as
+a result, the macros may be usefully employed in the page header and footer of
+the last printed page of such a file.  The depth of inclusion is made
+available, together with the parent (including file) and parents (all
+including files to the root of the tree).  The package supersedes FiNK.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-calrsfs
   (package
     (inherit
-- 
cgit 1.4.1


From 56785dbde3048edcd3ad49b48ae5704612ed4f03 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 6 May 2023 08:28:40 +0200
Subject: gnu: Add texlive-lualatex-math.

* gnu/packages/tex.scm (texlive-lualatex-math): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0ad2581996..507ef8cc94 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4101,6 +4101,32 @@ releases.  The bundle consists of a Lua script to run the tasks and a
 @code{.tex} file which provides the testing environment.")
       (license license:lppl1.3c+))))
 
+(define-public texlive-lualatex-math
+  (package
+    (name "texlive-lualatex-math")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/lualatex-math/"
+                   "source/lualatex/lualatex-math/"
+                   "tex/lualatex/lualatex-math/")
+             (base32
+              "1xfr31rwr7zc6d5bsc3v5lwvcfrg109rzfgvvs69w4xs61j06jcg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etoolbox texlive-filehook))
+    (home-page "https://ctan.org/pkg/lualatex-math")
+    (synopsis "Fixes for mathematics-related LuaLaTeX issues")
+    (description
+     "The package patches a few commands of the LaTeX2e kernel and the
+@code{amsmath} and @code{mathtools} packages to be more compatible with the
+LuaTeX engine.  It is only meaningful for LuaLaTeX documents containing
+mathematical formulas, and does not exhibit any new functionality.  The fixes
+are mostly moved from the @code{unicode-math} package to this package since
+they are not directly related to Unicode mathematics typesetting.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-lualibs
   (package
     (inherit
-- 
cgit 1.4.1


From 0f2c676ee9257af16fe6128c2930bc7811db14e4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 6 May 2023 09:34:21 +0200
Subject: gnu: Add texlive-enctex.

* gnu/packages/tex.scm (texlive-enctex): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 507ef8cc94..26fe6d1c64 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4993,6 +4993,26 @@ implementation is output device independent, and made very simple by relying
 on @code{everypage}.")
     (license license:lppl1.3+)))
 
+(define-public texlive-enctex
+  (package
+    (name "texlive-enctex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/enctex/"
+                   "tex/generic/enctex/")
+             (base32
+              "1j8ji1ka8vhskm5kn0iwmkhjfp88ly6rva30pr1c9llsmsac5sf2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/enctex")
+    (synopsis "TeX extension that translates input on its way into TeX")
+    (description
+     "EncTeX is (another) TeX extension, written at the change-file level.  It
+provides means of translating input on the way into TeX.  It allows, for
+example, translation of multibyte sequences, such as utf-8 encoding.")
+    (license license:gpl3+)))
+
 (define-public texlive-environ
   (package
     (name "texlive-environ")
-- 
cgit 1.4.1


From 14cd6c2fb4b826869f5f3fa48bbfc581114a6478 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 6 May 2023 12:01:42 +0200
Subject: gnu: Add texlive-dehyph.

* gnu/packages/tex.scm (texlive-dehyph): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 26fe6d1c64..9c92c99af8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2769,6 +2769,29 @@ converters, will completely supplant the older patterns.")
 
 (define-deprecated-package texlive-generic-hyph-utf8 texlive-hyph-utf8)
 
+(define-public texlive-dehyph
+  (package
+    (name "texlive-dehyph")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/generic/dehyph/")
+             (base32
+              "0fkqlsknrlxk8zazcqy4q3nisxr3a4x21aiwqhz8s237rdf3w39g")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dehyph")
+    (synopsis "German hyphenation patterns for traditional orthography")
+    (description
+     "The package provides older hyphenation patterns for the German language.
+Please note that by default only pdfLaTeX uses these patterns (mainly for
+backwards compatibility).  The older packages ghyphen and gnhyph are now
+bundled together with dehyph, and are no longer be updated.  Both XeLaTeX and
+LuaLaTeX use the current German hyphenation patterns taken from Hyphenation
+patterns in UTF-8, and using the Experimental hyphenation patterns for the
+German language package it is possible to make pdfLaTeX use the new German
+patterns as well.")
+    (license license:lppl1.0+)))
+
 (define-public texlive-dehyph-exptl
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 69b1df59e3379935538cf0737b038fa31088c71c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 6 May 2023 12:02:22 +0200
Subject: gnu: Add texlive-passivetex.

* gnu/packages/tex.scm (texlive-passivetex): New variable.
---
 gnu/packages/tex.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9c92c99af8..32a2f624b1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4534,6 +4534,35 @@ T2* and X2 encodings. These encodings cover (between them) pretty much every
 language that is written in a Cyrillic alphabet.")
     (license license:lppl1.3c+)))
 
+(define-public texlive-passivetex
+  (package
+    (name "texlive-passivetex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/xmltex/passivetex/")
+             (base32
+              "1h49v6sqbm27isfwwcql9dzxn4vmcn2algkqh7f1pzj860xw3ygn")))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-amsfonts
+           texlive-graphics
+           texlive-hyperref
+           texlive-marvosym
+           texlive-psnfss
+           texlive-tipa
+           texlive-times
+           texlive-tools
+           texlive-ulem
+           texlive-url))
+    (home-page "https://ctan.org/pkg/passivetex")
+    (synopsis "Support package for XML/SGML typesetting")
+    (description
+     "This is a set of packages providing XML parsing, UTF-8 parsing,
+Unicode entities, and common formatting object definitions for JadeTeX.")
+    ;; License given in "tex/xmltex/passivetex/mlnames.sty".
+    (license license:lppl1.0+)))
+
 (define-public texlive-pict2e
   (let ((template (simple-texlive-package
                    "texlive-pict2e"
-- 
cgit 1.4.1


From a4d0c9d134f3baff1eb66f0e2b860af74a72864d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 6 May 2023 12:17:26 +0200
Subject: gnu: Add texlive-luabidi.

* gnu/packages/tex.scm (texlive-luabidi): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 32a2f624b1..7b4fe634a1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4124,6 +4124,28 @@ releases.  The bundle consists of a Lua script to run the tasks and a
 @code{.tex} file which provides the testing environment.")
       (license license:lppl1.3c+))))
 
+(define-public texlive-luabidi
+  (package
+    (name "texlive-luabidi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luabidi/"
+                   "tex/lualatex/luabidi/")
+             (base32
+              "1dwdiwsdfhgwpx8r2271i5kqphcpkh69y3rx1wxfr9hl17lzw2cp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-bigfoot              ;for "perpage.sty"
+           texlive-etoolbox))
+    (home-page "https://ctan.org/pkg/luabidi")
+    (synopsis "Bidi functions for LuaTeX")
+    (description
+     "The package attempts to emulate the XeTeX @code{bidi} package, in the
+context of LuaTeX.")
+    (license (list license:lppl1.3c license:expat))))
+
 (define-public texlive-lualatex-math
   (package
     (name "texlive-lualatex-math")
-- 
cgit 1.4.1


From f36563c7b39154558b5fd61deded0be37e1d2f8e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 9 May 2023 22:43:03 +0200
Subject: gnu: Add texlive-refstyle.

* gnu/packages/tex.scm (texlive-refstyle): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7b4fe634a1..2ec4bbe5d8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12167,6 +12167,34 @@ allow hyphenation (the corresponding commands in LaTeX, all of whose names are
 lower-case, prevent hyphenation altogether).")
     (license license:lppl1.3c)))
 
+(define-public texlive-refstyle
+  (package
+    (name "texlive-refstyle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/refstyle/" "source/latex/refstyle/"
+                   "tex/latex/refstyle/")
+             (base32
+              "0ckfm04kfi67babpn3m99nqj4b9r1fs0ivq5m7yz90mz4lqykhbs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics))
+    (home-page "https://ctan.org/pkg/refstyle")
+    (synopsis "Advanced formatting of cross references")
+    (description
+     "The package provides a consistent way of producing references throughout
+a project.  Enough flexibility is provided to make local changes to a single
+reference.  The user can configure their own setup.  The package offers
+a direct interface to varioref (for use, for example, in large projects such
+as a series of books, or a multivolume thesis written as a series of
+documents), and name references from the nameref package may be incorporated
+with ease.  For large projects such as a series of books or a multi volume
+thesis, written as freestanding documents, a facility is provided to interface
+to the @code{xr} package for external document references.")
+    (license license:lppl)))
+
 (define-public texlive-relsize
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 01330385f80345c4cfb6e063f20e579a84bd64a4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 9 May 2023 22:45:04 +0200
Subject: gnu: Add texlive-euenc.

* gnu/packages/tex.scm (texlive-euenc): New variable.
---
 gnu/packages/tex.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2ec4bbe5d8..0e3d60e62d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11339,6 +11339,35 @@ styles of inference rules, placement of labels, etc.")
 sequent calculus and related systems.")
       (license license:lppl1.3+))))
 
+(define-public texlive-euenc
+  (package
+    (name "texlive-euenc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/euenc/" "source/latex/euenc/"
+                   "tex/latex/euenc/")
+             (base32
+              "0vhqxhj1v68rhi08xivps8icxmlcq9mv8slqmsmf2qhvzj6x6qx3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     ;; Sole ".dtx" file bundled only generates documentation.
+     (list #:build-targets #~(list)))
+    (home-page "https://ctan.org/pkg/euenc")
+    (synopsis "Unicode font encoding definitions for XeTeX")
+    (description
+     "The package provides font encoding definitions for unicode fonts loaded
+by LaTeX in XeTeX or LuaTeX.  The package provides two encodings: EU1,
+designed for use with XeTeX, which the fontspec uses for unicode fonts which
+require no macro-level processing for accents, and EU2, which provides the
+same facilities for use with LuaTeX.  Neither encoding places any restriction
+on the glyphs provided by a font; use of EU2 causes the package
+@code{euxunicode} to be loaded (the package is part of this distribution).
+The package includes font definition files for use with the Latin Modern
+OpenType fonts.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-eurosym
   (let ((template (simple-texlive-package
                    "texlive-eurosym"
-- 
cgit 1.4.1


From 9bfa1ca1c24ff3386f040b517b414475a101bbdf Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 12 May 2023 18:19:15 +0200
Subject: gnu: Add texlive-breakurl.

* gnu/packages/tex.scm (texlive-breakurl): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0e3d60e62d..502b807674 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12359,6 +12359,30 @@ also contains the @code{flexisym} and @code{mathstyle} packages, which are
 both designated as support for @code{breqn}.")
       (license license:lppl1.3+))))
 
+(define-public texlive-breakurl
+  (package
+    (name "texlive-breakurl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/breakurl/" "source/latex/breakurl/"
+                   "tex/latex/breakurl/")
+             (base32
+              "1lihfrihf1i300sddz09rsn6gj30g299warn88gli9hbrfy6nvw5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-iftex texlive-latex-xkeyval))
+    (home-page "https://ctan.org/pkg/breakurl")
+    (synopsis "Line-breakable links in @code{hyperref} for dvips/ps2pdf")
+    (description
+     "This package provides a command much like @code{hyperref}'s @code{\\url}
+that typesets a URL using a typewriter-like font.  However, if the dvips
+driver is being used, the original @code{\\url} doesn't allow line breaks in
+the middle of the created link: the link comes in one atomic piece.  This
+package allows such line breaks in the generated links.")
+    (license license:lppl)))
+
 (define-public texlive-comment
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 4ab1b5ccd4dd20d3768f200812234599e0a0843c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 12 May 2023 18:22:50 +0200
Subject: gnu: Add texlive-chngcntr.

* gnu/packages/tex.scm (texlive-chngcntr): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 502b807674..7ea7af985d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9813,6 +9813,25 @@ Support for use with LaTeX is available in @code{freenfss}, part of
 
 (define-deprecated-package texlive-fonts-charter texlive-charter)
 
+(define-public texlive-chngcntr
+  (package
+    (name "texlive-chngcntr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/chngcntr/" "tex/latex/chngcntr/")
+             (base32
+              "0ag1hb1vkl0xdzslp6f0j59dijwr9k9kq7vaada148241q0hflbj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chngcntr")
+    (synopsis "Change the resetting of counters")
+    (description
+     "This package defines commands @code{\\counterwithin} (which sets up
+a counter to be reset when another is incremented) and
+@code{\\counterwithout} (which unsets such a relationship).")
+    (license license:lppl)))
+
 (define-public texlive-context
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 5d60e272c94825704bcc60ba3c65e7ff30a328c4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 12 May 2023 18:25:26 +0200
Subject: gnu: Add texlive-multido.

* gnu/packages/tex.scm (texlive-multido): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7ea7af985d..5b9cdde813 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7246,6 +7246,28 @@ in the form @code{key=value} are available, for example:
 
 (define-deprecated-package texlive-latex-enumitem texlive-enumitem)
 
+(define-public texlive-multido
+  (package
+    (name "texlive-multido")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/multido/"
+                   "source/generic/multido/"
+                   "tex/generic/multido/" "tex/latex/multido/")
+             (base32
+              "1vwf2naw5bgs93s2gcmf226f60ws9z6cmw6gi1562fs8vg4mnjsh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/multido")
+    (synopsis "Loop facility for Generic TeX")
+    (description
+     "The package provides the @code{\\multido} command, which was originally
+designed for use with PSTricks.  Fixed-point arithmetic is used when working
+on the loop variable, so that the package is equally applicable in graphics
+applications like PSTricks as it is with the more common integer loops.")
+    (license license:lppl)))
+
 (define-public texlive-latex-multirow
   (package
     (name "texlive-latex-multirow")
-- 
cgit 1.4.1


From e2178738c628f96f07b699dbd4329fe86c426ed4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 12 May 2023 18:34:02 +0200
Subject: gnu: Add texlive-attachfile.

* gnu/packages/tex.scm (texlive-attachfile): New variable.
---
 gnu/packages/tex.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5b9cdde813..585e55b369 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3220,6 +3220,36 @@ with the required packages, constitutes what every LaTeX distribution should
 contain.")
       (license license:lppl1.3c+))))
 
+(define-public texlive-attachfile
+  (package
+    (name "texlive-attachfile")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/attachfile/"
+                   "doc/latex/attachfile/"
+                   "source/latex/attachfile/"
+                   "tex/latex/attachfile/")
+             (base32
+              "0340c4rvxhhk95wlhf54n9akiwhj6pj0bslys6bkq29x9903zx5h")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics
+           texlive-hyperref
+           texlive-iftex))
+    (home-page "https://ctan.org/pkg/attachfile")
+    (synopsis "Attach arbitrary files to a PDF document")
+    (description
+     "Starting with PDF 1.3, PDF files can contain file attachments, i.e.,
+arbitrary files that a reader can extract, just like attachments to an e-mail
+message.  The @code{attachfile} package brings this functionality to pdfLaTeX
+and provides some additional features such as the ability to use arbitrary
+LaTeX code for the file icon.  Settings can be made either globally or on
+a per-attachment basis.  @code{attachfile} makes it easy to attach files and
+customize their appearance in the enclosing document.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-atveryend
   (let ((template (simple-texlive-package
                    "texlive-atveryend"
-- 
cgit 1.4.1


From 558fe17c53a009ca177b78f9160c0f9552193ae0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 12 May 2023 18:26:54 +0200
Subject: gnu: Add texlive-showexpl.

* gnu/packages/tex.scm (texlive-showexpl): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 585e55b369..b55953f47f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5566,6 +5566,32 @@ numbers.  While the package may obviously be used to typeset DNA sequences, the
 user may consider the @code{dnaseq} as a rather more powerful alternative.")
     (license license:lppl1.3+)))
 
+(define-public texlive-showexpl
+  (package
+    (name "texlive-showexpl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/showexpl/" "source/latex/showexpl/"
+                   "tex/latex/showexpl/")
+             (base32
+              "0vff1yk7a3f4csxibfk6r37s3h6n4wdpnk3qj4dsx7kh5zrcysha")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-attachfile
+           texlive-latex-float
+           texlive-graphics
+           texlive-listings
+           texlive-refcount
+           texlive-latex-varwidth))
+    (home-page "https://ctan.org/pkg/showexpl")
+    (synopsis "Typesetting LaTeX source code")
+    (description
+     "This package provides a way to typeset LaTeX source code and the related
+result in the same document.")
+    (license license:lppl1.2+)))
+
 (define-public texlive-latex-stackengine
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From b02b841390866bc262f80136d2eb590484b19184 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 12 May 2023 18:38:35 +0200
Subject: gnu: Add texlive-subfig.

* gnu/packages/tex.scm (texlive-subfig): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b55953f47f..be5072b9a4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7554,6 +7554,33 @@ the whole font.")
 
 (define-deprecated-package texlive-fonts-stmaryrd texlive-stmaryrd)
 
+(define-public texlive-subfig
+  (package
+    (name "texlive-subfig")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/subfig/" "source/latex/subfig/"
+                   "tex/latex/subfig/")
+             (base32
+              "0bq1328pb1ak91j7q8n1kh2fncr742lvff7apgf8kkxzxjfg2z9r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-caption
+           texlive-graphics))
+    (home-page "https://ctan.org/pkg/subfig")
+    (synopsis "Figures broken into subfigures")
+    (description
+     "The package provides support for the manipulation and reference of small
+or sub figures and tables within a single figure or table environment.  It is
+convenient to use this package when your subfigures are to be separately
+captioned, referenced, or are to be included in the List-of-Figures.  A new
+@code{\\subfigure} command is introduced which can be used inside a figure
+environment for each subfigure.  An optional first argument is used as the
+caption for that subfigure.")
+    (license license:lppl)))
+
 (define-public texlive-subfigure
   (let ((template (simple-texlive-package
                    "texlive-subfigure"
-- 
cgit 1.4.1


From a9634e2f231ea19c1f4ac49114d09eed8895fbce Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 12 May 2023 23:52:11 +0200
Subject: gnu: texlive-latex-backend -> texlive-backend.

* gnu/packages/tex.scm (texlive-l3backend): New variable.
(texlive-latex-l3backend): Deprecate package.
(texlive-latex-base):
(texlive-xetex):
* gnu/packages/maths.scm (cddlib): Apply renaming.
---
 gnu/packages/maths.scm |  4 ++--
 gnu/packages/tex.scm   | 42 +++++++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index e829c30eb8..f0c00cd1a5 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -30,7 +30,7 @@
 ;;; Copyright © 2018 Eric Brown <brown@fastmail.com>
 ;;; Copyright © 2018, 2021 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2018 Amin Bandali <bandali@gnu.org>
-;;; Copyright © 2019, 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2019, 2021-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
 ;;; Copyright © 2019 Robert Smith <robertsmith@posteo.net>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
@@ -846,7 +846,7 @@ integer programming problems and computes Markov bases for statistics.")
                          texlive-amsfonts
                          texlive-dvips-l3backend
                          texlive-graphics
-                         texlive-latex-l3backend
+                         texlive-l3backend
                          texlive-tiny))
     (arguments
      (list #:configure-flags
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index be5072b9a4..e0619b105b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3205,7 +3205,7 @@ formats.")
              texlive-ukrhyph
              texlive-ruhyphen
              texlive-l3kernel
-             texlive-latex-l3backend
+             texlive-l3backend
              ;; TODO: This dependency isn't needed for LaTeX version 2021-06-01
              ;; and later. See:
              ;; https://tug.org/pipermail/tex-live/2021-June/047180.html
@@ -3912,34 +3912,38 @@ LaTeX3 conventions can be used with regular LaTeX2e packages.")
 
 (define-deprecated-package texlive-latex-l3kernel texlive-l3kernel)
 
-(define-public texlive-latex-l3backend
+(define-public texlive-l3backend
   (package
-    (name "texlive-latex-l3backend")
+    (name "texlive-l3backend")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "l3backend"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0mlwyzssqn6wkyv9hzp24d40p8f20zrjqgvqyqs1rd7q7awan42a"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/l3backend/"
+                   "dvips/l3backend/"
+                   "source/latex/l3backend/"
+                   "tex/latex/l3backend/")
+             (base32
+              "18i6aczhj7pvqgdwfgkbmjz7a8xgd5w2jhibrv8khqlvxp62in94")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     '(#:tex-directory "latex/l3backend"
-       #:tex-engine "tex"
-       #:tex-format #f
-       #:texlive-latex-base #f))
+     (list
+      #:tex-engine "tex"
+      #:tex-format #f
+      #:texlive-latex-base #f))
     (native-inputs
      (list texlive-docstrip))
-    (home-page "https://www.ctan.org/pkg/l3backend")
+    (home-page "https://ctan.org/pkg/l3backend")
     (synopsis "LaTeX3 backend drivers")
     (description
      "This package forms parts of expl3, and contains the code used to
-interface with backends (drivers) across the expl3 codebase. The functions
-here are defined differently depending on the engine in use. As such, these
+interface with backends (drivers) across the expl3 codebase.  The functions
+here are defined differently depending on the engine in use.  As such, these
 are distributed separately from l3kernel to allow this code to be updated on
 an independent schedule.")
-    (license license:lppl1.3c+)))
+    (license license:lppl1.3c)))
+
+(define-deprecated-package texlive-latex-l3backend texlive-l3backend)
 
 (define-public texlive-latex-l3packages
   (package
@@ -12903,7 +12907,7 @@ itself may be shipped out to the DVI file.")
            texlive-hyphen-base
            texlive-latex-base
            texlive-fonts-latex
-           texlive-latex-l3backend
+           texlive-l3backend
            texlive-l3kernel
            texlive-latex-l3packages
            texlive-lm
-- 
cgit 1.4.1


From 3522e1970ab83479a70f7e52a8f832ea35844366 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 12 May 2023 23:55:44 +0200
Subject: gnu: texlive-dvips-l3backend -> texlive-l3backend.

* gnu/packages/tex.scm (texlive-dvips-l3backend): Deprecate package.
* gnu/packages/chez.scm (stex-bootstrap):
* gnu/packages/maths.scm (cddlib):
* gnu/packages/ocaml.scm (unison):
* gnu/packages/plotutils.scm (asymptote): Use new name.
---
 gnu/packages/chez.scm      |  2 +-
 gnu/packages/maths.scm     |  2 +-
 gnu/packages/ocaml.scm     |  2 +-
 gnu/packages/plotutils.scm | 12 ++++++------
 gnu/packages/tex.scm       | 18 +-----------------
 5 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index bb389c7a77..2c8d53def8 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -760,7 +760,7 @@ Chez Scheme.")))
        (propagated-inputs
         (list xorg-rgb
               (texlive-updmap.cfg
-               (list texlive-dvips-l3backend
+               (list texlive-l3backend
                      texlive-hyperref
                      texlive-bibtex
                      texlive-epsf
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index f0c00cd1a5..14583f7b45 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -844,7 +844,7 @@ integer programming problems and computes Markov bases for statistics.")
                          automake
                          libtool
                          texlive-amsfonts
-                         texlive-dvips-l3backend
+                         texlive-l3backend
                          texlive-graphics
                          texlive-l3backend
                          texlive-tiny))
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index ab0aa0574a..d3990bdd4d 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1378,7 +1378,7 @@ libpanel, librsvg and quartz.")
        ;; For documentation
        ("ghostscript" ,ghostscript)
        ("texlive" ,(texlive-updmap.cfg
-                    (list texlive-fonts-ec texlive-dvips-l3backend)))
+                    (list texlive-fonts-ec texlive-l3backend)))
        ("hevea" ,hevea)
        ("lynx" ,lynx)
        ("which" ,which)))
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 46e86158b6..57517c5bd2 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -308,18 +308,18 @@ colors, styles, options and details.")
            texinfo                      ;for generating documentation
            (texlive-updmap.cfg
             (list texlive-amsfonts
-                  texlive-dvips-l3backend
                   texlive-epsf
                   texlive-etoolbox
                   texlive-fonts-ec
-                  texlive-infwarerr
-                  texlive-kvdefinekeys
-                  texlive-grfext
-                  texlive-hyperref
-                  texlive-latex-base
                   texlive-latex-geometry
                   texlive-graphics
+                  texlive-grfext
+                  texlive-hyperref
+                  texlive-infwarerr
+                  texlive-kvdefinekeys
                   texlive-kvoptions
+                  texlive-l3backend
+                  texlive-latex-base
                   texlive-latex-media9
                   texlive-oberdiek      ;for ifluatex
                   texlive-latex-ocgx2
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e0619b105b..6a06851bab 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3943,6 +3943,7 @@ are distributed separately from l3kernel to allow this code to be updated on
 an independent schedule.")
     (license license:lppl1.3c)))
 
+(define-deprecated-package texlive-dvips-l3backend texlive-l3backend)
 (define-deprecated-package texlive-latex-l3backend texlive-l3backend)
 
 (define-public texlive-latex-l3packages
@@ -4017,23 +4018,6 @@ programming tools and kernel support.  Packages provided in this release are:
 @end enumerate\n")
     (license license:lppl1.3c+)))
 
-(define-public texlive-dvips-l3backend
-  (package
-    (inherit (simple-texlive-package
-              "texlive-dvips-l3backend"
-              (list
-               "/dvips/l3backend/")
-              (base32
-               "1hvj153h1pn93h6n76dv3mg9ai0mcz9q9mysfiqjfpqzijz9ikky")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/l3backend")
-    (synopsis "LaTeX3 backend drivers for dvips")
-    (description
-     "This package forms parts of expl3, and contains the code used to
-interface with backends (drivers) across the expl3 codebase.  The functions
-here are defined for the dvips engine only.")
-    (license license:lppl1.3c+)))
-
 (define-public texlive-fontspec
   (let ((template (simple-texlive-package
                    "texlive-fontspec"
-- 
cgit 1.4.1


From 3d97b99afe48c7c4e05029a784a78eacf2b4b767 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 12 May 2023 23:58:08 +0200
Subject: gnu: texlive-latex-l3packages -> texlive-l3packages.

* gnu/packages/tex.scm (texlive-l3packages): New variable.
(texlive-latex-l3packages): Deprecate variable.
(texlive-latex-base):
(texlive-fontspec):
(texlive-ddphonism):
(texlive-polyglossia):
(texlive-siunitx):
(texlive-xetex): Use new name.
---
 gnu/packages/tex.scm | 116 ++++++++++++++++++++++-----------------------------
 1 file changed, 50 insertions(+), 66 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6a06851bab..9fda52b076 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3209,7 +3209,7 @@ formats.")
              ;; TODO: This dependency isn't needed for LaTeX version 2021-06-01
              ;; and later. See:
              ;; https://tug.org/pipermail/tex-live/2021-June/047180.html
-             texlive-latex-l3packages
+             texlive-l3packages
              texlive-latexconfig))
       (home-page "https://www.ctan.org/pkg/latex-base")
       (synopsis "Base sources of LaTeX")
@@ -3946,77 +3946,61 @@ an independent schedule.")
 (define-deprecated-package texlive-dvips-l3backend texlive-l3backend)
 (define-deprecated-package texlive-latex-l3backend texlive-l3backend)
 
-(define-public texlive-latex-l3packages
+(define-public texlive-l3packages
   (package
-    (name "texlive-latex-l3packages")
+    (name "texlive-l3packages")
     (version (number->string %texlive-revision))
-    (source (texlive-origin name version
-                            '("/source/latex/l3packages/"
-                              ;; These files have been generated with a
-                              ;; bespoke source tree and then modified by
-                              ;; hand. It's unfeasible to recreate them. See:
-                              ;; https://tug.org/pipermail/tex-live/2021-June/047188.html
-                              "/tex/latex/l3packages/xparse/xparse-2018-04-12.sty"
-                              "/tex/latex/l3packages/xparse/xparse-2020-10-01.sty"
-
-                              ;; TODO: This file can be removed when using
-                              ;; LaTeX version 2021-06-01 or newer. See:
-                              ;; https://tug.org/pipermail/tex-live/2021-June/047180.html
-                              "/tex/latex/l3packages/xparse/xparse-generic.tex")
-                            (base32 "05rjxdqhhg7z1z2rmhmwj2qf09xygymayy3jzj9fdphk0pab3amm")))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/l3packages/"
+                   "source/latex/l3packages/l3keys2e/"
+                   "source/latex/l3packages/xfp/"
+                   "source/latex/l3packages/xfrac/"
+                   "source/latex/l3packages/xparse/"
+                   "source/latex/l3packages/xtemplate/"
+                   "tex/latex/l3packages/l3keys2e/"
+                   "tex/latex/l3packages/xfp/"
+                   "tex/latex/l3packages/xfrac/"
+                   "tex/latex/l3packages/xparse/"
+                   "tex/latex/l3packages/xtemplate/")
+             (base32
+              "1k9zms255qz6i24k74g7wnyrdvshl52jgb198pmg6mj9ajhw9sks")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     '(#:tex-directory "latex/l3packages"
-       #:tex-engine "tex"
-       #:tex-format #f
-       #:texlive-latex-base #f
-       ;; build-targets must be specified manually since they are in
-       ;; sub-directories.
-       #:build-targets '("l3keys2e.ins" "xparse.ins" "xfrac.ins" "xfp.ins" "xtemplate.ins")
-       #:phases
-       (modify-phases %standard-phases
-         ;; All package sources are in sub-directories, so we need to add them
-         ;; to TEXINPUTS.
-         (add-after 'unpack 'set-TEXINPUTS
-           (lambda _
-             (let ((cwd (getcwd)))
-               (setenv "TEXINPUTS"
-                       (string-append cwd "/source/latex/l3packages/l3keys2e:"
-                                      cwd "/source/latex/l3packages/xparse:"
-                                      cwd "/source/latex/l3packages/xfrac:"
-                                      cwd "/source/latex/l3packages/xfp:"
-                                      cwd "/source/latex/l3packages/xtemplate"
-                                      ;; The terminating ":" is required to include the
-                                      ;; l3kernel input as well.
-                                      ":")))
-             #t))
-         (add-after 'install 'copy-generated-files
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((dest (string-append (assoc-ref outputs "out")
-                                        "/share/texmf-dist/tex/latex/l3packages")))
-               (copy-recursively "tex/latex/l3packages/xparse" dest)))))
-       ))
+     (list
+      #:build-targets
+      '(list "l3keys2e.ins"
+             "xparse.ins"
+             "xfrac.ins"
+             "xfp.ins"
+             "xtemplate.ins")
+      #:tex-engine "tex"
+      #:tex-format #f
+      #:texlive-latex-base #f))
     (native-inputs
      (list texlive-docstrip))
     (propagated-inputs
      (list texlive-l3kernel))
-    (home-page "https://www.ctan.org/pkg/l3packages")
+    (home-page "https://ctan.org/pkg/l3packages")
     (synopsis "High-level LaTeX3 concepts")
     (description
-     "This bundle holds prototype implementations of concepts for a LaTeX
-designer interface, to be used with the experimental LaTeX kernel as
-programming tools and kernel support.  Packages provided in this release are:
+     "This collection contains implementations for aspects of the LaTeX3
+kernel, dealing with higher-level ideas such as the Designer Interface.  The
+packages here are considered broadly stable (The LaTeX3 Project does not
+expect the interfaces to alter radically).  These packages are built on
+LaTeX2e conventions at the interface level, and so may not migrate in the
+current form to a stand-alone LaTeX3 format.
+
+Packages provided are @code{xparse}, which provides a high-level interface for
+declaring document commands @code{xfp}, an expandable IEEE 754 FPU for LaTeX,
+@code{l3keys2e}, which makes the facilities of the kernel module l3keys
+available for use by LaTeX 2e packages, @code{xtemplate}, which provides
+a means of defining generic functions using a key-value syntax, and
+@code{xfrac}, which provides flexible split-level fractions.")
+    (license license:lppl1.3c)))
 
-@enumerate
-@item l3keys2e, which makes the facilities of the kernel module l3keys
-  available for use by LaTeX 2e packages;
-@item xfrac, which provides flexible splitlevel fractions;
-@item xparse, which provides a high-level interface for declaring document
-  commands; and
-@item xtemplate, which provides a means of defining generic functions using a
-  key-value syntax.
-@end enumerate\n")
-    (license license:lppl1.3c+)))
+(define-deprecated-package texlive-latex-l3packages texlive-l3packages)
 
 (define-public texlive-fontspec
   (let ((template (simple-texlive-package
@@ -4033,7 +4017,7 @@ programming tools and kernel support.  Packages provided in this release are:
          ((#:tex-directory _ #t)
           "latex/fontspec")))
       (propagated-inputs
-       (list texlive-cm texlive-latex-l3packages texlive-lm))
+       (list texlive-cm texlive-l3packages texlive-lm))
       (home-page "https://www.ctan.org/pkg/fontspec")
       (synopsis "Advanced font selection in XeLaTeX and LuaLaTeX")
       (description
@@ -5770,7 +5754,7 @@ in LaTeX documents; a jiffy to create slashed characters for physicists.")
     (propagated-inputs
      (list texlive-etoolbox
            texlive-hyperref
-           texlive-latex-l3packages
+           texlive-l3packages
            texlive-listings
            texlive-pgf
            texlive-tools
@@ -6237,7 +6221,7 @@ also provides compacted versions of enumerate and itemize.")
            texlive-stringenc
            texlive-zapfding
            texlive-makecmds
-           texlive-latex-l3packages     ;expl3, l3keys2e, xparse
+           texlive-l3packages           ;expl3, l3keys2e, xparse
            texlive-tools
            texlive-latex-xkeyval))
     (home-page "https://www.ctan.org/pkg/polyglossia")
@@ -10394,7 +10378,7 @@ The behaviour in standalone mode may adjusted using a configuration file
      '(#:tex-directory "latex/siunitx"
        #:build-targets '("siunitx.dtx")))
     (propagated-inputs
-     (list texlive-l3kernel texlive-latex-l3packages))
+     (list texlive-l3kernel texlive-l3packages))
     (home-page "http://www.ctan.org/pkg/siunitx")
     (synopsis "Comprehensive SI units package")
     (description
@@ -12893,7 +12877,7 @@ itself may be shipped out to the DVI file.")
            texlive-fonts-latex
            texlive-l3backend
            texlive-l3kernel
-           texlive-latex-l3packages
+           texlive-l3packages
            texlive-lm
            texlive-tex-ini-files
            texlive-tex-plain
-- 
cgit 1.4.1


From 88f97c65a1631bae028af408c04429c59c4286cd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 00:00:28 +0200
Subject: gnu: texlive-latex-cyrillic -> texlive-cyrillic.

* gnu/packages/tex.scm (texlive-cyrillic): New variable.
(texlive-latex-cyrillic): Deprecate variable.
(texlive-base):
(texlive-xindy):
* gnu/packages/music.scm (lilypond): Use new name.
---
 gnu/packages/music.scm |  4 ++--
 gnu/packages/tex.scm   | 38 +++++++++++++++++++++++---------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index bc7ea0ab7f..458d4e827d 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1508,9 +1508,9 @@ and auto-mapping slices to MIDI note numbers.")
            texinfo
            texi2html-1.82
            (texlive-updmap.cfg
-            (list texlive-epsf
+            (list texlive-cyrillic
+                  texlive-epsf
                   texlive-fontinst
-                  texlive-latex-cyrillic
                   texlive-lh
                   texlive-lm
                   texlive-metapost))
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9fda52b076..d622799c26 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4535,28 +4535,36 @@ support of Swedish in @code{babel}.  It provides all the necessary macros,
 definitions and settings to typeset Swedish documents.")
       (license license:lppl1.3c+))))
 
-(define-public texlive-latex-cyrillic
+(define-public texlive-cyrillic
   (package
-    (name "texlive-latex-cyrillic")
+    (name "texlive-cyrillic")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "cyrillic"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "083xbwg7hrnlv47fkwvz8yjb830bhxx7y0mq7z7nz2f96y2ldr6b"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cyrillic/"
+                   "source/latex/cyrillic/"
+                   "tex/latex/cyrillic/")
+             (base32
+              "0a1dcpdgnzf08cd1b9ihdk4229aw19ar0f5sfjr44fqqwkav3l5i")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     '(#:tex-directory "latex/cyrillic"))
-    (home-page "https://www.ctan.org/pkg/latex-cyrillic")
+     (list
+      #:tex-engine "tex"
+      #:tex-format #f
+      #:texlive-latex-base #f))
+    (native-inputs
+     (list texlive-docstrip))
+    (home-page "https://ctan.org/pkg/cyrillic")
     (synopsis "Support for Cyrillic fonts in LaTeX")
     (description
      "This bundle of macros files provides macro support (including font
 encoding macros) for the use of Cyrillic characters in fonts encoded under the
-T2* and X2 encodings. These encodings cover (between them) pretty much every
+T2* and X2 encodings.  These encodings cover (between them) pretty much every
 language that is written in a Cyrillic alphabet.")
-    (license license:lppl1.3c+)))
+    (license license:lppl1.3+)))
+
+(define-deprecated-package texlive-latex-cyrillic texlive-cyrillic)
 
 (define-public texlive-passivetex
   (package
@@ -4766,7 +4774,7 @@ part of the LaTeX required set of packages.")
                 texlive-amscls
                 texlive-babel
                 texlive-generic-babel-english
-                texlive-latex-cyrillic
+                texlive-cyrillic
                 texlive-psnfss
                 texlive-tools
                 texlive-tetex)))
@@ -11686,7 +11694,7 @@ handle complex tests.")
                          texlive-greek-fontenc
                          texlive-hyperref
                          texlive-latex-base
-                         texlive-latex-cyrillic
+                         texlive-cyrillic
                          texlive-latex-geometry
                          (texlive-updmap.cfg ;fonts
                           (list texlive-cbfonts
-- 
cgit 1.4.1


From 9828271f046e5909c66af11e09c96215e426b4aa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 00:02:19 +0200
Subject: gnu: texlive-latex-amsrefs -> texlive-amsrefs.

* gnu/packages/tex.scm (texlive-amsrefs): New variable.
(texlive-latex-amsrefs): Deprecate variable.
---
 gnu/packages/tex.scm | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d622799c26..c8a7ca24e1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4922,28 +4922,32 @@ TS3. \"Times-like\" Adobe Type 1 versions are provided for both the T3 and the
 TS3 fonts.")
     (license license:lppl)))
 
-(define-public texlive-latex-amsrefs
+(define-public texlive-amsrefs
   (package
-    (name "texlive-latex-amsrefs")
+    (name "texlive-amsrefs")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "amsrefs"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "15i4k479dwrpr0kspmm70g1yn4p3dkh0whyzmr93hph9bggnh1i1"))))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/amsrefs/" "bibtex/bst/amsrefs/"
+                   "doc/latex/amsrefs/" "source/latex/amsrefs/"
+                   "tex/latex/amsrefs/")
+             (base32
+              "12la66vz5ic6jc1cy96b2zh2fxsbaii9kbs4wrz1ii8v508wdkhv")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/amsrefs"))
-    (home-page "https://www.ctan.org/pkg/amsrefs")
+    (propagated-inputs
+     (list texlive-hyperref texlive-url))
+    (home-page "https://ctan.org/pkg/amsrefs")
     (synopsis "LaTeX-based replacement for BibTeX")
     (description
-     "Amsrefs is a LaTeX package for bibliographies that provides an archival
-data format similar to the format of BibTeX database files, but adapted to
-make direct processing by LaTeX easier.  The package can be used either in
-conjunction with BibTeX or as a replacement for BibTeX.")
+     "Amsrefs is a LaTeX package for bibliographies that provides an
+archival data format similar to the format of BibTeX database files, but
+adapted to make direct processing by LaTeX easier.  The package can be used
+either in conjunction with BibTeX or as a replacement for BibTeX.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-amsrefs texlive-amsrefs)
+
 (define-public texlive-bigfoot
   (let ((template (simple-texlive-package
                    "texlive-bigfoot"
-- 
cgit 1.4.1


From 4270d94ee36775b88765bc322af7f7c1a514f125 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 00:20:57 +0200
Subject: gnu: texlive-latex-hanging -> texlive-hanging.

* gnu/packages/tex.scm (texlive-hanging): New variable.
(texlive-latex-hanging): Deprecate variable.
* gnu/packages/maths.scm (hypre): Use new name.
---
 gnu/packages/maths.scm |  2 +-
 gnu/packages/tex.scm   | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 14583f7b45..497a8f7ba7 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5804,7 +5804,7 @@ set.")
                                      texlive-latex-fncychap
                                      texlive-latex-framed
                                      texlive-latex-geometry
-                                     texlive-latex-hanging
+                                     texlive-hanging
                                      texlive-hyperref
                                      texlive-latex-multirow
                                      texlive-latex-natbib
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c8a7ca24e1..0818461101 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5245,14 +5245,19 @@ but non-expandable ones.")
 
 (define-deprecated-package texlive-latex-filemod texlive-filemod)
 
-(define-public texlive-latex-hanging
+(define-public texlive-hanging
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-hanging"
-              '("/tex/latex/hanging/")
-              (base32
-               "0s86yaxyfv9zxf4svwg9s13by9vrw38apfg0hsfchsimsdd6gsbb")
-              #:trivial? #t))
+    (name "texlive-hanging")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hanging"
+                   "source/latex/hanging"
+                   "tex/latex/hanging/")
+             (base32
+              "1d9kr163vn9sm9p9dyppnnffdcdjlgrm7848d97s678hdb9cp962")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (home-page "https://www.ctan.org/pkg/hanging")
     (synopsis "Typeset hanging paragraphs")
     (description
@@ -5261,6 +5266,8 @@ paragraphs.  The package also enables typesetting with hanging punctuation,
 by making punctuation characters active.")
     (license license:lppl1.3c+)))
 
+(define-deprecated-package texlive-latex-hanging texlive-hanging)
+
 (define-public texlive-fira
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From d8418675b03e8fa3c4e2d5926efb3da6c3769bb3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 00:22:48 +0200
Subject: gnu: texlive-latex-ifplatform -> texlive-ifplatform.

* gnu/packages/tex.scm (texlive-ifplatform): New variable.
(texlive-latex-ifplatform): Deprecate variable.
(texlive-pstool):
(texlive-minted): Use new name.
---
 gnu/packages/tex.scm | 49 ++++++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0818461101..91cf368cc7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5318,31 +5318,38 @@ not yet reflected in the package's or class's code.  The file
 meant to be loaded during format generation and not by the user.")
       (license license:lppl1.3c))))
 
-(define-public texlive-latex-ifplatform
+(define-public texlive-ifplatform
   (package
-    (name "texlive-latex-ifplatform")
+    (name "texlive-ifplatform")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "ifplatform"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "157pplavvm2z97b3jl4x41w11k6q9wgy074mfg0dwmsx5lm328jy"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ifplatform/"
+                   "source/latex/ifplatform/"
+                   "tex/latex/ifplatform/")
+             (base32
+              "1llas0xwq3y9nk7gblg40l99cgmkl9r7rbfazrhpnbaz5cshl8pl")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs (list texlive-catchfile))
-    (arguments '(#:tex-directory "latex/ifplatform"))
-    (home-page "https://www.ctan.org/pkg/ifplatform")
+    (propagated-inputs
+     (list texlive-catchfile
+           texlive-iftex
+           texlive-pdftexcmds
+           texlive-tools))
+    (home-page "https://ctan.org/pkg/ifplatform")
     (synopsis "Conditionals to test which platform is being used")
     (description
-     "This package uses the (La)TeX extension @code{-shell-escape} to
-establish whether the document is being processed on a Windows or on a
-Unix-like system, or on Cygwin (Unix environment over a Windows system).
+     "This package uses the (La)TeX extension @samp{-shell-escape} to
+establish whether the document is being processed on a Windows or on
+a Unix-like system, or on Cygwin.
+
 Booleans provided are: @code{\\ifwindows}, @code{\\iflinux}, @code{\\ifmacosx}
-and @code{\\ifcygwin}.  The package also preserves the output of @code{uname}
-on a Unix-like system, which may be used to distinguish between various
-classes of systems.")
-    (license license:lppl)))
+and @code{\\ifcygwin}.  The package also preserves the output of
+@command{uname} on a Unix-like system, which may be used to distinguish
+between various classes of Unix systems.")
+    (license license:lppl1.3c)))
+
+(define-deprecated-package texlive-latex-ifplatform texlive-ifplatform)
 
 (define-public texlive-latex-natbib
   (package
@@ -5467,7 +5474,7 @@ rotated.")
      (list texlive-bigfoot ; for suffix
            texlive-filemod
            texlive-graphics
-           texlive-latex-ifplatform
+           texlive-ifplatform
            texlive-l3kernel ; for expl3
            texlive-oberdiek
            texlive-latex-psfrag
@@ -10663,7 +10670,7 @@ configuration of its own fixed names, using @file{.mld} files.")
                                texlive-fvextra
                                texlive-latex-float
                                texlive-latex-framed
-                               texlive-latex-ifplatform
+                               texlive-ifplatform
                                texlive-latex-newfloat
                                texlive-lineno
                                texlive-xstring))
-- 
cgit 1.4.1


From b42e997e85967f4da18822c221d4dd176a728b63 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 00:24:03 +0200
Subject: gnu: texlive-latex-natbib -> texlive-natbib.

* gnu/packages/tex.scm (texlive-natbib): New variable.
(texlive-latex-natbib): Deprecate variable.
(texlive-apacite):
* gnu/packages/bioinformatics.scm (discrover):
* gnu/packages/maths.scm (hypre): Use new name.
---
 gnu/packages/bioinformatics.scm |  2 +-
 gnu/packages/maths.scm          |  2 +-
 gnu/packages/tex.scm            | 35 ++++++++++++++++++-----------------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 3ebfdcc385..eab2b24ab1 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4772,7 +4772,7 @@ data and settings.")
                   texlive-latex-examplep
                   texlive-hyperref
                   texlive-ms
-                  texlive-latex-natbib
+                  texlive-natbib
                   texlive-bibtex        ;style files used by natbib
                   texlive-pgf           ;tikz
                   texlive-latex-verbatimbox))
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 497a8f7ba7..052e9c791d 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5807,7 +5807,7 @@ set.")
                                      texlive-hanging
                                      texlive-hyperref
                                      texlive-latex-multirow
-                                     texlive-latex-natbib
+                                     texlive-natbib
                                      texlive-latex-needspace
                                      texlive-latex-newunicodechar
                                      texlive-latex-parskip
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 91cf368cc7..56c2ceafc9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5351,30 +5351,31 @@ between various classes of Unix systems.")
 
 (define-deprecated-package texlive-latex-ifplatform texlive-ifplatform)
 
-(define-public texlive-latex-natbib
+(define-public texlive-natbib
   (package
-    (name "texlive-latex-natbib")
+    (name "texlive-natbib")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "natbib"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0aqliq0nwblxyrzhwhv77pnmk7qh2y3prgq7z7qhwcbgz5kisld7"))))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/natbib/" "doc/latex/natbib/"
+                   "source/latex/natbib/" "tex/latex/natbib/")
+             (base32
+              "17hyba6v24wrbjvakgjxkndjb418mmi2wmnhrm7zmfwb0bvy6f2j")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/natbib"))
-    (home-page "https://www.ctan.org/pkg/natbib")
+    (home-page "https://ctan.org/pkg/natbib")
     (synopsis "Flexible bibliography support")
     (description
-     "This bundle provides a package that implements both author-year and
+     "The bundle provides a package that implements both author-year and
 numbered references, as well as much detailed of support for other
-bibliography use.  Also provided are versions of the standard BibTeX styles
-that are compatible with @code{natbib}: @code{plainnat}, @code{unsrtnat},
-@code{abbrnat}.  The bibliography styles produced by @code{custom-bib} are
-designed from the start to be compatible with @code{natbib}.")
+bibliography use.  Also Provided are versions of the standard BibTeX styles
+that are compatible with natbib--plainnat, unsrtnat, abbrnat.  The
+bibliography styles produced by custom-bib are designed from the start to be
+compatible with @code{natbib}.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-natbib texlive-natbib)
+
 (define-public texlive-latex-newfloat
   (package
     (inherit (simple-texlive-package
@@ -11914,7 +11915,7 @@ maintained).")
               (base32
                "0bcfpcmflhvxwzmdj8dgf43mzaywx2asahp52nqn3wwvq64bqym6")
               #:trivial? #t))
-    (propagated-inputs (list texlive-latex-natbib
+    (propagated-inputs (list texlive-natbib
                              texlive-tools))
     (home-page "https://www.ctan.org/pkg/apacite")
     (synopsis "Citation style following the rules of the APA")
-- 
cgit 1.4.1


From 36e77dbd2a30edc8096b22dd692d3d62424ea50a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 00:29:11 +0200
Subject: gnu: texlive-latex-newfloat -> texlive-newfloat.

* gnu/packages/tex.scm (texlive-newfloat): New variable.
(texlive-latex-newfloat): Deprecate variable.
(texlive-minted): Use new name.
---
 gnu/packages/tex.scm | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 56c2ceafc9..71696fe6e5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5376,15 +5376,21 @@ compatible with @code{natbib}.")
 
 (define-deprecated-package texlive-latex-natbib texlive-natbib)
 
-(define-public texlive-latex-newfloat
+(define-public texlive-newfloat
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-newfloat"
-              (list "doc/latex/newfloat/"
-                    "tex/latex/newfloat/")
-              (base32 "1047max3li9ni15njgsvc7qglakgrjy2l0s72imgzdmwgb2h8jyf")
-              #:trivial? #t))
+    (name "texlive-newfloat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/newfloat/"
+                   "source/latex/newfloat/"
+                   "tex/latex/newfloat/")
+             (base32
+              "1hrackdfrzad8cgbl3f3yaagk4p4zjbvq710rm8b1z02fr9z2zkq")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics))
     (home-page "https://ctan.org/pkg/newfloat")
     (synopsis "Define new floating environments")
     (description
@@ -5393,6 +5399,8 @@ which the user may use to define new floating environments which behave like
 the LaTeX standard foating environments @code{figure} and @code{table}.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-newfloat texlive-newfloat)
+
 (define-public texlive-latex-newunicodechar
   (package
     (inherit (simple-texlive-package
@@ -10668,12 +10676,12 @@ configuration of its own fixed names, using @file{.mld} files.")
       (propagated-inputs (list python-pygments
                                texlive-etoolbox
                                texlive-fancyvrb
-                               texlive-fvextra
                                texlive-latex-float
                                texlive-latex-framed
+                               texlive-fvextra
                                texlive-ifplatform
-                               texlive-latex-newfloat
                                texlive-lineno
+                               texlive-newfloat
                                texlive-xstring))
       (home-page "https://ctan.org/pkg/minted")
       (synopsis "Highlight source code in LaTeX documents")
-- 
cgit 1.4.1


From e1e0e08451e84ccb7530e5a8187367333f1f87ee Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 00:32:58 +0200
Subject: gnu: texlive-latex-newunicodechar -> texlive-newunicodechar.

* gnu/packages/tex.scm (texlive-newunicodechar): New variable.
(texlive-latex-newunicodechar): Deprecate variable.
* gnu/packages/maths.scm (hypre): Use new name.
---
 gnu/packages/maths.scm |  2 +-
 gnu/packages/tex.scm   | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 052e9c791d..fe4d23c2e8 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5809,7 +5809,7 @@ set.")
                                      texlive-latex-multirow
                                      texlive-natbib
                                      texlive-latex-needspace
-                                     texlive-latex-newunicodechar
+                                     texlive-newunicodechar
                                      texlive-latex-parskip
                                      texlive-latex-stackengine
                                      texlive-latex-tabulary
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 71696fe6e5..4c78950cca 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5401,14 +5401,18 @@ the LaTeX standard foating environments @code{figure} and @code{table}.")
 
 (define-deprecated-package texlive-latex-newfloat texlive-newfloat)
 
-(define-public texlive-latex-newunicodechar
+(define-public texlive-newunicodechar
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-newunicodechar"
-              '("/doc/latex/newunicodechar/" "/tex/latex/newunicodechar/")
-              (base32
-               "0pwx3ylhvk5hxjnalas00grrbwla79j424i27hrm0zgflq7wsbrj")
-              #:trivial? #t))
+    (name "texlive-newunicodechar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/newunicodechar/" "source/latex/newunicodechar"
+                   "tex/latex/newunicodechar/")
+             (base32
+              "0mybqah1n9vmxvi6f587jlxbn7pv3624qw83psq5vwfnddw3n70y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (home-page "https://www.ctan.org/pkg/newunicodechar")
     (synopsis "Definitions of the meaning of Unicode characters")
     (description
@@ -5417,6 +5421,8 @@ Unicode characters.  The document should be processed by (pdf)LaTeX with the
 Unicode option of @code{inputenc} or @code{inputenx}, or by XeLaTeX/LuaLaTeX.")
     (license license:lppl1.3c+)))
 
+(define-deprecated-package texlive-latex-newunicodechar texlive-newunicodechar)
+
 (define-public texlive-pdftexcmds
   (let ((template (simple-texlive-package
                    "texlive-pdftexcmds"
-- 
cgit 1.4.1


From 7af4d29ace7d10f1a7ab083a3ec84758a00924fb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 00:34:05 +0200
Subject: gnu: texlive-latex-psfrag -> texlive-psfrag.

* gnu/packages/tex.scm (texlive-psfrag): New variable.
(texlive-latex-psfrag): Deprecate variable.
(texlive-pstool):
* gnu/packages/bioinformatics.scm (phyml): Use new name.
---
 gnu/packages/bioinformatics.scm |  2 +-
 gnu/packages/tex.scm            | 35 ++++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index eab2b24ab1..22d2722538 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -12111,7 +12111,7 @@ programs for inferring phylogenies (evolutionary trees).")
                                      texlive-graphics
                                      texlive-grfext
                                      texlive-hyperref
-                                     texlive-latex-psfrag
+                                     texlive-psfrag
                                      texlive-xcolor))))
     (home-page "https://github.com/stephaneguindon/phyml")
     (synopsis "Programs for working on SAM/BAM files")
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4c78950cca..d10c67620c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5451,31 +5451,36 @@ available for LuaTeX by reimplementing them using Lua.")
 
 (define-deprecated-package texlive-latex-pdftexcmds texlive-pdftexcmds)
 
-(define-public texlive-latex-psfrag
+(define-public texlive-psfrag
   (package
-    (name "texlive-latex-psfrag")
+    (name "texlive-psfrag")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "psfrag"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1dxbl5il7wbbsp0v45vk884xi1192wxw03849pb1g5q4x808n352"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/psfrag/"
+                   "dvips/psfrag/"
+                   "source/latex/psfrag/"
+                   "tex/latex/psfrag/")
+             (base32
+              "06vp5x6rnl4gqwxzzynbl169q23k8pmaxjhb0lbzdcm3ihvzp47z")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/psfrag"))
-    (home-page "https://www.ctan.org/pkg/psfrag")
+    (propagated-inputs
+     (list texlive-graphics))
+    (home-page "https://ctan.org/pkg/psfrag")
     (synopsis "Replace strings in encapsulated PostScript figures")
     (description
      "This package allows LaTeX constructions (equations, picture
 environments, etc.) to be precisely superimposed over Encapsulated PostScript
 figures, using your own favorite drawing tool to create an EPS figure and
-placing simple text \"tags\" where each replacement is to be placed, with
-PSfrag automatically removing these tags from the figure and replacing them
-with a user specified LaTeX construction, properly aligned, scaled, and/or
+placing simple text tags where each replacement is to be placed, with PSfrag
+automatically removing these tags from the figure and replacing them with
+a user specified LaTeX construction, properly aligned, scaled, and/or
 rotated.")
     (license (license:fsf-free "file://psfrag.dtx"))))
 
+(define-deprecated-package texlive-latex-psfrag texlive-psfrag)
+
 (define-public texlive-pstool
   (package
     (inherit (simple-texlive-package
@@ -5492,7 +5497,7 @@ rotated.")
            texlive-ifplatform
            texlive-l3kernel ; for expl3
            texlive-oberdiek
-           texlive-latex-psfrag
+           texlive-psfrag
            texlive-tools                ; for shellesc
            texlive-trimspaces
            texlive-latex-xkeyval))
-- 
cgit 1.4.1


From 68a7e9c749012323725668573527b81742d75080 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 00:37:03 +0200
Subject: gnu: texlive-latex-seqsplit -> texlive-seqsplit.

* gnu/packages/tex.scm (texlive-seqsplit): New variable.
(texlive-latex-seqsplit): Deprecate variable.
---
 gnu/packages/tex.scm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d10c67620c..b91df6527d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5563,14 +5563,18 @@ recent classes such as powerdot or beamer, both of which are tuned to
 
 (define-deprecated-package texlive-latex-seminar texlive-seminar)
 
-(define-public texlive-latex-seqsplit
+(define-public texlive-seqsplit
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-seqsplit"
+    (name "texlive-seqsplit")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
               (list "doc/latex/seqsplit/"
+                    "source/latex/seqsplit/"
                     "tex/latex/seqsplit/")
-              (base32 "1vwzs90520qsk22djl6gs6gpqx83y4b19kziirwj2xwbivcfk1h4")
-              #:trivial? #t))
+              (base32
+               "0x6xcism9s9mhpr278xi4c1gimz3mlqnrpr40vkx5abglr0gzm0j")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/seqsplit")
     (synopsis "Split long sequences of characters in a neutral way")
@@ -5584,6 +5588,8 @@ numbers.  While the package may obviously be used to typeset DNA sequences, the
 user may consider the @code{dnaseq} as a rather more powerful alternative.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-seqsplit texlive-seqsplit)
+
 (define-public texlive-showexpl
   (package
     (name "texlive-showexpl")
-- 
cgit 1.4.1


From 40b0c09d2711dca951d272e51c21f4764e537211 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 07:50:39 +0200
Subject: gnu: texlive-generic-listofitems -> texlive-listofitems.

* gnu/packages/tex.scm (texlive-listofitems): New variable.
(texlive-generic-listofitems): Deprecate variable.
(texlive-latex-readarray):
* gnu/packages/maths.scm (hypre): Use new name.
---
 gnu/packages/maths.scm |  2 +-
 gnu/packages/tex.scm   | 46 +++++++++++++++++-----------------------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index fe4d23c2e8..4c9d379eab 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5797,7 +5797,7 @@ set.")
                                      texlive-wasy
                                      texlive-xcolor
                                      texlive-xypic
-                                     texlive-generic-listofitems
+                                     texlive-listofitems
                                      texlive-latex-cmap
                                      texlive-latex-colortbl
                                      texlive-latex-float
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b91df6527d..a371eb7151 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9590,40 +9590,28 @@ level of curly braces are removed from the values.")
 
 (define-deprecated-package texlive-generic-kvsetkeys texlive-kvsetkeys)
 
-(define-public texlive-generic-listofitems
+(define-public texlive-listofitems
   (package
-    (name "texlive-generic-listofitems")
+    (name "texlive-listofitems")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/generic/listofitems"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1wnbnfrhi6hgqa78jsw6hljzi03i5x99mlr5n2419hgws52hk67y"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/generic/listofitems")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/listofitems")
+    (source (texlive-origin
+             name version
+             (list "doc/generic/listofitems"
+                   "tex/generic/listofitems")
+             (base32
+              "1vzp4qkpfxzgcll1ak9syyc91sl93k9wr5rgfqvd6d6rgrnh3ava")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/listofitems")
     (synopsis "Grab items in lists using user-specified separation character")
     (description
-     "This package allows one to capture all the items of a list, for which
-the parsing character has been selected by the user, and to access any of
-these items with a simple syntax.")
+     "This package is designed to read a list, for which the parsing character
+has been selected by the user, and to access any of these items with a simple
+interface.")
     (license license:lppl1.3c+)))
 
+(define-deprecated-package texlive-generic-listofitems texlive-listofitems)
+
 (define-public texlive-ltxcmds
   (let ((template (simple-texlive-package
                    "texlive-ltxcmds"
@@ -9734,7 +9722,7 @@ values are not limited.")
            (copy-recursively (assoc-ref %build-inputs "source") target)
            #t))))
     (propagated-inputs
-     (list texlive-generic-listofitems))
+     (list texlive-listofitems))
     (home-page "https://www.ctan.org/pkg/readarray")
     (synopsis "Read, store and recall array-formatted data")
     (description
-- 
cgit 1.4.1


From c9347f438b14ad64554465dcc6c4541018771211 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 07:52:30 +0200
Subject: gnu: texlive-latex-stackengine -> texlive-stackengine.

* gnu/packages/tex.scm (texlive-stackengine): New variable.
(texlive-latex-stackengine): Deprecate variable.
* gnu/packages/maths.scm (hypre): Use new name.
---
 gnu/packages/maths.scm |  2 +-
 gnu/packages/tex.scm   | 26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 4c9d379eab..1d42a7bbc7 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5811,7 +5811,7 @@ set.")
                                      texlive-latex-needspace
                                      texlive-newunicodechar
                                      texlive-latex-parskip
-                                     texlive-latex-stackengine
+                                     texlive-stackengine
                                      texlive-latex-tabulary
                                      texlive-latex-tocloft
                                      texlive-latex-upquote
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a371eb7151..8cc1020e1a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5616,16 +5616,22 @@ user may consider the @code{dnaseq} as a rather more powerful alternative.")
 result in the same document.")
     (license license:lppl1.2+)))
 
-(define-public texlive-latex-stackengine
+(define-public texlive-stackengine
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-stackengine"
-              (list "/doc/latex/stackengine/"
-                    "/tex/latex/stackengine/")
-              (base32
-               "1rbw3dmb6kl3wlnpxacr8cmp2ivac1kpnb33k7r5s3lp1q59ck38")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/stackengine")
+    (name "texlive-stackengine")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/stackengine/"
+                   "tex/latex/stackengine/")
+             (base32
+              "1rbw3dmb6kl3wlnpxacr8cmp2ivac1kpnb33k7r5s3lp1q59ck38")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etoolbox
+           texlive-listofitems))
+    (home-page "https://ctan.org/pkg/stackengine")
     (synopsis "Customised stacking of objects")
     (description
      "The package provides a versatile way to stack objects vertically in a
@@ -5633,6 +5639,8 @@ variety of customizable ways.  A number of useful macros are provided, all
 of which make use of the @code{stackengine} core.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-stackengine texlive-stackengine)
+
 (define-public texlive-latex-tocloft
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From c0b3254568f67ec6b28bd4c79b07ce3c13be96e6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 07:58:07 +0200
Subject: gnu: texlive-latex-tocloft -> texlive-tocloft.

* gnu/packages/tex.scm (texlive-tocloft): New variable.
(texlive-latex-tocloft): Deprecate variable.
* gnu/packages/maths.scm (hypre): Use new name.
---
 gnu/packages/maths.scm |  2 +-
 gnu/packages/tex.scm   | 28 +++++++++++++++++-----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 1d42a7bbc7..c342965816 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5813,7 +5813,7 @@ set.")
                                      texlive-latex-parskip
                                      texlive-stackengine
                                      texlive-latex-tabulary
-                                     texlive-latex-tocloft
+                                     texlive-tocloft
                                      texlive-latex-upquote
                                      texlive-latex-varwidth
                                      texlive-titlesec
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8cc1020e1a..8f7f1fa42f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5641,23 +5641,29 @@ of which make use of the @code{stackengine} core.")
 
 (define-deprecated-package texlive-latex-stackengine texlive-stackengine)
 
-(define-public texlive-latex-tocloft
+(define-public texlive-tocloft
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-tocloft"
-              '("/doc/latex/tocloft/" "/tex/latex/tocloft/")
-              (base32
-               "0mg3hpzq7wpm6mnnvb0rp3wby56zyxkyai8d2h3f4vk93zrc6awk")
-              #:trivial? #t))
+    (name "texlive-tocloft")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tocloft/"
+                   "source/latex/tocloft/"
+                   "tex/latex/tocloft/")
+             (base32
+              "1s09g02pq2zi5ywm3yhyp4lpzq77n9aahr6wnm1c0wb9zawq2mpk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (home-page "https://www.ctan.org/pkg/tocloft")
     (synopsis "Control table of contents")
     (description
-     "This package provides control over the typography of the
-@dfn{Table of Contents}, @dfn{List of Figures} and @dfn{List of Tables},
-and the ability to create new ‘List of ...’. The ToC @code{\\parskip} may
-be changed.")
+     "This package provides control over the typography of the @dfn{Table of
+Contents}, @dfn{List of Figures} and @dfn{List of Tables}, and the ability to
+create new @samp{List of ...}.  The ToC @code{\\parskip} may be changed.")
     (license license:lppl1.3c+)))
 
+(define-deprecated-package texlive-latex-tocloft texlive-tocloft)
+
 (define-public texlive-trimspaces
   (package
     (name "texlive-trimspaces")
-- 
cgit 1.4.1


From ec56993c84b39403b35a13b26b32897408faba16 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 08:00:21 +0200
Subject: gnu: texlive-latex-fncychap -> texlive-fncychap.

* gnu/packages/tex.scm (texlive-fncychap): New variable.
(texlive-latex-fncychap): Deprecate variable.
* gnu/packages/maths.scm (hypre):
* gnu/packages/sphinx.scm (python-sphinx): Use new name.
---
 gnu/packages/maths.scm  |  2 +-
 gnu/packages/sphinx.scm |  4 ++--
 gnu/packages/tex.scm    | 40 +++++++++++++++-------------------------
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index c342965816..f9d16b9c99 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5801,7 +5801,7 @@ set.")
                                      texlive-latex-cmap
                                      texlive-latex-colortbl
                                      texlive-latex-float
-                                     texlive-latex-fncychap
+                                     texlive-fncychap
                                      texlive-latex-framed
                                      texlive-latex-geometry
                                      texlive-hanging
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 65b3dc4ec5..58957c44bb 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2017 Christine Lemmer-Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2019, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2019, 2021, 2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org>
 ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
@@ -117,7 +117,7 @@
            texlive-fancyhdr
            texlive-fancyvrb
            texlive-latex-float
-           texlive-latex-fncychap
+           texlive-fncychap
            texlive-latex-framed
            texlive-latex-geometry
            texlive-graphics                       ;graphicx, color
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8f7f1fa42f..5849f4f8d8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5880,33 +5880,21 @@ of the LaTeX kernel.")
 
 (define-deprecated-package texlive-latex-etoolbox texlive-etoolbox)
 
-(define-public texlive-latex-fncychap
+(define-public texlive-fncychap
   (package
-    (name "texlive-latex-fncychap")
+    (name "texlive-fncychap")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/fncychap"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0fdk84dbicfjfprkz6vk15x36mvlhaw9isjmgkc56jp2khwjswwq"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/fncychap")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/fncychap")
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fncychap/"
+                   "tex/latex/fncychap/")
+             (base32
+              "1javlws18ncrf7rz7qfbx1db9jwk45lm6sa0s67hlr6hqnyjxf94")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics))
+    (home-page "https://ctan.org/pkg/fncychap")
     (synopsis "Seven predefined chapter heading styles")
     (description
      "This package provides seven predefined chapter heading styles.  Each
@@ -5915,6 +5903,8 @@ modify the formatting routines in order to create additional chapter
 headings.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-fncychap texlive-fncychap)
+
 (define-public texlive-latex-framed
   (package
     (name "texlive-latex-framed")
-- 
cgit 1.4.1


From 49928a5dc26f6d42b09826a034f6e7d88a892c21 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 08:01:51 +0200
Subject: gnu: texlive-latex-framed -> texlive-framed.

* gnu/packages/tex.scm (texlive-framed): New variable.
(texlive-latex-framed): Deprecate variable.
(texlive-minted):
* gnu/packages/maths.scm (hypre):
* gnu/packages/sphinx.scm (python-sphinx): Use new name.
---
 gnu/packages/maths.scm  |  2 +-
 gnu/packages/sphinx.scm |  2 +-
 gnu/packages/tex.scm    | 44 ++++++++++++++++----------------------------
 3 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index f9d16b9c99..87b2b9816e 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5802,7 +5802,7 @@ set.")
                                      texlive-latex-colortbl
                                      texlive-latex-float
                                      texlive-fncychap
-                                     texlive-latex-framed
+                                     texlive-framed
                                      texlive-latex-geometry
                                      texlive-hanging
                                      texlive-hyperref
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 58957c44bb..42ddbade1e 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -118,7 +118,7 @@
            texlive-fancyvrb
            texlive-latex-float
            texlive-fncychap
-           texlive-latex-framed
+           texlive-framed
            texlive-latex-geometry
            texlive-graphics                       ;graphicx, color
            texlive-kvoptions
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5849f4f8d8..cd8d0d218c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5905,46 +5905,34 @@ headings.")
 
 (define-deprecated-package texlive-latex-fncychap texlive-fncychap)
 
-(define-public texlive-latex-framed
+(define-public texlive-framed
   (package
-    (name "texlive-latex-framed")
+    (name "texlive-framed")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/framed"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "14a4ydqsvp3vcfavl21jrv0ybiqypaaqzg2q2cs3rzkandg7w98x"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/framed")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/framed")
+    (source (texlive-origin
+             name version
+             (list "doc/latex/framed/"
+                   "tex/latex/framed/")
+             (base32
+              "09hlzjlhz3q3l62h6gj997pfx1hc4726frhcdc6y5g66c3gh621g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/framed")
     (synopsis "Framed or shaded regions that can break across pages")
     (description
      "The package creates three environments: @code{framed}, which puts an
 ordinary frame box around the region, @code{shaded}, which shades the region,
 and @code{leftbar}, which places a line at the left side.  The environments
-allow a break at their start (the @code{\\FrameCommand} enables creation of a
-title that is “attached” to the environment); breaks are also allowed in the
+allow a break at their start (the @code{\\FrameCommand} enables creation of
+a title that is “attached” to the environment); breaks are also allowed in the
 course of the framed/shaded matter.  There is also a command
 @code{\\MakeFramed} to make your own framed-style environments.")
     ;; The header states: "These macros may be freely transmitted, reproduced,
     ;; or modified for any purpose provided that this notice is left intact."
     (license (license:fsf-free "file://framed.sty"))))
 
+(define-deprecated-package texlive-latex-framed texlive-framed)
+
 (define-public texlive-latex-g-brief
   (package
     (name "texlive-latex-g-brief")
@@ -10686,7 +10674,7 @@ configuration of its own fixed names, using @file{.mld} files.")
                                texlive-etoolbox
                                texlive-fancyvrb
                                texlive-latex-float
-                               texlive-latex-framed
+                               texlive-framed
                                texlive-fvextra
                                texlive-ifplatform
                                texlive-lineno
-- 
cgit 1.4.1


From 4af17a752703885cf8835669468607902eebd86d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 08:09:03 +0200
Subject: gnu: texlive-latex-g-brief -> texlive-g-brief.

* gnu/packages/tex.scm (texlive-g-brief): New variable.
(texlive-latex-g-brief): Deprecate variable.
---
 gnu/packages/tex.scm | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cd8d0d218c..7648a948e0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5933,35 +5933,34 @@ course of the framed/shaded matter.  There is also a command
 
 (define-deprecated-package texlive-latex-framed texlive-framed)
 
-(define-public texlive-latex-g-brief
+(define-public texlive-g-brief
   (package
-    (name "texlive-latex-g-brief")
+    (name "texlive-g-brief")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "g-brief"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1br4kv9y17cvngp83ykpvy7gy3jqfan5plk7sggcgbdfhndi5dsr"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/g-brief/"
+                   "source/latex/g-brief/"
+                   "tex/latex/g-brief/")
+             (base32
+              "0sicgf3wjw5jymh5xjxby2hsilakhw2lqgywx0f2zax1z854xc2m")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     '(#:tex-directory "latex/g-brief"
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-generated-file
-           (lambda _
-             (delete-file "g-brief.drv")
-             #t)))))
+    (propagated-inputs
+     (list texlive-babel
+           texlive-eurosym
+           texlive-marvosym))
     (home-page "https://www.ctan.org/pkg/g-brief")
     (synopsis "Letter document class")
     (description
      "This package is designed for formatting formless letters in German; it
 can also be used for English (by those who can read the documentation).  There
-are LaTeX 2.09 @code{documentstyle} and LaTeX 2e class files for both an
-\"old\" and a \"new\" version of g-brief.")
+are LaTeX 2.09 @code{documentstyle} and LaTeX 2e class files for both an old
+and a new version of @code{g-brief}.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-g-brief texlive-g-brief)
+
 (define-public texlive-latex-galois
   (package
     (name "texlive-latex-galois")
-- 
cgit 1.4.1


From f99509f664754c617d58d8ab16187c55d6798c42 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 09:20:09 +0200
Subject: gnu: texlive-latex-galois -> texlive-galois.

* gnu/packages/tex.scm (texlive-galois): New variable.
(texlive-latex-galois): Deprecate variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7648a948e0..a824546fee 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5961,19 +5961,21 @@ and a new version of @code{g-brief}.")
 
 (define-deprecated-package texlive-latex-g-brief texlive-g-brief)
 
-(define-public texlive-latex-galois
+(define-public texlive-galois
   (package
-    (name "texlive-latex-galois")
+    (name "texlive-galois")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "galois"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0d4l0msk8j5pi95xnmm9wygv1vbpkwkv5amx9l0km86cs79jpp1h"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/galois/"
+                   "source/latex/galois/"
+                   "tex/latex/galois/")
+             (base32
+              "1324nw1r1aj6khz6fvrhd1p1sinadrd83j0s2q2fhnsgwp6sw94f")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/galois"))
+    (propagated-inputs
+     (list texlive-graphics))
     (home-page "https://www.ctan.org/pkg/galois")
     (synopsis "Typeset Galois connections")
     (description
@@ -5981,6 +5983,8 @@ and a new version of @code{g-brief}.")
 in colour.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-galois texlive-galois)
+
 (define-public texlive-latex-gcite
   (package
     (name "texlive-latex-gcite")
-- 
cgit 1.4.1


From 9ced20c4a9719495b4f6f7a263d909daef3b68e7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 09:33:40 +0200
Subject: gnu: texlive-latex-gcite -> texlive-gcite.

* gnu/packages/tex.scm (texlive-gcite): New variable.
(texlive-latex-gcite): Deprecate variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a824546fee..c8b368710e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5985,19 +5985,21 @@ in colour.")
 
 (define-deprecated-package texlive-latex-galois texlive-galois)
 
-(define-public texlive-latex-gcite
+(define-public texlive-gcite
   (package
-    (name "texlive-latex-gcite")
+    (name "texlive-gcite")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "gcite"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "03g9by54yrypn599y98r1xh7qw0bbbmpzq0bfwpj6j5q5rkl1mfa"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gcite/"
+                   "source/latex/gcite/"
+                   "tex/latex/gcite/")
+             (base32
+              "0yb7sid13bx25yar3aw6pbf4jmmfi0gdmcd7ynf5hjh9qdfb3zyh")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/gcite"))
+    (propagated-inputs
+     (list texlive-biblatex))
     (home-page "https://www.ctan.org/pkg/gcite")
     (synopsis "Citations in a reader-friendly style")
     (description
@@ -6009,6 +6011,8 @@ look-up efficiency afforded by numeric citations.  The package makes use of
 BibLaTeX, and is considered experimental.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-gcite texlive-gcite)
+
 (define-public texlive-latex-geometry
   (package
     (name "texlive-latex-geometry")
-- 
cgit 1.4.1


From 764085d4c275c5b98fb3120c8ef890554de0ddb1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 10:14:24 +0200
Subject: gnu: texlive-generic-babel-english -> texlive-babel-english.

* gnu/packages/tex.scm (texlive-babel-english): New variable.
(texlive-generic-babel-english): Deprecate variable.
(texlive-base): Use new name.
---
 gnu/packages/tex.scm | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c8b368710e..d586ce243f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4441,28 +4441,30 @@ external program.")
     ;; that says the package must be renamed from 'csplain' if it is modified.
     (license (license:non-copyleft "file:///tex/csplain/base/csplain.ini"))))
 
-(define-public texlive-generic-babel-english
+(define-public texlive-babel-english
   (package
-    (name "texlive-generic-babel-english")
+    (name "texlive-babel-english")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "generic" "babel-english"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1s404wbx91z5w65hm024kyl4h56zsa096irx18vsx8jvlmwsr5wc"))))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-english/"
+                   "source/generic/babel-english/"
+                   "tex/generic/babel-english/")
+             (base32
+              "0fh8xxxh79za80yvgypf8clzj0lk237lfyqfkl233id9rlias08d")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "generic/babel-english"))
-    (home-page "https://www.ctan.org/pkg/babel-english")
+    (home-page "https://ctan.org/pkg/babel-english")
     (synopsis "Babel support for English")
     (description
-     "This package provides the language definition file for support of
-English in @code{babel}.  Care is taken to select British hyphenation patterns
-for British English and Australian text, and default (\"american\") patterns
-for Canadian and USA text.")
+     "The package provides the language definition file for support of
+English in @code{babel}.  Care is taken to select british hyphenation patterns
+for British English and Australian text, and default (american) patterns for
+Canadian and USA text.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-generic-babel-english texlive-babel-english)
+
 (define-public texlive-babel-french
   (let ((template
          (simple-texlive-package
@@ -4773,7 +4775,7 @@ part of the LaTeX required set of packages.")
                 texlive-amsmath
                 texlive-amscls
                 texlive-babel
-                texlive-generic-babel-english
+                texlive-babel-english
                 texlive-cyrillic
                 texlive-psnfss
                 texlive-tools
-- 
cgit 1.4.1


From cf3b2f0772ad0960838f2b4dda986413b108e510 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 10:18:47 +0200
Subject: gnu: texlive-fonts-latex -> texlive-latex-fonts.

* gnu/packages/tex.scm (texlive-latex-fonts): New variable.
(texlive-fonts-latex): Deprecate variable.
(texlive-latex-base):
(texlive-base):
(texlive-polyglossia):
(texlive-jadetex):
(texlive-xetex): Use new name.
---
 gnu/packages/tex.scm | 162 +++++++++++++++++++++++++++------------------------
 1 file changed, 85 insertions(+), 77 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d586ce243f..7f7a3bd1df 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1459,80 +1459,88 @@ fonts.")
 
 (define-deprecated-package texlive-fonts-knuth-lib texlive-knuth-lib)
 
-(define-public texlive-fonts-latex
+(define-public texlive-latex-fonts
   (package
-    (name "texlive-fonts-latex")
+    (name "texlive-latex-fonts")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/fonts/source/public/latex-fonts"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0ypsm4xv9cw0jckk2qc7gi9hcmhf31mrg56pz3llyx3yd9vq2lps"))))
-    (build-system gnu-build-system)
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/latex-fonts/"
+                   "fonts/source/public/latex-fonts/"
+                   "fonts/tfm/public/latex-fonts/")
+             (base32
+              "1bzqzzhs15w7dqz90hfjnaffjqh24q14w2h1h8vnxzvrlsyv21vq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (arguments
-     `(#:modules ((guix build gnu-build-system)
-                  (guix build utils)
-                  (srfi srfi-1)
-                  (srfi srfi-26))
-       #:tests? #f                      ; no tests
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'build
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((mf (assoc-ref inputs "texlive-metafont")))
-               ;; Tell mf where to find mf.base
-               (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c"))
-               ;; Tell mf where to look for source files
-               (setenv "MFINPUTS"
-                       (string-append (getcwd) ":"
-                                      mf "/share/texmf-dist/metafont/base:"
-                                      (assoc-ref inputs "texlive-cm")
-                                      "/share/texmf-dist/fonts/source/public/cm")))
-             (mkdir "build")
-             (for-each (lambda (font)
-                         (format #t "building font ~a\n" font)
-                         (invoke "mf" "-progname=mf"
-                                 "-output-directory=build"
-                                 (string-append "\\"
-                                                "mode:=ljfour; "
-                                                "mag:=1; "
-                                                "batchmode; "
-                                                "input " font)))
-                       '("icmcsc10" "icmex10" "icmmi8" "icmsy8" "icmtt8"
-                         "ilasy8" "ilcmss8" "ilcmssb8" "ilcmssi8"
-                         "lasy5" "lasy6" "lasy7" "lasy8" "lasy9" "lasy10" "lasyb10"
-                         "lcircle10" "lcirclew10" "lcmss8" "lcmssb8" "lcmssi8"
-                         "line10" "linew10"))
-             #t))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (tfm (string-append
-                          out "/share/texmf-dist/fonts/tfm/public/latex-fonts"))
-                    (mf  (string-append
-                          out "/share/texmf-dist/fonts/source/public/latex-fonts")))
-               (for-each (cut install-file <> tfm)
-                         (find-files "build" "\\.*"))
-               (for-each (cut install-file <> mf)
-                         (find-files "." "\\.mf"))
-               #t))))))
+     (list
+      #:texlive-latex-base #f
+      #:modules
+      '((guix build texlive-build-system)
+        (guix build utils)
+        (srfi srfi-1)
+        (srfi srfi-26))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'generate-fonts-metrics
+            (lambda _
+              (let ((cm #$(this-package-native-input "texlive-cm"))
+                    (metafont #$(this-package-native-input "texlive-metafont"))
+                    (fonts-directories
+                     (delete-duplicates
+                      (map (lambda (f)
+                             (string-drop (dirname f) (string-length "./")))
+                           (find-files "." "[0-9]+\\.mf$"))))
+                    (root (getcwd)))
+                (mkdir-p "build")
+                ;; Tell mf where to find mf.base.
+                (setenv "MFBASES"
+                        (string-append metafont "/share/texmf-dist/web2c/"))
+                (for-each
+                 (lambda (directory)
+                   ;; Tell mf where to look for source files.
+                   (setenv "MFINPUTS"
+                           (string-append
+                            (getcwd) "/" directory ":"
+                            metafont "/share/texmf-dist/metafont/base/:"
+                            cm "/share/texmf-dist/fonts/source/public/cm/"))
+                   ;; Build font metrics (tfm).
+                   (with-directory-excursion directory
+                     (for-each (lambda (font)
+                                 (format #t "building font ~a\n" font)
+                                 (invoke "mf" "-progname=mf"
+                                         (string-append "-output-directory="
+                                                        root "/build")
+                                         (string-append "\\"
+                                                        "mode:=ljfour; "
+                                                        "mag:=1; "
+                                                        "batchmode; "
+                                                        "input "
+                                                        (basename font ".mf"))))
+                               (find-files "." "[0-9]+\\.mf$")))
+                   ;; Install font metrics at the appropriate location.
+                   (let ((destination
+                          ;; fonts/source/xxx/yyy/... -> fonts/tfm/xxx/yyy/...
+                          (string-append "fonts/tfm"
+                                         (string-drop
+                                          directory
+                                          (string-length "fonts/source")))))
+                     (format #t "moving font metrics in ~a\n" destination)
+                     (for-each (cut install-file <> destination)
+                               (find-files "build/" "\\.tfm$"))))
+                 fonts-directories)))))))
     (native-inputs
-     (list texlive-bin texlive-metafont texlive-cm))
-    (home-page "https://www.ctan.org/pkg/latex-fonts")
+     (list texlive-bin texlive-cm texlive-metafont))
+    (home-page "https://ctan.org/pkg/latex-fonts")
     (synopsis "Collection of fonts used in LaTeX distributions")
-    (description "This is a collection of fonts for use with standard LaTeX
-packages and classes. It includes invisible fonts (for use with the slides
-class), line and circle fonts (for use in the picture environment) and LaTeX
-symbol fonts.")
+    (description
+     "This is a collection of fonts for use with standard LaTeX packages and
+classes. It includes invisible fonts (for use with the slides class), line and
+circle fonts (for use in the picture environment) and LaTeX symbol fonts.")
     (license license:lppl1.2+)))
 
+(define-deprecated-package texlive-fonts-latex texlive-latex-fonts)
+
 (define-public texlive-mflogo
   (let ((template (simple-texlive-package
                    "texlive-mflogo"
@@ -3039,7 +3047,7 @@ formats.")
                                    dir)))
                                '(("texlive-etex" . "/etex")
                                  ("texlive-cm" . "/cm")
-                                 ("texlive-fonts-latex" . "/latex-fonts")
+                                 ("texlive-latex-fonts" . "/latex-fonts")
                                  ("texlive-knuth-lib" . "/knuth-lib")))
                           ":"))
                  (let ((cwd (getcwd)))
@@ -3126,7 +3134,7 @@ formats.")
          ("texlive-tex-plain" ,texlive-tex-plain)
          ("texlive-kpathsea" ,texlive-kpathsea)
          ("texlive-cm" ,texlive-cm)
-         ("texlive-fonts-latex" ,texlive-fonts-latex)
+         ("texlive-latex-fonts" ,texlive-latex-fonts)
          ("texlive-knuth-lib" ,texlive-knuth-lib)
          ("texlive-luatexconfig"
           ,(texlive-origin
@@ -4762,15 +4770,15 @@ part of the LaTeX required set of packages.")
 (define-public texlive-base
   (let ((default-packages
           (list texlive-bin
+                texlive-cm
+                texlive-cm-super        ; to avoid bitmap fonts
                 texlive-dvips
                 texlive-fontname
-                texlive-cm
-                texlive-cm-super ; to avoid bitmap fonts
-                texlive-fonts-latex
                 texlive-graphics
-                texlive-metafont
+                texlive-kpathsea        ;for mktex.opt
                 texlive-latex-base
-                texlive-kpathsea       ;for mktex.opt
+                texlive-latex-fonts
+                texlive-metafont
                 ;; LaTeX packages from the "required" set.
                 texlive-amsmath
                 texlive-amscls
@@ -6245,7 +6253,7 @@ also provides compacted versions of enumerate and itemize.")
                          texlive-context
                          texlive-fancyvrb
                          texlive-etoolbox
-                         texlive-fonts-latex
+                         texlive-latex-fonts
                          texlive-fontspec
                          texlive-hyperref
                          ;; TODO: Remove texlive-stringenc and
@@ -7885,7 +7893,7 @@ Simple Young tableaux.
        (list texlive-xmltex texlive-kpathsea)) ;for fmtutil.cnf template
       (native-inputs
        (list texlive-cm ;for cmex10 and others
-             texlive-fonts-latex ;for lasy6
+             texlive-latex-fonts        ;for lasy6
              ;; The t1cmr.fd file of texlive-latex-base refers to the ecrm font,
              ;; provided by the jknappen package collection.
              texlive-jknappen
@@ -12915,7 +12923,7 @@ itself may be shipped out to the DVI file.")
            texlive-firstaid
            texlive-hyphen-base
            texlive-latex-base
-           texlive-fonts-latex
+           texlive-latex-fonts
            texlive-l3backend
            texlive-l3kernel
            texlive-l3packages
-- 
cgit 1.4.1


From 86e7f7722053783ea4a14808a9c6d4cc63157e03 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 11:15:07 +0200
Subject: gnu: texlive-grffile: Fix build.

* gnu/packages/tex.scm (texlive-grffile)[source]: Set proper locations.
Remove `simple-texlive-package' call.
---
 gnu/packages/tex.scm | 46 ++++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7f7a3bd1df..3b1145d667 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4038,32 +4038,26 @@ the l3kernel and xparse bundles from the LaTeX 3 development team.")
 (define-deprecated-package texlive-latex-fontspec texlive-fontspec)
 
 (define-public texlive-grffile
-  (let ((template (simple-texlive-package
-                   "texlive-grffile"
-                   (list "/doc/latex/grffile/README.md"
-                         "/source/latex/grffile/grffile.dtx")
-                   (base32
-                    "1ib2n4d52faipvxdvdh4ar1p5j997h7cza26sfyd8z3qdf0naqgx"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "latex/grffile")
-         ((#:build-targets _ #t)
-          '(list "grffile.dtx"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/grffile/")))))))
-      (home-page "https://www.ctan.org/pkg/grffile")
-      (synopsis "Extended file name support for graphics (legacy package)")
-      (description
-       "The original grffile package extended the file name processing of the
-@code{graphics} package to support a larger range of file names.  The 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+))))
+  (package
+    (name "texlive-grffile")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/grffile/"
+                   "source/latex/grffile/"
+                   "tex/latex/grffile/")
+             (base32
+              "01mlvdhqwfwj1l91jfvkdfbn1hj95rlb6xhwikzx1r8qrz5whw7n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://www.ctan.org/pkg/grffile")
+    (synopsis "Extended file name support for graphics (legacy package)")
+    (description
+     "The original @code{grffile} package extended the file name processing
+of the @code{graphics} package to support a larger range of file names.  The
+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-stringenc
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From 9e4adea8adca392beaac705c10111639b8c51951 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 11:54:41 +0200
Subject: gnu: texlive-latex-geometry -> texlive-geometry.

* gnu/packages/tex.scm (texlive-geometry): New variable.
(texlive-latex-geometry): Deprecate variable.
(texlive-xindy):
* gnu/packages/chemistry.scm (yaehmop):
* gnu/packages/cran.scm (r-prereg):
* gnu/packages/graphviz.scm (dot2tex):
* gnu/packages/maths.scm (hypre):
* gnu/packages/plotutils.scm (asymptote):
* gnu/packages/python-xyz.scm (python-nbconvert):
* gnu/packages/sphinx.scm (python-sphinx): Use new name.
---
 gnu/packages/chemistry.scm  |  7 ++++---
 gnu/packages/cran.scm       |  2 +-
 gnu/packages/graphviz.scm   |  2 +-
 gnu/packages/maths.scm      |  2 +-
 gnu/packages/plotutils.scm  |  2 +-
 gnu/packages/python-xyz.scm |  2 +-
 gnu/packages/sphinx.scm     |  2 +-
 gnu/packages/tex.scm        | 31 +++++++++++++++++--------------
 8 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index cddccf8aea..b97703e810 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -899,9 +899,10 @@ emphasis on quality rather than speed.")
     (inputs (list openblas))
     (native-inputs
      (list gfortran
-           (texlive-updmap.cfg (list texlive-fonts-ec
-                                     texlive-graphics
-                                     texlive-latex-geometry))))
+           (texlive-updmap.cfg
+            (list texlive-fonts-ec
+                  texlive-geometry
+                  texlive-graphics))))
     (home-page "https://github.com/greglandrum/yaehmop")
     (synopsis "Perform extended Hückel calculations")
     (description "@acronym{YAeHMOP, Yet Another extended Hueckel Molecular
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 75ffc81bfd..4e3476222d 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -36197,7 +36197,7 @@ package online.")
             texlive-iftex
             texlive-fancyhdr
             texlive-fancyvrb
-            texlive-latex-geometry
+            texlive-geometry
             texlive-graphics
             texlive-latex-threeparttable
             texlive-titlesec
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 30dd6d3405..2f2a90461a 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -387,8 +387,8 @@ graphs in Graphviz's DOT language, written in pure Python.")
            ;; the resulting generated TeX files, which \usepackage them.
            texlive-bin
            texlive-amsmath
+           texlive-geometry
            texlive-graphics
-           texlive-latex-geometry
            texlive-latex-base
            texlive-latex-preview
            texlive-latex-xkeyval
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 87b2b9816e..f8cd4f385b 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5803,7 +5803,7 @@ set.")
                                      texlive-latex-float
                                      texlive-fncychap
                                      texlive-framed
-                                     texlive-latex-geometry
+                                     texlive-geometry
                                      texlive-hanging
                                      texlive-hyperref
                                      texlive-latex-multirow
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 57517c5bd2..20b08a74c2 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -311,7 +311,7 @@ colors, styles, options and details.")
                   texlive-epsf
                   texlive-etoolbox
                   texlive-fonts-ec
-                  texlive-latex-geometry
+                  texlive-geometry
                   texlive-graphics
                   texlive-grfext
                   texlive-hyperref
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0d2da17edc..100ad3647e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15187,7 +15187,7 @@ time.")
            texlive-hyperref
            texlive-fancyvrb
            texlive-latex-float
-           texlive-latex-geometry
+           texlive-geometry
            texlive-latex-jknapltx
            texlive-ms
            texlive-latex-parskip
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 42ddbade1e..df701f55f0 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -119,7 +119,7 @@
            texlive-latex-float
            texlive-fncychap
            texlive-framed
-           texlive-latex-geometry
+           texlive-geometry
            texlive-graphics                       ;graphicx, color
            texlive-kvoptions
            texlive-latex-needspace
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3b1145d667..dbda741838 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6017,22 +6017,23 @@ BibLaTeX, and is considered experimental.")
 
 (define-deprecated-package texlive-latex-gcite texlive-gcite)
 
-(define-public texlive-latex-geometry
+(define-public texlive-geometry
   (package
-    (name "texlive-latex-geometry")
+    (name "texlive-geometry")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "geometry"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0a9nrmiwksnpa6iaapirqid974ai56qgin2n4h9mggy9v8gp7r71"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/geometry/"
+                   "source/latex/geometry/"
+                   "tex/latex/geometry/")
+             (base32
+              "09jwdrg4s1c0gqmx7s57byw5kc09cna3li85y9ix0vxa6f6iqzi1")))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/geometry"))
+    (outputs '("out" "doc"))
     (propagated-inputs
-     (list texlive-oberdiek             ;for ifpdf
-           texlive-graphics))           ;for keyval
+     (list texlive-atbegshi
+           texlive-graphics             ;for keyval
+           texlive-iftex))
     (home-page "https://www.ctan.org/pkg/geometry")
     (synopsis "Flexible and complete interface to document dimensions")
     (description
@@ -6040,11 +6041,13 @@ BibLaTeX, and is considered experimental.")
 page layout, implementing auto-centering and auto-balancing mechanisms so that
 the users have only to give the least description for the page layout.  The
 package knows about all the standard paper sizes, so that the user need not
-know what the nominal \"real\" dimensions of the paper are, just its standard
+know what the nominal real dimensions of the paper are, just its standard
 name (such as a4, letter, etc.).  An important feature is the package's
 ability to communicate the paper size it's set up to the output.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-geometry texlive-geometry)
+
 (define-public texlive-latex-mdwtools
   (package
     (name "texlive-latex-mdwtools")
@@ -11730,7 +11733,7 @@ handle complex tests.")
                          texlive-hyperref
                          texlive-latex-base
                          texlive-cyrillic
-                         texlive-latex-geometry
+                         texlive-geometry
                          (texlive-updmap.cfg ;fonts
                           (list texlive-cbfonts
                                 texlive-lh
-- 
cgit 1.4.1


From e0b4cf6019f520aef4c3d0ea9858a8f1fa215d22 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 11:58:58 +0200
Subject: gnu: texlive-latex-mdwtools -> texlive-mdwtools.

* gnu/packages/tex.scm (texlive-mdwtools): New variable.
(texlive-latex-mdwtools): Deprecate variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dbda741838..8a83033a03 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6048,19 +6048,19 @@ ability to communicate the paper size it's set up to the output.")
 
 (define-deprecated-package texlive-latex-geometry texlive-geometry)
 
-(define-public texlive-latex-mdwtools
+(define-public texlive-mdwtools
   (package
-    (name "texlive-latex-mdwtools")
+    (name "texlive-mdwtools")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "mdwtools"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0caxs74hla28hc67csf5i5ahadx97w8vxh3mdmsprxbpd1mr7ssg"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mdwtools/"
+                   "source/latex/mdwtools/"
+                   "tex/latex/mdwtools/")
+             (base32
+              "08wyw0k6r3fv7vdgwbcpq9ckifldy17fzhpar51s1qn0yib93zdg")))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/mdwtools"))
+    (outputs '("out" "doc"))
     (home-page "https://www.ctan.org/pkg/mdwtools")
     (synopsis "Miscellaneous tools by Mark Wooding")
     (description
@@ -6068,10 +6068,13 @@ ability to communicate the paper size it's set up to the output.")
 starting with @code{@@}, macros to sanitize the OT1 encoding of the
 @code{cmtt} fonts; a @code{doafter} command; improved @code{footnote} support;
 @code{mathenv} for various alignment in maths; list handling; @code{mdwmath}
-which adds some minor changes to LaTeX maths; a rewrite of LaTeX's tabular and
-array environments; verbatim handling; and syntax diagrams.")
+which adds some minor changes to LaTeX maths; a rewrite of LaTeX's
+@code{tabular} and @code{array} environments; verbatim handling; and syntax
+diagrams.")
     (license license:gpl3+)))
 
+(define-deprecated-package texlive-latex-mdwtools texlive-mdwtools)
+
 (define-public texlive-makecmds
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 50ce21605abec4096730cd3d9b1d7b4c6e2e38d8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 12:03:52 +0200
Subject: gnu: texlive-latex-marginfix -> texlive-marginfix.

* gnu/packages/tex.scm (texlive-marginfix): New variable.
(texlive-latex-marginfix): Deprecate variable.
---
 gnu/packages/tex.scm | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8a83033a03..ff1b23bff6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6098,25 +6098,31 @@ always (re)defines a command.  There is also @code{\\makeenvironment} and
 @code{\\provideenvironment} for environments.")
     (license license:lppl1.3c+)))
 
-(define-public texlive-latex-marginfix
+(define-public texlive-marginfix
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-marginfix"
-              (list "doc/latex/marginfix/"
-                    "tex/latex/marginfix/")
-              (base32 "1qinf42mjry8bi5h3kgbi6hcymnk8fw0w43527wm95nc365dq0mf")
-              #:trivial? #t))
+    (name "texlive-marginfix")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/marginfix/"
+                   "source/latex/marginfix/"
+                   "tex/latex/marginfix/")
+             (base32
+              "0y6lmxm5ws2g0rqisvgdc8kg3whnvabrkl662sb4jvvaz02y3qdi")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/marginfix")
-    (synopsis "Patch \\marginpar to avoid overfull margins")
+    (synopsis "Patch @code{\\marginpar} to avoid overfull margins")
     (description
      "Authors using LaTeX to typeset books with significant margin material
 often run into the problem of long notes running off the bottom of the page.
-This package implements a solution to make marginpars ``just work'' by keeping
-a list of floating inserts and arranging them intelligently in the output
-routine.")
+This package implements a solution to make @code{marginpars} just work by
+keeping a list of floating inserts and arranging them intelligently in the
+output routine.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-marginfix texlive-marginfix)
+
 (define-public texlive-metalogo
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 8dba450404356e7259a7bd348dd80dfcdb9ecf91 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 12:06:35 +0200
Subject: gnu: texlive-latex-supertabular -> texlive-supertabular.

* gnu/packages/tex.scm (texlive-supertabular): New variable.
(texlive-latex-supertabular): Deprecate variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ff1b23bff6..6d42ea3c13 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6326,28 +6326,30 @@ separately).
 
 (define-deprecated-package texlive-latex-polyglossia texlive-polyglossia)
 
-(define-public texlive-latex-supertabular
+(define-public texlive-supertabular
   (package
-    (name "texlive-latex-supertabular")
+    (name "texlive-supertabular")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "supertabular"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "19fd0bqxjkzc16bza3w20pnsc90gbhbllm244b3h6sink4dlnn54"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/supertabular/"
+                   "source/latex/supertabular/"
+                   "tex/latex/supertabular/")
+             (base32
+              "1z4kyx20w2zvn6c5a7p702pxj254f2pwlk7x815gzlcc6563js6a")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/supertabular"))
     (home-page "https://www.ctan.org/pkg/supertabular")
     (synopsis "Multi-page tables package")
     (description
      "This package was a predecessor of @code{longtable}; the newer
 package (designed on quite different principles) is easier to use and more
-flexible, in many cases, but supertabular retains its usefulness in a few
-situations where longtable has problems.")
+flexible, in many cases, but @code{supertabular} retains its usefulness in
+a few situations where longtable has problems.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-supertabular texlive-supertabular)
+
 (define-public texlive-tex-texinfo
   (package
     (name "texlive-tex-texinfo")
-- 
cgit 1.4.1


From 9550a203618ff3cbc20381b1ac65b5ab7422661a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 12:09:15 +0200
Subject: gnu: texlive-latex-upquote -> texlive-upquote.

* gnu/packages/tex.scm (texlive-upquote): New variable.
(texlive-latex-upquote): Deprecate variable.
* gnu/packages/cran.scm (r-prereg):
* gnu/packages/maths.scm (hypre):
* gnu/packages/python-xyz.scm (python-nbconvert):
* gnu/packages/sphinx.scm (python-sphinx):
* gnu/packages/statistics.scm (r-with-tests): Use new name.
---
 gnu/packages/cran.scm       |  2 +-
 gnu/packages/maths.scm      |  2 +-
 gnu/packages/python-xyz.scm |  2 +-
 gnu/packages/sphinx.scm     |  2 +-
 gnu/packages/statistics.scm |  2 +-
 gnu/packages/tex.scm        | 30 ++++++++++++++++--------------
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 4e3476222d..2ef6da13f6 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -36201,7 +36201,7 @@ package online.")
             texlive-graphics
             texlive-latex-threeparttable
             texlive-titlesec
-            texlive-latex-upquote
+            texlive-upquote
             texlive-listings
             texlive-polyglossia
             texlive-titling
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index f8cd4f385b..a462a413ac 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5814,7 +5814,7 @@ set.")
                                      texlive-stackengine
                                      texlive-latex-tabulary
                                      texlive-tocloft
-                                     texlive-latex-upquote
+                                     texlive-upquote
                                      texlive-latex-varwidth
                                      texlive-titlesec
                                      texlive-ulem
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 100ad3647e..0165925c70 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15192,7 +15192,7 @@ time.")
            texlive-ms
            texlive-latex-parskip
            texlive-trimspaces
-           texlive-latex-upquote
+           texlive-upquote
            texlive-stringenc
            texlive-tcolorbox
            texlive-titling
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index df701f55f0..4e912ae252 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -128,7 +128,7 @@
            texlive-latex-tabulary
            texlive-titlesec
            texlive-tools                          ;multicol, longtable
-           texlive-latex-upquote
+           texlive-upquote
            texlive-latex-varwidth
            texlive-oberdiek             ;hypcap
            texlive-wrapfig
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 68206ea6a1..a1f96936e4 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -399,7 +399,7 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
                                      texlive-hyperref
                                      texlive-oberdiek
                                      texlive-tools
-                                     texlive-latex-upquote
+                                     texlive-upquote
                                      texlive-url
                                      texlive-latex-xkeyval))
            tzdata-for-tests
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6d42ea3c13..3b5b3d2db3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6413,26 +6413,26 @@ might say:
 @end example\n")
     (license license:lppl)))
 
-(define-public texlive-latex-upquote
+(define-public texlive-upquote
   (package
-    (name "texlive-latex-upquote")
+    (name "texlive-upquote")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "upquote"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0d1050i973wnxigy0xpky5l7vn4ff7ldhkjpdqsw5s653gagwixp"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/upquote/"
+                   "source/latex/upquote/"
+                   "tex/latex/upquote/")
+             (base32
+              "1manbljqx2859wq9by6bpcx4rnxvc596a05d21cw464484f8a8z2")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/upquote"))
     (home-page "https://www.ctan.org/pkg/upquote")
-    (synopsis "Show \"realistic\" quotes in verbatim")
+    (synopsis "Show realistic quotes in verbatim")
     (description
      "Typewriter-style fonts are best for program listings, but Computer
-Modern Typewriter prints @code{`} and @code{'} as bent opening and closing
-single quotes.  Other fonts, and most programming languages, print @code{`} as
-a grave accent and @code{'} upright; @code{'} is used both to open and to
+Modern Typewriter prints @samp{`} and @samp{'} as bent opening and closing
+single quotes.  Other fonts, and most programming languages, print @samp{`} as
+a grave accent and @samp{'} upright; @samp{'} is used both to open and to
 close quoted strings.  The package switches the typewriter font to Computer
 Modern Typewriter in OT1 encoding, and modifies the behaviour of
 @code{verbatim}, @code{verbatim*}, @code{\\verb}, and @code{\\verb*} to print
@@ -6441,6 +6441,8 @@ use, so long as the package is loaded after the other fonts were.  The package
 does not affect @code{\\tt}, @code{\\texttt}, etc.")
     (license license:lppl1.2+)))
 
+(define-deprecated-package texlive-latex-upquote texlive-upquote)
+
 (define-public texlive-latex-anysize
   (package
     (name "texlive-latex-anysize")
-- 
cgit 1.4.1


From 5c7700fc051b28bf9e8eb4a16f68f4a7c50152cb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 12:10:53 +0200
Subject: gnu: texlive-latex-anysize -> texlive-anysize.

* gnu/packages/tex.scm (texlive-anysize): New variable.
(texlive-latex-anysize): Deprecate variable.
* gnu/packages/docbook.scm (dblatex): Use new name.
---
 gnu/packages/docbook.scm |  2 +-
 gnu/packages/tex.scm     | 38 +++++++++++++-------------------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 070b957339..86c130860c 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -535,7 +535,7 @@ the in DocBook SGML DTDs.")
     ;; TODO: Add xfig/transfig for fig2dev utility
     (inputs
      `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
-                                             texlive-latex-anysize
+                                             texlive-anysize
                                              texlive-latex-appendix
                                              texlive-latex-bookmark
                                              texlive-latex-changebar
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3b5b3d2db3..b496dab8fd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6443,33 +6443,19 @@ does not affect @code{\\tt}, @code{\\texttt}, etc.")
 
 (define-deprecated-package texlive-latex-upquote texlive-upquote)
 
-(define-public texlive-latex-anysize
+(define-public texlive-anysize
   (package
-    (name "texlive-latex-anysize")
+    (name "texlive-anysize")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/anysize"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "19khwqjlvznc955sijhww3c4zbb0053rvzwv9nz738qknq7y18vb"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/anysize")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/anysize")
+    (source (texlive-origin
+             name version
+             (list "doc/latex/anysize/"
+                   "tex/latex/anysize/")
+             (base32
+              "155s0v82zpkmv97kwqhhfw52230hka9zl3wzjw1d5ayxd4n11bxq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/anysize")
     (synopsis "Simple package to set up document margins")
     (description
      "This is a simple package to set up document margins.  This package is
@@ -6477,6 +6463,8 @@ considered obsolete; alternatives are the @code{typearea} package from the
 @code{koma-script} bundle, or the @code{geometry} package.")
     (license license:public-domain)))
 
+(define-deprecated-package texlive-latex-anysize texlive-anysize)
+
 (define-public texlive-latex-appendix
   (package
     (name "texlive-latex-appendix")
-- 
cgit 1.4.1


From 48beed24ffe98092d1857f34201034db837ff15e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 12:12:44 +0200
Subject: gnu: texlive-latex-appendix -> texlive-appendix.

* gnu/packages/tex.scm (texlive-appendix): New variable.
(texlive-latex-appendix): Deprecate variable.
* gnu/packages/docbook.scm (dblatex): Use new name.
---
 gnu/packages/docbook.scm |  2 +-
 gnu/packages/tex.scm     | 36 +++++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 86c130860c..4ccae3f252 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -536,7 +536,7 @@ the in DocBook SGML DTDs.")
     (inputs
      `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
                                              texlive-anysize
-                                             texlive-latex-appendix
+                                             texlive-appendix
                                              texlive-latex-bookmark
                                              texlive-latex-changebar
                                              texlive-latex-colortbl
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b496dab8fd..dadc0165cf 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6465,28 +6465,30 @@ considered obsolete; alternatives are the @code{typearea} package from the
 
 (define-deprecated-package texlive-latex-anysize texlive-anysize)
 
-(define-public texlive-latex-appendix
+(define-public texlive-appendix
   (package
-    (name "texlive-latex-appendix")
+    (name "texlive-appendix")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "appendix"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1gc2brr2rs495w7qi6spdva1xrza94x7a36dncjdkghnsq8r92h4"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/appendix/"
+                   "source/latex/appendix/"
+                   "tex/latex/appendix/")
+             (base32
+              "1vqkqpzs7bc6pbjnafakrwayjyfx9mvadrqxccdf549m8172qvzk")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/appendix"))
-    (home-page "https://www.ctan.org/pkg/appendix")
+    (home-page "https://ctan.org/pkg/appendix")
     (synopsis "Extra control of appendices")
     (description
-     "The appendix package provides various ways of formatting the titles of
-appendices.  Also (sub)appendices environments are provided that can be used,
-for example, for per chapter/section appendices.  An @code{appendices}
-environment is provided which can be used instead of the @code{\\appendix}
-command.")
-    (license license:lppl)))
+     "The @code{appendix} package provides various ways of formatting the
+titles of appendices.  Also (sub)appendices environments are provided that can
+be used, for example, for per chapter/section appendices.  An
+@code{appendices} environment is provided which can be used instead of the
+@code{\\appendix} command.")
+    (license license:lppl1.3c)))
+
+(define-deprecated-package texlive-latex-appendix texlive-appendix)
 
 (define-public texlive-latex-bookmark
   (package
-- 
cgit 1.4.1


From 97188ba798edfbf490477746636faad24451ff45 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 13:57:03 +0200
Subject: gnu: Add texlive-atenddvi.

* gnu/packages/tex.scm (texlive-atenddvi): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dadc0165cf..5489aa9f9a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3228,6 +3228,33 @@ with the required packages, constitutes what every LaTeX distribution should
 contain.")
       (license license:lppl1.3c+))))
 
+(define-public texlive-atenddvi
+  (package
+    (name "texlive-atenddvi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/atenddvi/"
+                   "source/latex/atenddvi/"
+                   "tex/latex/atenddvi/")
+             (base32
+              "1fwa5233mdgvixhl2rzn9s06zz52j6ml7hfzd4194bn389n9syhk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-atbegshi texlive-zref))
+    (home-page "https://ctan.org/pkg/atenddvi")
+    (synopsis "Provide the @code{\\AtEndDvi} command for older LaTeX format")
+    (description
+     "This package is unneeded and does nothing when used with a LaTeX format
+2020-10-01 or newer as in this case the format provides the @code{\\AtEndDvi}
+command.  For older formats it implements @code{\\AtEndDvi}, a counterpart to
+@code{\\AtBeginDvi}.  The execution of its argument is delayed to the end of
+the document at the end of the last page.  Thus @code{\\special} and
+@code{\\write} remain effective, because they are put into the last page.
+This is the main difference to @code{\\AtEndDocument}.")
+    (license license:lppl1.3c+)))
+
 (define-public texlive-attachfile
   (package
     (name "texlive-attachfile")
-- 
cgit 1.4.1


From 6539f4e8cddab59283d638b41b4fea550b3258c8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 14:01:26 +0200
Subject: gnu: texlive-stringenc: Fix build.

* gnu/packages/tex.scm (texlive-stringenc): Remove `simple-texlive-package' call.
[source]: Add missing locations.
---
 gnu/packages/tex.scm | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5489aa9f9a..c17fcf8100 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4087,27 +4087,24 @@ default is a stub that just loads @code{graphicx}.")
     (license license:lppl1.3c+)))
 
 (define-public texlive-stringenc
-  (let ((template (simple-texlive-package
-                   "texlive-stringenc"
-                   (list "/doc/latex/stringenc/README.md"
-                         "/source/latex/stringenc/stringenc.dtx")
-                   (base32
-                    "19sfi5jxldxmy79pxmapmgmn3iknf8wjczasvlrrwv0gyycxdzhw"))))
-    (package
-      (inherit template)
-      (outputs '("doc" "out"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "generic/stringenc")
-         ((#:build-targets _ #t)
-          '(list "stringenc.dtx"))))
-      (home-page "https://www.ctan.org/pkg/stringenc")
-      (synopsis "Converting a string between different encodings")
-      (description
-       "This package provides @code{\\StringEncodingConvert} for converting a
+  (package
+    (name "texlive-stringenc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/stringenc/"
+                   "source/latex/stringenc/"
+                   "tex/generic/stringenc/")
+             (base32
+              "1pz9fgn3zc1brbpkw2kkphsv8q6vpvbn51n0smmfl1n2m97fni9j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/stringenc")
+    (synopsis "Converting a string between different encodings")
+    (description
+     "This package provides @code{\\StringEncodingConvert} for converting a
 string between different encodings.  Both LaTeX and plain-TeX are supported.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-public texlive-l3build
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From ab6566e6a1c3c344487af7d55b35a23df7ce9c03 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 15:49:05 +0200
Subject: gnu: texlive-latex-footmisc -> texlive-footmisc.

* gnu/packages/tex.scm (texlive-footmisc): New variable.
(texlive-latex-footmisc): Deprecate variable.
(texlive-latex-xkeyval):
* gnu/packages/docbook.scm (dblatex): Use new name.
---
 gnu/packages/docbook.scm |  2 +-
 gnu/packages/tex.scm     | 40 +++++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 4ccae3f252..8134191e38 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -544,7 +544,7 @@ the in DocBook SGML DTDs.")
                                              texlive-fancyhdr
                                              texlive-fancyvrb
                                              texlive-latex-float
-                                             texlive-latex-footmisc
+                                             texlive-footmisc
                                              texlive-hyperref
                                              texlive-latex-jknapltx
                                              texlive-listings
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c17fcf8100..056a4f8a32 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6694,20 +6694,20 @@ the obsolete @code{here} package.  You can select this as automatic default
 with @code{\\floatplacement{figure}{H}}.")
     (license license:lppl)))
 
-(define-public texlive-latex-footmisc
+(define-public texlive-footmisc
   (package
-    (name "texlive-latex-footmisc")
+    (name "texlive-footmisc")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "footmisc"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "03x61wwql8nh6zrqiiiq3rb0x7m3pn48c606zapy19y21fybwdxs"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/footmisc/"
+                   "source/latex/footmisc/"
+                   "tex/latex/footmisc/")
+             (base32
+              "1v1hkf0xcq6hyz3b32z3hvs53lmwrnkn79y9wxq6pqmhcgilqji3")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/footmisc"))
-    (home-page "https://www.ctan.org/pkg/footmisc")
+    (home-page "https://ctan.org/pkg/footmisc")
     (synopsis "Range of footnote options")
     (description
      "This is a collection of ways to change the typesetting of footnotes.
@@ -6718,6 +6718,8 @@ the same place.  The package also has a range of techniques for labelling
 footnotes with symbols rather than numbers.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-footmisc texlive-footmisc)
+
 (define-public texlive-letltxmacro
   (let ((template (simple-texlive-package
                    "texlive-letltxmacro"
@@ -10382,19 +10384,19 @@ environments, as well as the @code{array} environment in maths mode.")
                            "xkvutils.tex"))
                #t))))))
     (native-inputs
-     (list texlive-latex-base
-           texlive-cm
-           texlive-lm
-           texlive-url
+     (list texlive-cm
+           texlive-footmisc
            texlive-graphics-def
-           texlive-xcolor
-           texlive-latex-footmisc
            texlive-iftex
+           texlive-latex-base
            texlive-listings
-           texlive-pstricks
+           texlive-lm
+           texlive-pgf
            texlive-pst-text
+           texlive-pstricks
            texlive-tools
-           texlive-pgf))
+           texlive-url
+           texlive-xcolor))
     (home-page "http://www.ctan.org/pkg/xkeyval")
     (synopsis "Extension of the keyval package")
     (description
-- 
cgit 1.4.1


From 76819a965589b62f83acf083305ae412a9fd91e5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 15:59:14 +0200
Subject: gnu: texlive-fonts-ec -> texlive-ec.

* gnu/packages/tex.scm (texlive-ec): New variable.
(texlive-fonts-ec): Deprecate variable.
(lyx):
(biber):
* gnu/packages/python-xyz.scm (python-pypandoc):
* gnu/packages/statistics.scm (r-with-tests):
* doc/build.scm (pdf-manual):
* gnu/packages/bioinformatics.scm (discrover):
(phyml):
(velvet):
* gnu/packages/chemistry.scm (yaehmop):
* gnu/packages/chez.scm (stex-bootstrap):
* gnu/packages/ocaml.scm (unison):
(ocaml-bibtex2html):
* gnu/packages/plotutils.scm (asymptote): Use new name.
---
 doc/build.scm                   |   2 +-
 gnu/packages/bioinformatics.scm |   6 +-
 gnu/packages/chemistry.scm      |   2 +-
 gnu/packages/chez.scm           |   8 +--
 gnu/packages/ocaml.scm          |   4 +-
 gnu/packages/plotutils.scm      |   2 +-
 gnu/packages/python-xyz.scm     |   4 +-
 gnu/packages/statistics.scm     |   8 +--
 gnu/packages/tex.scm            | 128 +++++++++++++++++++---------------------
 9 files changed, 80 insertions(+), 84 deletions(-)

diff --git a/doc/build.scm b/doc/build.scm
index 0a5bddbcb6..995f4878e1 100644
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -915,7 +915,7 @@ makeinfo OPTIONS."
                      texlive-base
                      texlive-bin        ;for GUIX_TEXMF
                      texlive-epsf
-                     texlive-fonts-ec
+                     texlive-ec
                      texlive-tex-texinfo)))))
 
   (define build
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 22d2722538..6bb188c2c2 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4768,7 +4768,7 @@ data and settings.")
             (list texlive-cm
                   texlive-amsfonts
                   texlive-doi
-                  texlive-fonts-ec
+                  texlive-ec
                   texlive-latex-examplep
                   texlive-hyperref
                   texlive-ms
@@ -12106,8 +12106,8 @@ programs for inferring phylogenies (evolutionary trees).")
            (texlive-updmap.cfg (list texlive-amsfonts
                                      texlive-caption
                                      texlive-cite
+                                     texlive-ec
                                      texlive-fancyvrb
-                                     texlive-fonts-ec
                                      texlive-graphics
                                      texlive-grfext
                                      texlive-hyperref
@@ -17090,7 +17090,7 @@ to an artifact/contaminant file.")
      (list openmpi zlib))
     (native-inputs
      `(("texlive" ,(texlive-updmap.cfg (list texlive-graphics
-                                             texlive-fonts-ec
+                                             texlive-ec
                                              texlive-hyperref)))))
     (home-page "https://www.ebi.ac.uk/~zerbino/velvet/")
     (synopsis "Nucleic acid sequence assembler for very short reads")
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index b97703e810..44107e825a 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -900,7 +900,7 @@ emphasis on quality rather than speed.")
     (native-inputs
      (list gfortran
            (texlive-updmap.cfg
-            (list texlive-fonts-ec
+            (list texlive-ec
                   texlive-geometry
                   texlive-graphics))))
     (home-page "https://github.com/greglandrum/yaehmop")
diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index 2c8d53def8..b988b00fd7 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -760,11 +760,11 @@ Chez Scheme.")))
        (propagated-inputs
         (list xorg-rgb
               (texlive-updmap.cfg
-               (list texlive-l3backend
-                     texlive-hyperref
-                     texlive-bibtex
+               (list texlive-bibtex
+                     texlive-ec
                      texlive-epsf
-                     texlive-fonts-ec
+                     texlive-hyperref
+                     texlive-l3backend
                      texlive-oberdiek))
               ghostscript
               netpbm))
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index d3990bdd4d..9e399064c8 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1378,7 +1378,7 @@ libpanel, librsvg and quartz.")
        ;; For documentation
        ("ghostscript" ,ghostscript)
        ("texlive" ,(texlive-updmap.cfg
-                    (list texlive-fonts-ec texlive-l3backend)))
+                    (list texlive-ec texlive-l3backend)))
        ("hevea" ,hevea)
        ("lynx" ,lynx)
        ("which" ,which)))
@@ -10255,7 +10255,7 @@ SHA384, SHA512, Blake2b, Blake2s and RIPEMD160.")
     (native-inputs
      `(("which" ,which)
        ("texlive" ,(texlive-updmap.cfg
-                    (list texlive-fonts-ec texlive-preprint
+                    (list texlive-ec texlive-preprint
                           texlive-hyperref texlive-bibtex)))))
     (propagated-inputs
      (list hevea))
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 20b08a74c2..6e4256ea99 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -308,9 +308,9 @@ colors, styles, options and details.")
            texinfo                      ;for generating documentation
            (texlive-updmap.cfg
             (list texlive-amsfonts
+                  texlive-ec
                   texlive-epsf
                   texlive-etoolbox
-                  texlive-fonts-ec
                   texlive-geometry
                   texlive-graphics
                   texlive-grfext
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0165925c70..7edaf1dbc8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -29191,11 +29191,11 @@ By default it uses the open Python vulnerability database Safety DB.")
      `(("wheel" ,python-wheel)))
     (native-inputs
      `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
-                                        texlive-fonts-ec
+                                        texlive-ec
                                         texlive-iftex
                                         texlive-hyperref
-                                        texlive-oberdiek
                                         texlive-lm
+                                        texlive-oberdiek
                                         texlive-xcolor)))))
     (arguments
      `(#:phases
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index a1f96936e4..74a27cec89 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -389,14 +389,14 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
            pkg-config
            texinfo                      ; for building HTML manuals
            (texlive-updmap.cfg (list texlive-ae
-                                     texlive-inconsolata
-                                     texlive-fonts-ec
-                                     texlive-grfext
                                      texlive-amsfonts
-                                     texlive-latex-base
+                                     texlive-ec
                                      texlive-fancyvrb
                                      texlive-graphics
+                                     texlive-grfext
                                      texlive-hyperref
+                                     texlive-inconsolata
+                                     texlive-latex-base
                                      texlive-oberdiek
                                      texlive-tools
                                      texlive-upquote
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 056a4f8a32..8561525d28 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6882,69 +6882,64 @@ package options.")
 
 (define-deprecated-package texlive-latex-kvoptions texlive-kvoptions)
 
-(define-public texlive-fonts-ec
+(define-public texlive-ec
   (package
-    (name "texlive-fonts-ec")
+    (name "texlive-ec")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/fonts/source/jknappen/ec/"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "12av65fbz9xiashm09c9m1fj1mijxls5xspd7652ry1n5s0nixy4"))))
-    (build-system gnu-build-system)
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ec/"
+                   "fonts/source/jknappen/ec/"
+                   "fonts/tfm/jknappen/ec/")
+             (base32
+              "1cyi0vv9dnp45s0ilsrbkyznj9ji62s5bhkqgh49461mv2f8qj6p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (arguments
-     `(#:modules ((guix build gnu-build-system)
-                  (guix build utils)
-                  (srfi srfi-1)
-                  (srfi srfi-26))
-       #:tests? #f                      ; no tests
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'build
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((mf (assoc-ref inputs "texlive-metafont")))
-               ;; Tell mf where to find mf.base
-               (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c"))
-               ;; Tell mf where to look for source files
-               (setenv "MFINPUTS"
-                       (string-append (getcwd) ":"
-                                      mf "/share/texmf-dist/metafont/base:"
-                                      (assoc-ref inputs "texlive-cm")
-                                      "/share/texmf-dist/fonts/source/public/cm")))
-             (mkdir "build")
-             (for-each (lambda (font)
-                         (format #t "building font ~a\n" font)
-                         (invoke "mf" "-progname=mf"
-                                 "-output-directory=build"
-                                 (string-append "\\"
-                                                "mode:=ljfour; "
-                                                "mag:=1; "
-                                                "batchmode; "
-                                                "input " (basename font ".mf"))))
-                       (find-files "." "[0-9]+\\.mf$"))
-             #t))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (tfm (string-append
-                          out "/share/texmf-dist/fonts/tfm/jknappen/ec"))
-                    (mf  (string-append
-                          out "/share/texmf-dist/fonts/source/jknappen/ec")))
-               (for-each (cut install-file <> tfm)
-                         (find-files "build" "\\.*"))
-               (for-each (cut install-file <> mf)
-                         (find-files "." "\\.mf"))
-               #t))))))
+     (list
+      #:modules
+      '((guix build texlive-build-system)
+        (guix build utils)
+        (srfi srfi-1)
+        (srfi srfi-26))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 're-generate-fonts-metrics
+            (lambda _
+              (let ((mf #$(this-package-native-input "texlive-metafont"))
+                    (cm #$(this-package-native-input "texlive-cm"))
+                    (root (getcwd)))
+                (mkdir-p "build")
+                (with-directory-excursion "fonts/source/jknappen/ec"
+                  ;; Tell mf where to find mf.base.
+                  (setenv "MFBASES"
+                          (string-append mf "/share/texmf-dist/web2c"))
+                  ;; Tell mf where to look for source files.
+                  (setenv "MFINPUTS"
+                          (string-append
+                           (getcwd) ":"
+                           mf "/share/texmf-dist/metafont/base:"
+                           cm "/share/texmf-dist/fonts/source/public/cm"))
+                  ;; Build font metrics (tfm).
+                  (for-each (lambda (font)
+                              (format #t "building font ~a\n" font)
+                              (invoke "mf" "-progname=mf"
+                                      (string-append "-output-directory="
+                                                     root "/build")
+                                      (string-append "\\"
+                                                     "mode:=ljfour; "
+                                                     "mag:=1; "
+                                                     "batchmode; "
+                                                     "input "
+                                                     (basename font ".mf"))))
+                            (find-files "." "[0-9]+\\.mf$")))
+                ;; Install font metrics at the appropriate location.
+                (for-each
+                 (cut install-file <> "fonts/tfm/jknappen/ec")
+                 (find-files "build/" "\\.tfm$"))))))))
     (native-inputs
-     (list texlive-bin texlive-metafont texlive-cm))
-    (home-page "https://www.ctan.org/pkg/ec")
+     (list texlive-bin texlive-cm texlive-metafont))
+    (home-page "https://ctan.org/pkg/ec")
     (synopsis "Computer modern fonts in T1 and TS1 encodings")
     (description
      "The EC fonts are European Computer Modern Fonts, supporting the complete
@@ -6954,15 +6949,16 @@ files.  The set also contains a Text Companion Symbol font, called @code{tc},
 featuring many useful characters needed in text typesetting, for example
 oldstyle digits, currency symbols (including the newly created Euro symbol),
 the permille sign, copyright, trade mark and servicemark as well as a copyleft
-sign, and many others.  Recent releases of LaTeX2e support the EC fonts.  The
-EC fonts supersede the preliminary version released as the DC fonts.  The
-fonts are available in (traced) Adobe Type 1 format, as part of the
-@code{cm-super} bundle.  The other Computer Modern-style T1-encoded Type 1
-set, Latin Modern, is not actually a direct development of the EC set, and
-differs from the EC in a number of particulars.")
+sign, and many others.  The fonts are available in (traced) Adobe Type
+1 format, as part of the @code{cm-super} bundle.  The other Computer
+Modern-style T1-encoded Type 1 set, Latin Modern, is not actually a direct
+development of the EC set, and differs from the EC in a number of
+particulars.")
     (license (license:fsf-free "https://www.tug.org/svn/texlive/tags/\
 texlive-2019.3/Master/texmf-dist/doc/fonts/ec/copyrite.txt"))))
 
+(define-deprecated-package texlive-fonts-ec texlive-ec)
+
 ;; FIXME: the fonts should be built from source, but running "tex aefonts.tex"
 ;; fails with obscure TeX-typical error messages.
 (define-public texlive-ae
@@ -8944,7 +8940,7 @@ and Karl Berry.")
            qtsvg-5
            zlib))
     (propagated-inputs
-     (list (texlive-updmap.cfg (list texlive-fonts-ec))))
+     (list (texlive-updmap.cfg (list texlive-ec))))
     (native-inputs
      (list python pkg-config))
     (home-page "https://www.lyx.org/")
-- 
cgit 1.4.1


From 402f256f8132fd000b8c9dd74440b834c6599fd2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:02:47 +0200
Subject: gnu: texlive-latex-xkeyval -> texlive-xkeyval.

* gnu/packages/tex.scm (texlive-xkeyval): New variable.
(texlive-latex-xkeyval): Deprecate variable.
(texlive-bidi):
(texlive-pstool):
(texlive-polyglossia):
(texlive-zref):
(texlive-standalone):
(texlive-todonotes):
(texlive-adjustbox):
(texlive-qrcode):
(texlive-breakurl):
* gnu/packages/graphviz.scm (dot2tex):
* gnu/packages/statistics.scm (r-with-tests): Use new name.
---
 gnu/packages/graphviz.scm   |   6 +--
 gnu/packages/statistics.scm |   2 +-
 gnu/packages/tex.scm        | 123 ++++++++++++++++++--------------------------
 3 files changed, 54 insertions(+), 77 deletions(-)

diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 2f2a90461a..0ca518bc2d 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -385,16 +385,16 @@ graphs in Graphviz's DOT language, written in pure Python.")
      (list python-pyparsing
            ;; These TeX dependencies are propagated to make it easier to build
            ;; the resulting generated TeX files, which \usepackage them.
-           texlive-bin
            texlive-amsmath
+           texlive-bin
            texlive-geometry
            texlive-graphics
            texlive-latex-base
            texlive-latex-preview
-           texlive-latex-xkeyval
            texlive-pgf
            texlive-pstricks
-           texlive-xcolor))
+           texlive-xcolor
+           texlive-xkeyval))
     (home-page "https://github.com/kjellmf/dot2tex")
     (synopsis "Graphviz to LaTeX converter")
     (description
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 74a27cec89..b2045cdd3c 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -401,7 +401,7 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
                                      texlive-tools
                                      texlive-upquote
                                      texlive-url
-                                     texlive-latex-xkeyval))
+                                     texlive-xkeyval))
            tzdata-for-tests
            xz))
     (inputs
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8561525d28..ad8102d2eb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -641,7 +641,7 @@ This package contains the binaries.")
     (propagated-inputs (list texlive-iftex
                              texlive-ltxcmds
                              texlive-hyperref
-                             texlive-latex-xkeyval
+                             texlive-xkeyval
                              texlive-zref))
     (home-page "https://ctan.org/pkg/bidi")
     (synopsis "Bidirectional typesetting in plain TeX and LaTeX using XeTeX")
@@ -5528,7 +5528,7 @@ rotated.")
            texlive-psfrag
            texlive-tools                ; for shellesc
            texlive-trimspaces
-           texlive-latex-xkeyval))
+           texlive-xkeyval))
     (home-page "https://www.ctan.org/pkg/pstool")
     (synopsis "Process PostScript graphics within pdfLaTeX documents")
     (description
@@ -6314,7 +6314,7 @@ also provides compacted versions of enumerate and itemize.")
            texlive-makecmds
            texlive-l3packages           ;expl3, l3keys2e, xparse
            texlive-tools
-           texlive-latex-xkeyval))
+           texlive-xkeyval))
     (home-page "https://www.ctan.org/pkg/polyglossia")
     (synopsis "Alternative to Babel for XeLaTeX and LuaLaTeX")
     (description "This package provides a complete Babel replacement for users
@@ -7126,7 +7126,7 @@ format under XeTeX.")
                              texlive-atveryend
                              texlive-kvoptions
                              texlive-pdftexcmds
-                             texlive-latex-xkeyval))
+                             texlive-xkeyval))
     (home-page "https://github.com/ho-tex/zref")
     (synopsis "Reference scheme for LaTeX")
     (description "This package offers a means to remove the limitation, of
@@ -10325,76 +10325,51 @@ used in place of @code{tabular}, @code{tabular*} and @code{tabularx}
 environments, as well as the @code{array} environment in maths mode.")
       (license license:lppl1.3+))))
 
-(define-public texlive-latex-xkeyval
+(define-public texlive-xkeyval
   (package
-    (name "texlive-latex-xkeyval")
+    (name "texlive-xkeyval")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "xkeyval"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0w4x82wmdvcmy8z3p55xvpz5q7jac1q1j591hi8mngfyqa8rda1c"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xkeyval/"
+                   "source/latex/xkeyval/"
+                   "tex/generic/xkeyval/"
+                   "tex/latex/xkeyval/")
+             (base32
+              "0hcfqxbi907yi9jwq61i638n8g9abf6zc0aazk2lxzshy44h3ms1")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     '(#:tex-directory "latex/xkeyval"
-       #:build-targets '("xkeyval.dtx")
-       #:tex-format "latex" ; won't build with luatex
+     '(#:build-targets '("xkeyval.dtx")
+       #:tex-format "latex"             ;won't build with luatex
        #:phases
        (modify-phases %standard-phases
          ;; This package cannot be built out of tree as it expects to find
          ;; built files in the working directory.
          (add-before 'build 'fix-build
            (lambda _
-             (setenv "TEXINPUTS"
-                     (string-append (getcwd) "/build:"))
-             (substitute* "xkeyval.dtx"
+             (setenv "TEXINPUTS" (string-append (getcwd) "/build:"))
+             (substitute* "source/latex/xkeyval/xkeyval.dtx"
                (("usepackage\\{xcolor\\}")
-                "usepackage[dvips]{xcolor}"))
-             #t))
-         ;; FIXME: We don't have a package for this font yet.
-         (add-after 'unpack 'remove-dependency-on-fourier
-           (lambda _
-             (substitute* "xkeyval.dtx"
-               (("\\\\usepackage\\{fourier\\}") ""))
-             #t))
-         (add-after 'install 'move-files
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (share (string-append out "/share/texmf-dist"))
-                    (source (string-append share "/tex/latex/xkeyval/"))
-                    (target (string-append share "/tex/generic/xkeyval/")))
-               (mkdir-p target)
-               (for-each (lambda (file)
-                           (rename-file (string-append source file)
-                                        (string-append target file)))
-                         '("keyval.tex"
-                           "pst-xkey.tex"
-                           "xkeyval.tex"
-                           "xkvex1.tex"
-                           "xkvex2.tex"
-                           "xkvex3.tex"
-                           "xkvex4.tex"
-                           "xkvtxhdr.tex"
-                           "xkvutils.tex"))
-               #t))))))
+                "usepackage[dvips]{xcolor}")))))))
     (native-inputs
-     (list texlive-cm
-           texlive-footmisc
-           texlive-graphics-def
-           texlive-iftex
-           texlive-latex-base
-           texlive-listings
-           texlive-lm
-           texlive-pgf
-           texlive-pst-text
-           texlive-pstricks
-           texlive-tools
-           texlive-url
-           texlive-xcolor))
-    (home-page "http://www.ctan.org/pkg/xkeyval")
-    (synopsis "Extension of the keyval package")
+     (list (texlive-updmap.cfg
+            (list texlive-ec
+                  texlive-footmisc
+                  texlive-fourier
+                  texlive-graphics-def
+                  texlive-iftex
+                  texlive-listings
+                  texlive-lm
+                  texlive-pgf
+                  texlive-pst-text
+                  texlive-pstricks
+                  texlive-url
+                  texlive-xcolor))))
+    (propagated-inputs
+     (list texlive-tools))
+    (home-page "https://ctan.org/pkg/xkeyval")
+    (synopsis "Extension of the @code{keyval} package")
     (description
      "This package is an extension of the keyval package and offers additional
 macros for setting keys and declaring and setting class or package options.
@@ -10404,6 +10379,8 @@ all help use in documents where several packages define their own sets of
 keys.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-xkeyval texlive-xkeyval)
+
 (define-public texlive-standalone
   (package
     (name "texlive-standalone")
@@ -10419,7 +10396,7 @@ keys.")
     (build-system texlive-build-system)
     (arguments '(#:tex-directory "latex/standalone"))
     (propagated-inputs
-     (list texlive-latex-xkeyval))
+     (list texlive-xkeyval))
     (native-inputs
      (list texlive-ydoc))
     (home-page "http://www.ctan.org/pkg/standalone")
@@ -10619,7 +10596,7 @@ citations and references.")
     (package
       (inherit template)
       (propagated-inputs
-       (list texlive-pgf texlive-latex-xkeyval))
+       (list texlive-pgf texlive-xkeyval))
       (home-page "http://www.ctan.org/pkg/todonotes")
       (synopsis "Marking things to do in a LaTeX document")
       (description "The @code{todonotes} package lets the user mark
@@ -11378,12 +11355,12 @@ the list of graphics file extensions recognised by package graphics.")
       (native-inputs
        (list texlive-ydoc))
       (propagated-inputs
-       (list texlive-latex-varwidth
-             texlive-latex-xkeyval
-             texlive-collectbox
+       (list texlive-collectbox
              texlive-ifoddpage
+             texlive-pgf
              texlive-storebox
-             texlive-pgf))
+             texlive-latex-varwidth
+             texlive-xkeyval))
       (home-page "https://www.ctan.org/pkg/adjustbox")
       (synopsis "Graphics package-alike macros for “general” boxes")
       (description "The package provides several macros to adjust boxed
@@ -11412,14 +11389,14 @@ provided box macros are @code{\\lapbox}, @code{\\marginbox},
       #:tex-directory "latex/qrcode"))
     (propagated-inputs
      (list texlive-lm
-           texlive-latex-xkeyval
-           texlive-xcolor))
+           texlive-xcolor
+           texlive-xkeyval))
     (native-inputs
      (list (texlive-updmap.cfg (list texlive-lm texlive-zapfding))
            texlive-hyperref
-           texlive-latex-xkeyval
            texlive-stringenc
-           texlive-xcolor))
+           texlive-xcolor
+           texlive-xkeyval))
     (home-page "https://www.ctan.org/pkg/qrcode")
     (synopsis "QR codes without external tools")
     (description "This package creates @acronym{QR,Quick Response} codes for
@@ -12539,7 +12516,7 @@ both designated as support for @code{breqn}.")
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
-     (list texlive-iftex texlive-latex-xkeyval))
+     (list texlive-iftex texlive-xkeyval))
     (home-page "https://ctan.org/pkg/breakurl")
     (synopsis "Line-breakable links in @code{hyperref} for dvips/ps2pdf")
     (description
-- 
cgit 1.4.1


From c2cefad5c875f18ddc2ca9e2c3eddf33c6d1a93b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:08:32 +0200
Subject: gnu: texlive-zref: Fix build.

* gnu/packages/tex.scm (texlive-zref): Remove `simple-texlive-package' call.
[source]: Add missing location.
[description]: Shorten it.
---
 gnu/packages/tex.scm | 63 +++++++++++++++-------------------------------------
 1 file changed, 18 insertions(+), 45 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ad8102d2eb..3c7769ecb7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7110,23 +7110,24 @@ format under XeTeX.")
 
 (define-public texlive-zref
   (package
-    (inherit (simple-texlive-package
-              "texlive-zref"
-              (list "doc/latex/zref/"
-                    "source/latex/zref/")
-              (base32 "09l2wrqx0navislkx15iazv7jy0ip8bqaw3c0hjf0jy81kqrrm01")))
+    (name "texlive-zref")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/zref/" "source/latex/zref/"
+                   "tex/latex/zref/")
+             (base32
+              "1lc83d4qyqljfnf2m3jhq36f3f1yjbi71ys1hc11b9x2a46xk4pf")))
     (outputs '("out" "doc"))
-    (arguments
-     (list
-      #:build-targets #~(list "zref.dtx")
-      #:tex-directory "latex/zref"))
-    (propagated-inputs (list texlive-atbegshi
-                             texlive-gettitlestring
-                             texlive-iftex
-                             texlive-atveryend
-                             texlive-kvoptions
-                             texlive-pdftexcmds
-                             texlive-xkeyval))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-atbegshi
+           texlive-atveryend
+           texlive-gettitlestring
+           texlive-iftex
+           texlive-kvoptions
+           texlive-pdftexcmds
+           texlive-xkeyval))
     (home-page "https://github.com/ho-tex/zref")
     (synopsis "Reference scheme for LaTeX")
     (description "This package offers a means to remove the limitation, of
@@ -7134,35 +7135,7 @@ only two properties, that is inherent in the way LaTeX's reference system
 works.  The package implements an extensible referencing system, where
 properties may be defined and used in the course of a document.  It provides
 an interface for macro programmers to access the new reference scheme and some
-modules that use it.  Modules available are:
-@table @code
-@item zref-user
-use zref for traditional labels and references;
-@item zref-abspage
-retrieve absolute page numbers (physical pages, as opposed to the logical page
-number that is normally typeset when a page number is requested;
-@item zref-lastpage
-provide a zref-label for the last page of the document;
-@item zref-nextpage
-provide the page number of the next page of the document;
-@item zref-totpages
-provide the total number of pages in the document;
-@item zref-pagelayout
-provide the page layout parameters of a each page (which may then be printed
-at the end of the document);
-@item zref-perpage
-make a counter reset for each new page;
-@item zref-titleref
-make section title or caption text available through the reference system;
-@item zref-savepos
-make positions on a page available;
-@item zref-dotfill
-controlled dot-filling
-@item zref-env
-record the latest environment's name and the line it started on;
-@item zref-xr
-provide the facilities of the xr and xr-hyper packages.
-@end table")
+modules that use it.")
     (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-fonts-adobe-zapfding texlive-zapfding)
-- 
cgit 1.4.1


From ae465393d9fc9b08bfe08647456d0c7432b99e20 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:10:15 +0200
Subject: gnu: texlive-latex-bookmark -> texlive-bookmark.

* gnu/packages/tex.scm (texlive-bookmark): New variable.
(texlive-latex-bookmark): Deprecate variable.
* gnu/packages/docbook.scm (dblatex): Use new name.
---
 gnu/packages/docbook.scm |  2 +-
 gnu/packages/tex.scm     | 31 ++++++++++++++++++++++---------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 8134191e38..fcd45af32f 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -537,7 +537,7 @@ the in DocBook SGML DTDs.")
      `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
                                              texlive-anysize
                                              texlive-appendix
-                                             texlive-latex-bookmark
+                                             texlive-bookmark
                                              texlive-latex-changebar
                                              texlive-latex-colortbl
                                              texlive-latex-fancybox
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3c7769ecb7..6f948abcf7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6514,23 +6514,36 @@ be used, for example, for per chapter/section appendices.  An
 
 (define-deprecated-package texlive-latex-appendix texlive-appendix)
 
-(define-public texlive-latex-bookmark
+(define-public texlive-bookmark
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-bookmark"
-              (list "/doc/latex/bookmark/"
-                    "/tex/latex/bookmark/")
-              (base32
-               "0xwjdah0p4an0fknvgj9y5phl62sf522z6570pvy6c09hkz0j4h1")
-              #:trivial? #t))
+    (name "texlive-bookmark")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bookmark/"
+                   "source/latex/bookmark/"
+                   "tex/latex/bookmark/")
+             (base32
+              "111sjwabcbr8ry8fh94ywpzska032y8r4iz4waxa4kf5l3k0p4bs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:build-targets #~(list "bookmark.dtx")))
+    (propagated-inputs
+     (list texlive-atenddvi
+           texlive-atveryend
+           texlive-auxhook
+           texlive-hyperref))
     (home-page "https://www.ctan.org/pkg/bookmark")
-    (synopsis "Bookmark (outline) organization for hyperref")
+    (synopsis "Bookmark (outline) organization for @code{hyperref}")
     (description
      "This package implements a new bookmark (outline) organization for the
 @code{hyperref} package.  Bookmark properties such as style and color.  Other
 action types are available (URI, GoToR, Named).")
     (license license:lppl1.3c+)))
 
+(define-deprecated-package texlive-latex-bookmark texlive-bookmark)
+
 (define-public texlive-latex-changebar
   (package
     (name "texlive-latex-changebar")
-- 
cgit 1.4.1


From 1558776ae7d626cf8c6d63dac01555e14567a678 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:13:49 +0200
Subject: gnu: texlive-latex-changebar -> texlive-changebar.

* gnu/packages/tex.scm (texlive-changebar): New variable.
(texlive-latex-changebar): Deprecate variable.
* gnu/packages/docbook.scm (dblatex): Use new name.
---
 gnu/packages/docbook.scm |  2 +-
 gnu/packages/tex.scm     | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index fcd45af32f..770619b804 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -538,7 +538,7 @@ the in DocBook SGML DTDs.")
                                              texlive-anysize
                                              texlive-appendix
                                              texlive-bookmark
-                                             texlive-latex-changebar
+                                             texlive-changebar
                                              texlive-latex-colortbl
                                              texlive-latex-fancybox
                                              texlive-fancyhdr
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6f948abcf7..3390978bdf 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6544,29 +6544,31 @@ action types are available (URI, GoToR, Named).")
 
 (define-deprecated-package texlive-latex-bookmark texlive-bookmark)
 
-(define-public texlive-latex-changebar
+(define-public texlive-changebar
   (package
-    (name "texlive-latex-changebar")
+    (name "texlive-changebar")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "changebar"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "05x15ilynqrl448h8l6qiraygamdldlngz89a2bw7kg74fym14ch"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/changebar/"
+                   "source/latex/changebar/"
+                   "tex/latex/changebar/")
+             (base32
+              "0y32inrdpki6v3dwyymfglf78wbfd29b6xa8vjn337dr4gxlma85")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/changebar"))
     (home-page "https://www.ctan.org/pkg/changebar")
     (synopsis "Generate changebars in LaTeX documents")
     (description
      "Identify areas of text to be marked with changebars with the
 @code{\\cbstart} and @code{\\cbend} commands; the bars may be coloured.  The
-package uses @code{drivers} to place the bars; the available drivers can work
-with @code{dvitoln03}, @code{dvitops}, @code{dvips}, the emTeX and TeXtures DVI
+package uses drivers to place the bars; the available drivers can work with
+@code{dvitoln03}, @code{dvitops}, @code{dvips}, the emTeX and TeXtures DVI
 drivers, and VTeX and pdfTeX.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-changebar texlive-changebar)
+
 (define-public texlive-latex-cmap
   (package
     (name "texlive-latex-cmap")
-- 
cgit 1.4.1


From e5e13d03f03b60b26c0f3b231c31807ccf840273 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:15:07 +0200
Subject: gnu: texlive-latex-cmap -> texlive-cmap.

* gnu/packages/tex.scm (texlive-cmap): New variable.
(texlive-latex-cmap): Deprecate variable.
* gnu/packages/maths.scm (hypre):
* gnu/packages/sphinx.scm (python-sphinx): Use new name.
---
 gnu/packages/maths.scm  |  2 +-
 gnu/packages/sphinx.scm |  2 +-
 gnu/packages/tex.scm    | 41 ++++++++++++++---------------------------
 3 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index a462a413ac..6466d1b8c7 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5798,7 +5798,7 @@ set.")
                                      texlive-xcolor
                                      texlive-xypic
                                      texlive-listofitems
-                                     texlive-latex-cmap
+                                     texlive-cmap
                                      texlive-latex-colortbl
                                      texlive-latex-float
                                      texlive-fncychap
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 4e912ae252..906b05e979 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -113,7 +113,7 @@
            texlive-ltxcmds
            texlive-hyperref
            texlive-latex-base           ;alltt, atbegshi, makeidx, textcomp
-           texlive-latex-cmap
+           texlive-cmap
            texlive-fancyhdr
            texlive-fancyvrb
            texlive-latex-float
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3390978bdf..a1b70ac463 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6569,40 +6569,27 @@ drivers, and VTeX and pdfTeX.")
 
 (define-deprecated-package texlive-latex-changebar texlive-changebar)
 
-(define-public texlive-latex-cmap
+(define-public texlive-cmap
   (package
-    (name "texlive-latex-cmap")
+    (name "texlive-cmap")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/cmap"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0m4r52gw9vwsi1pzwh0cy03jxhwizymi4a2fj3jfs5rrvh105r5y"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/cmap")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.tug.org/svn/texlive/tags/texlive-2017.1/\
-Master/texmf-dist/tex/latex/cmap/")
-    (synopsis "CMap support for PDF files")
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cmap/"
+                   "tex/latex/cmap/")
+             (base32
+              "1hag26l3g9mpmmy1kn7lrnfzzr8k0hpm259qp087smggykvsjc4v")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cmap")
+    (synopsis "Make PDF files searchable and copyable")
     (description
      "This package embeds CMap tables into PDF files to make search and
 copy-and-paste functions work properly.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-cmap texlive-cmap)
+
 (define-public texlive-latex-colortbl
   (package
     (name "texlive-latex-colortbl")
-- 
cgit 1.4.1


From 51a55ec735606ee8ad7cf3051b1e0b09aaea8eb9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:17:13 +0200
Subject: gnu: texlive-latex-colortbl -> texlive-colortbl.

* gnu/packages/tex.scm (texlive-colortbl): New variable.
(texlive-latex-colortbl): Deprecate variable.
(texlive-jadetex):
* gnu/packages/docbook.scm (dblatex):
* gnu/packages/maths.scm (hypre): Use new name.
---
 gnu/packages/docbook.scm |  2 +-
 gnu/packages/maths.scm   |  2 +-
 gnu/packages/tex.scm     | 33 +++++++++++++++++++--------------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 770619b804..12da744453 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -539,7 +539,7 @@ the in DocBook SGML DTDs.")
                                              texlive-appendix
                                              texlive-bookmark
                                              texlive-changebar
-                                             texlive-latex-colortbl
+                                             texlive-colortbl
                                              texlive-latex-fancybox
                                              texlive-fancyhdr
                                              texlive-fancyvrb
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 6466d1b8c7..c859b1d97a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5799,7 +5799,7 @@ set.")
                                      texlive-xypic
                                      texlive-listofitems
                                      texlive-cmap
-                                     texlive-latex-colortbl
+                                     texlive-colortbl
                                      texlive-latex-float
                                      texlive-fncychap
                                      texlive-framed
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a1b70ac463..3785ec3cd3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6590,26 +6590,31 @@ copy-and-paste functions work properly.")
 
 (define-deprecated-package texlive-latex-cmap texlive-cmap)
 
-(define-public texlive-latex-colortbl
+(define-public texlive-colortbl
   (package
-    (name "texlive-latex-colortbl")
+    (name "texlive-colortbl")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "colortbl"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1qa0mh0fy9hcvfsmprv6q50q0qzdjjfbxi3axap26z6zg3qj68bc"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/colortbl/"
+                   "source/latex/colortbl/"
+                   "tex/latex/colortbl/")
+             (base32
+              "0fb4a5l3yqk6l5gr0hlkqwpy004wi8zymyicdzjyhqwcib4jnzjs")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/colortbl"))
-    (home-page "https://www.ctan.org/pkg/colortbl")
+    (propagated-inputs
+     (list texlive-graphics
+           texlive-tools))
+    (home-page "https://ctan.org/pkg/colortbl")
     (synopsis "Add colour to LaTeX tables")
     (description
-     "This package allows rows, columns, and even individual cells in LaTeX
-tables to be coloured.")
+     "The package allows rows and columns to be coloured, and even
+individual cells.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-colortbl texlive-colortbl)
+
 (define-public texlive-latex-fancybox
   (package
     (name "texlive-latex-fancybox")
@@ -7895,7 +7900,7 @@ Simple Young tableaux.
              ;; provided by the jknappen package collection.
              texlive-jknappen
              texlive-hyperref
-             texlive-latex-colortbl
+             texlive-colortbl
              texlive-fancyhdr
              texlive-graphics ;for color.sty
              texlive-tools ;for array.sty
-- 
cgit 1.4.1


From 30302ded0df49984b6c532af071633b968a0f48b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:18:14 +0200
Subject: gnu: texlive-latex-fancybox -> texlive-fancybox.

* gnu/packages/tex.scm (texlive-fancybox): New variable.
(texlive-latex-fancybox): Deprecate variable.
* gnu/packages/docbook.scm (dblatex): Use new name.
---
 gnu/packages/docbook.scm |  2 +-
 gnu/packages/tex.scm     | 40 ++++++++++++++--------------------------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 12da744453..709f45eda7 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -540,7 +540,7 @@ the in DocBook SGML DTDs.")
                                              texlive-bookmark
                                              texlive-changebar
                                              texlive-colortbl
-                                             texlive-latex-fancybox
+                                             texlive-fancybox
                                              texlive-fancyhdr
                                              texlive-fancyvrb
                                              texlive-latex-float
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3785ec3cd3..e2fe4c11a1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6615,34 +6615,20 @@ individual cells.")
 
 (define-deprecated-package texlive-latex-colortbl texlive-colortbl)
 
-(define-public texlive-latex-fancybox
+(define-public texlive-fancybox
   (package
-    (name "texlive-latex-fancybox")
+    (name "texlive-fancybox")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/fancybox"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0smmnaad2q8qwicay1frri990lv65l0k8cwzsvdsyp3jk8kp042w"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/fancybox")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/fancybox")
-    (synopsis "Variants of \\fbox and other games with boxes")
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fancybox/"
+                   "tex/latex/fancybox/")
+             (base32
+              "0pb1j0a1va8yhrzig7dwrd8jgq39mbcpygl810jhrv8pl473mfmn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fancybox")
+    (synopsis "Variants of @code{\\fbox} and other games with boxes")
     (description
      "This package provides variants of @code{\\fbox}: @code{\\shadowbox},
 @code{\\doublebox}, @code{\\ovalbox}, @code{\\Ovalbox}, with helpful tools for
@@ -6650,6 +6636,8 @@ using box macros and flexible verbatim macros.  You can box mathematics,
 floats, center, flushleft, and flushright, lists, and pages.")
     (license license:lppl1.2+)))
 
+(define-deprecated-package texlive-latex-fancybox texlive-fancybox)
+
 (define-public texlive-fancyhdr
   (let ((template (simple-texlive-package
                    "texlive-fancyhdr"
-- 
cgit 1.4.1


From bd12824e56cfcbf13fa9564c0efa42c3a9430d8b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:19:42 +0200
Subject: gnu: texlive-latex-float -> texlive-float.

* gnu/packages/tex.scm (texlive-float): New variable.
(texlive-latex-float): Deprecate variable.
(texlive-showexpl):
(texlive-minted):
(texlive-apa6):
* gnu/packages/docbook.scm (dblatex):
* gnu/packages/maths.scm (hypre):
* gnu/packages/python-xyz.scm (python-nbconvert):
* gnu/packages/sphinx.scm (python-sphinx): Use new name.
---
 gnu/packages/docbook.scm    |  2 +-
 gnu/packages/maths.scm      |  2 +-
 gnu/packages/python-xyz.scm |  2 +-
 gnu/packages/sphinx.scm     |  2 +-
 gnu/packages/tex.scm        | 41 +++++++++++++++++++++--------------------
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 709f45eda7..7ff920409e 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -543,7 +543,7 @@ the in DocBook SGML DTDs.")
                                              texlive-fancybox
                                              texlive-fancyhdr
                                              texlive-fancyvrb
-                                             texlive-latex-float
+                                             texlive-float
                                              texlive-footmisc
                                              texlive-hyperref
                                              texlive-latex-jknapltx
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index c859b1d97a..af8efd3ca3 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5800,7 +5800,7 @@ set.")
                                      texlive-listofitems
                                      texlive-cmap
                                      texlive-colortbl
-                                     texlive-latex-float
+                                     texlive-float
                                      texlive-fncychap
                                      texlive-framed
                                      texlive-geometry
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7edaf1dbc8..ceee6ba98a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15186,7 +15186,7 @@ time.")
            texlive-grffile
            texlive-hyperref
            texlive-fancyvrb
-           texlive-latex-float
+           texlive-float
            texlive-geometry
            texlive-latex-jknapltx
            texlive-ms
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 906b05e979..a69a8b44ed 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -116,7 +116,7 @@
            texlive-cmap
            texlive-fancyhdr
            texlive-fancyvrb
-           texlive-latex-float
+           texlive-float
            texlive-fncychap
            texlive-framed
            texlive-geometry
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e2fe4c11a1..16f6b71da9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5632,7 +5632,7 @@ user may consider the @code{dnaseq} as a rather more powerful alternative.")
     (build-system texlive-build-system)
     (propagated-inputs
      (list texlive-attachfile
-           texlive-latex-float
+           texlive-float
            texlive-graphics
            texlive-listings
            texlive-refcount
@@ -6665,30 +6665,31 @@ LaTeX would automatically change the heading style in use).")
 
 (define-deprecated-package texlive-latex-fancyhdr texlive-fancyhdr)
 
-(define-public texlive-latex-float
+(define-public texlive-float
   (package
-    (name "texlive-latex-float")
+    (name "texlive-float")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "float"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0nbl7wylkv22fcdv4p8byhhj575fli6jnqjpkhrkbv8dzwah84nq"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/float/"
+                   "source/latex/float/"
+                   "tex/latex/float/")
+             (base32
+              "1rfyvk1n83zsmrrp0x643052nrjb00cj935d2cpm37x4pz649f5d")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/float"))
-    (home-page "https://www.ctan.org/pkg/float")
+    (home-page "https://ctan.org/pkg/float")
     (synopsis "Improved interface for floating objects")
     (description
-     "This package improves the interface for defining floating objects such
-as figures and tables.  It introduces the boxed float, the ruled float and the
-plaintop float.  You can define your own floats and improve the behaviour of
-the old ones.  The package also provides the @code{H} float modifier option of
-the obsolete @code{here} package.  You can select this as automatic default
-with @code{\\floatplacement{figure}{H}}.")
+     "The @code{float} package improves the interface for defining floating
+objects such as figures and tables.  It introduces the boxed float, the ruled
+float and the plaintop float.  You can define your own floats and improve the
+behaviour of the old ones.  The package also provides the @samp{H} float
+modifier option of the obsolete @code{here} package.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-float texlive-float)
+
 (define-public texlive-footmisc
   (package
     (name "texlive-footmisc")
@@ -10657,7 +10658,7 @@ configuration of its own fixed names, using @file{.mld} files.")
       (propagated-inputs (list python-pygments
                                texlive-etoolbox
                                texlive-fancyvrb
-                               texlive-latex-float
+                               texlive-float
                                texlive-framed
                                texlive-fvextra
                                texlive-ifplatform
@@ -11878,7 +11879,7 @@ and selecting references used in a publication.")
                              texlive-fancyhdr
                              texlive-xstring
                              texlive-graphics
-                             texlive-latex-float
+                             texlive-float
                              texlive-lm
                              texlive-substr
                              texlive-times
-- 
cgit 1.4.1


From 17cdf29a9ce380a1ae9643d3d900876cb2b97f2e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:21:07 +0200
Subject: gnu: texlive-latex-frankenstein -> texlive-frankenstein.

* gnu/packages/tex.scm (texlive-frankenstein): New variable.
(texlive-latex-frankenstein): Deprecate variable.
---
 gnu/packages/tex.scm | 90 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 59 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 16f6b71da9..057a0f9883 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6744,45 +6744,73 @@ that also takes care of the involved internal macros.")
 
 (define-deprecated-package texlive-latex-letltxmacro texlive-letltxmacro)
 
-(define-public texlive-latex-frankenstein
+(define-public texlive-frankenstein
   (package
-    (name "texlive-latex-frankenstein")
+    (name "texlive-frankenstein")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference (url (string-append
-                                        "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/frankenstein"))
-                                  (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1zhdvn3zgdarlzfcyq8nzilvw0v0bqgl4m0y7j233cbqw8wiil4z"))))
-    (build-system trivial-build-system)
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/frankenstein/"
+                   "bibtex/bst/frankenstein/"
+                   "doc/latex/frankenstein/"
+                   "source/latex/frankenstein/"
+                   "tex/latex/frankenstein/")
+             (base32
+              "1x494vl4acl0bhfshs96ap8j47xk4m4njfincfhg2b0mi7l5mj1i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (arguments
-     `(#:modules ((guix build utils))
-       #:builder (begin
-                   (use-modules (guix build utils))
-                   (let ((target (string-append (assoc-ref %outputs "out")
-                                  "/share/texmf-dist/tex/latex/frankenstein")))
-                     (mkdir-p target)
-                     (copy-recursively (assoc-ref %build-inputs "source")
-                                       target) #t))))
+     (list
+      #:modules '((guix build texlive-build-system)
+                  (guix build utils)
+                  (ice-9 match))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'set-TEXINPUTS
+            ;; The ".ins" files strip comments from ".sty", turning them into
+            ;; faster ".stq" (and ".bsq") files.  Unfortunately, the ".ins"
+            ;; and the ".sty" files are not located in the same
+            ;; directory. This phase extends TEXINPUTS so everyone can see
+            ;; each other, including the docstrip utility.
+            (lambda* (#:key inputs #:allow-other-keys)
+              (setenv "TEXINPUTS"
+                      (let ((cwd (getcwd)))
+                        (string-append
+                         cwd "/tex/latex/frankenstein//:"
+                         cwd "/source/latex/frankenstein//:"
+                         (string-join
+                          (map (match-lambda ((_ . dir) dir)) inputs)
+                          "//:"))))))
+          (add-before 'install 'install-faster-files
+            (lambda _
+              ;; Replace ".sty" and ".bst" files with their faster
+              ;; counterpart.
+              (copy-file "build/achicago.bsq"
+                         "bibtex/bst/frankenstein/achicago.bst")
+              ;; "build/tex/.../xxx.stq" -> "tex/.../xxx.sty"
+              (for-each (lambda (file)
+                          (copy-file file
+                                     (string-append "tex/latex/frankenstein/"
+                                                    (basename file ".stq")
+                                                    ".sty")))
+                        (find-files "build/tex" "\\.stq$")))))))
+    (propagated-inputs
+     (list texlive-relsize texlive-tools texlive-url))
     (home-page "https://ctan.org/pkg/frankenstein")
-    (synopsis "Collection of unrelated LaTeX packages")
+    (synopsis "Collection of LaTeX packages")
     (description
-     "Frankenstein is a bundle of LaTeX packages serving various purposes and a
-BibTeX bibliography style.  The individual packages are: @code{abbrevs},
+     "Frankenstein is a bundle of LaTeX packages serving various purposes
+and a BibTeX bibliography style.  The individual packages are: @code{abbrevs},
 @code{achicago}, @code{achicago} bibstyle, @code{attrib}, @code{blkcntrl},
-@code{compsci}, @code{dialogue}, @code{lips}, @code{moredefs}, @code{newclude},
-@code{slemph} and @code{titles}.  Note: The installation follows the suboptimal
-``Quick and dirty'' recipe, rendering some features unavailable.")
-    ;; README mentions an unspecified version of GNU GPL and points to COPYING,
-    ;; which is missing. However, the individual files mention LPPL 1.2 or
-    ;; later.
+@code{compsci}, @code{dialogue}, @code{lips}, @code{moredefs},
+@code{newclude}, @code{slemph} and @code{titles}.")
+    ;; README mentions an unspecified version of GNU GPL and points to
+    ;; COPYING, which is missing. However, the individual files mention LPPL
+    ;; 1.2 or later.
     (license license:lppl1.2+)))
 
+(define-deprecated-package texlive-latex-frankenstein texlive-frankenstein)
+
 (define-public texlive-listings
   (let ((template
          (simple-texlive-package
-- 
cgit 1.4.1


From 70f6df6839ec8157a1c85704c5e7482448877599 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:22:19 +0200
Subject: gnu: texlive-latex-jknapltx -> texlive-jknapltx.

* gnu/packages/tex.scm (texlive-jknapltx): New variable.
(texlive-latex-jknapltx): Deprecate variable.
* gnu/packages/docbook.scm (dblatex):
* gnu/packages/python-xyz.scm (python-nbconvert): Use new name.
---
 gnu/packages/docbook.scm    |  2 +-
 gnu/packages/python-xyz.scm |  2 +-
 gnu/packages/tex.scm        | 46 ++++++++++++++++++---------------------------
 3 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 7ff920409e..b214dbc9df 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -546,7 +546,7 @@ the in DocBook SGML DTDs.")
                                              texlive-float
                                              texlive-footmisc
                                              texlive-hyperref
-                                             texlive-latex-jknapltx
+                                             texlive-jknapltx
                                              texlive-listings
                                              texlive-latex-multirow
                                              texlive-latex-overpic
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ceee6ba98a..c0c13a3734 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15188,7 +15188,7 @@ time.")
            texlive-fancyvrb
            texlive-float
            texlive-geometry
-           texlive-latex-jknapltx
+           texlive-jknapltx
            texlive-ms
            texlive-latex-parskip
            texlive-trimspaces
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 057a0f9883..33f2a46170 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6839,44 +6839,34 @@ styles.  Support for @code{hyperref} is provided.")
 
 (define-deprecated-package texlive-latex-listings texlive-listings)
 
-(define-public texlive-latex-jknapltx
+(define-public texlive-jknapltx
   (package
-    (name "texlive-latex-jknapltx")
+    (name "texlive-jknapltx")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/jknapltx"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0m034x72f2g07icr50gacyxfb9g1lz2rmqh4kqr1qjb421x2kds9"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/jknapltx")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/jknappen")
+    (source (texlive-origin
+             name version
+             (list "doc/latex/jknapltx/"
+                   "tex/latex/jknapltx/")
+             (base32
+              "0as43yqq123cacxhvp4sbdp4ka3cyp2spmxwayqny0fh5rsk6qaq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics))
+    (home-page "https://ctan.org/pkg/jknapltx")
     (synopsis "Miscellaneous packages by Joerg Knappen")
     (description
-     "This package provides miscellaneous macros by Joerg Knappen, including:
-represent counters in greek; Maxwell's non-commutative division;
+     "This package provides miscellaneous macros by Joerg Knappen,
+including: represent counters in greek; Maxwell's non-commutative division;
 @code{latin1jk}, @code{latin2jk} and @code{latin3jk}, which are
 @code{inputenc} definition files that allow verbatim input in the respective
 ISO Latin codes; blackboard bold fonts in maths; use of RSFS fonts in maths;
 extra alignments for @code{\\parboxes}; swap Roman and Sans fonts;
 transliterate semitic languages; patches to make (La)TeX formulae embeddable
 in SGML; use maths minus in text as appropriate; simple Young tableaux.")
-    (license license:gpl2)))
+    (license license:gpl3+)))
+
+(define-deprecated-package texlive-latex-jknapltx texlive-jknapltx)
 
 (define-public texlive-kvoptions
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From c7747de83e6327cd5eb21854ba2b57e107e13e63 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:27:01 +0200
Subject: gnu: texlive-latex-eepic -> texlive-eepic.

* gnu/packages/tex.scm (texlive-eepic): New variable.
(texlive-latex-eepic): Deprecate variable.
---
 gnu/packages/tex.scm | 53 +++++++++++++++++++++-------------------------------
 1 file changed, 21 insertions(+), 32 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 33f2a46170..9318456a88 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7254,43 +7254,32 @@ routine, which may be used to place the output at fixed positions.  The
 
 (define-deprecated-package texlive-latex-eso-pic texlive-eso-pic)
 
-(define-public texlive-latex-eepic
+(define-public texlive-eepic
   (package
-    (name "texlive-latex-eepic")
+    (name "texlive-eepic")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/eepic"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1c68gvh021pvybg07apsd2xhq2ljbg80kq94wh71drdga3c2zqjw"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/eepic")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/eepic/"
+                   "tex/latex/eepic/")
+             (base32
+              "16v8j3f8bgww9adddpfzpwd5q9kvak7xnp5kkvkrvhw8vshdspaa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics))
     (home-page "https://www.ctan.org/pkg/eepic")
-    (synopsis "Extensions to epic and the LaTeX drawing tools")
-    (description
-     "Extensions to @code{epic} and the LaTeX picture drawing environment,
-include the drawing of lines at any slope, the drawing of circles in any
-radii, and the drawing of dotted and dashed lines much faster with much less
-TeX memory, and providing several new commands for drawing ellipses, arcs,
-splines, and filled circles and ellipses.  The package uses @code{tpic}
-@code{\\special} commands.")
+    (synopsis "Extensions to @code{epic} and the LaTeX drawing tools")
+    (description
+     "This package provides extensions to @code{epic} and the LaTeX picture
+drawing environment.  It includes the drawing of lines at any slope, the
+drawing of circles in any radii, and the drawing of dotted and dashed lines
+much faster with much less TeX memory, and providing several new commands for
+drawing ellipses, arcs, splines, and filled circles and ellipses.")
     (license license:public-domain)))
 
+(define-deprecated-package texlive-latex-eepic texlive-eepic)
+
 (define-public texlive-latex-enotez
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 199201b11c5bf95b15414723c85070d8552ab7b2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:34:27 +0200
Subject: gnu: texlive-latex-translations -> texlive-translations.

* gnu/packages/tex.scm (texlive-translations): New variable.
(texlive-latex-translations): Deprecate variable.
---
 gnu/packages/tex.scm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9318456a88..79dbf93384 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11542,15 +11542,21 @@ are valid as arguments for the macros.  The package may be used under
 LaTeX and plain TeX.")
     (license (license:fsf-free "file:/binhex.dtx"))))
 
-(define-public texlive-latex-translations
+(define-public texlive-translations
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-translations"
+    (name "texlive-translations")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
               (list "doc/latex/translations/"
                     "tex/latex/translations/")
-              (base32 "0vl7ckpbkjvz3a5snzppb96ncwgmhpwb2p6cg30grfyn421kap3v")
-              #:trivial? #t))
+              (base32
+               "0vl7ckpbkjvz3a5snzppb96ncwgmhpwb2p6cg30grfyn421kap3v")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etoolbox
+           texlive-pdftexcmds))
     (home-page "https://ctan.org/pkg/translations")
     (synopsis "Internationalisation of LaTeX2e packages")
     (description
@@ -11565,6 +11571,8 @@ Danish and Portuguese from babel or polyglossia if either is in use in the
 document.")
     (license license:lppl1.3c+)))
 
+(define-deprecated-package texlive-latex-translations texlive-translations)
+
 (define-public texlive-translator
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 94d0e6c56a3474fd7a389e55365c9cfc653ea12e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:35:04 +0200
Subject: gnu: texlive-latex-enotez -> texlive-enotez.

* gnu/packages/tex.scm (texlive-enotez): New variable.
(texlive-latex-enotez): Deprecate variable.
---
 gnu/packages/tex.scm | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 79dbf93384..70d0c3804b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7280,15 +7280,21 @@ drawing ellipses, arcs, splines, and filled circles and ellipses.")
 
 (define-deprecated-package texlive-latex-eepic texlive-eepic)
 
-(define-public texlive-latex-enotez
+(define-public texlive-enotez
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-enotez"
-              (list "doc/latex/enotez/"
-                    "tex/latex/enotez/")
-              (base32 "1s1wyq6m5932gpbpvvkiw857q94jn1rp7xy9y7hysz9aafjqjyk2")
-              #:trivial? #t))
+    (name "texlive-enotez")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/enotez/"
+                   "tex/latex/enotez/")
+             (base32
+              "1s1wyq6m5932gpbpvvkiw857q94jn1rp7xy9y7hysz9aafjqjyk2")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-l3packages
+           texlive-translations))
     (home-page "https://ctan.org/pkg/enotez")
     (synopsis "Support for end-notes")
     (description
@@ -7296,6 +7302,8 @@ drawing ellipses, arcs, splines, and filled circles and ellipses.")
 provides means for easy customization of the list of notes.")
     (license license:lppl1.3c+)))
 
+(define-deprecated-package texlive-latex-enotez texlive-enotez)
+
 (define-public texlive-endnotes
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From f0a491f717f5719af4ece891ca5133da6ba36adf Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:36:02 +0200
Subject: gnu: texlive-latex-multirow -> texlive-multirow.

* gnu/packages/tex.scm (texlive-multirow): New variable.
(texlive-latex-multirow): Deprecate variable.
(texlive-metalogo):
* gnu/packages/docbook.scm (dblatex):
* gnu/packages/maths.scm (hypre): Use new name.
---
 gnu/packages/docbook.scm |  2 +-
 gnu/packages/maths.scm   |  2 +-
 gnu/packages/tex.scm     | 33 ++++++++++++++++++---------------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index b214dbc9df..bc576217e5 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -548,7 +548,7 @@ the in DocBook SGML DTDs.")
                                              texlive-hyperref
                                              texlive-jknapltx
                                              texlive-listings
-                                             texlive-latex-multirow
+                                             texlive-multirow
                                              texlive-latex-overpic
                                              texlive-pdfpages
                                              texlive-refcount
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index af8efd3ca3..7a98c05e29 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5806,7 +5806,7 @@ set.")
                                      texlive-geometry
                                      texlive-hanging
                                      texlive-hyperref
-                                     texlive-latex-multirow
+                                     texlive-multirow
                                      texlive-natbib
                                      texlive-latex-needspace
                                      texlive-newunicodechar
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 70d0c3804b..485d6cfe58 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6189,7 +6189,7 @@ output routine.")
                          texlive-latex-base
                          texlive-latex-eukdate
                          texlive-graphics
-                         texlive-latex-multirow
+                         texlive-multirow
                          texlive-lm     ;for lmroman10-regular
                          texlive-stix2-otf))
     (propagated-inputs (list texlive-fontspec texlive-iftex
@@ -7363,27 +7363,30 @@ on the loop variable, so that the package is equally applicable in graphics
 applications like PSTricks as it is with the more common integer loops.")
     (license license:lppl)))
 
-(define-public texlive-latex-multirow
+(define-public texlive-multirow
   (package
-    (name "texlive-latex-multirow")
+    (name "texlive-multirow")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "multirow"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1kak9i6nwz6vc4xjj6lbvkb69s49pis6qynjzvsjraxbdw28y2dq"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/multirow/"
+                   "source/latex/multirow/"
+                   "tex/latex/multirow/")
+             (base32
+              "18xnxqbkkzblngws1ydmkiwfrf9gvrriqrjpb6g6kmaxciwypqd6")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/multirow"))
-    (home-page "https://www.ctan.org/pkg/multirow")
+    (home-page "https://ctan.org/pkg/multirow")
     (synopsis "Create tabular cells spanning multiple rows")
     (description
-     "The package provides tools for creating tabular cells spanning multiple
-rows.  It has a lot of flexibility, including an option for specifying an
-entry at the \"natural\" width of its text.")
+     "The package has a lot of flexibility, including an option for specifying
+an entry at the natural width of its text.  The package is distributed with
+the @code{bigdelim} and @code{bigstrut} packages, which can be used to
+advantage with @code{\\multirow} cells.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-multirow texlive-multirow)
+
 (define-public texlive-latex-overpic
   (package
     (name "texlive-latex-overpic")
-- 
cgit 1.4.1


From fae2a0f07514be7c709781bdad7369a53c08350b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:39:53 +0200
Subject: gnu: texlive-latex-overpic -> texlive-overpic.

* gnu/packages/tex.scm (texlive-overpic): New variable.
(texlive-latex-overpic): Deprecate variable.
* gnu/packages/docbook.scm (dblatex): Use new name.
---
 gnu/packages/docbook.scm |  2 +-
 gnu/packages/tex.scm     | 39 +++++++++++++++------------------------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index bc576217e5..674186a9fa 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -549,7 +549,7 @@ the in DocBook SGML DTDs.")
                                              texlive-jknapltx
                                              texlive-listings
                                              texlive-multirow
-                                             texlive-latex-overpic
+                                             texlive-overpic
                                              texlive-pdfpages
                                              texlive-refcount
                                              texlive-subfigure
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 485d6cfe58..720548289a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7387,32 +7387,21 @@ advantage with @code{\\multirow} cells.")
 
 (define-deprecated-package texlive-latex-multirow texlive-multirow)
 
-(define-public texlive-latex-overpic
+(define-public texlive-overpic
   (package
-    (name "texlive-latex-overpic")
+    (name "texlive-overpic")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/overpic"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1ygsr0rsdabj61zask3346xrwiphz5i6f1nfb9k4d3234psh09kb"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/overpic")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/overpic/"
+                   "source/latex/overpic/"
+                   "tex/latex/overpic/")
+             (base32
+              "0z6jkn54b4yfk2ia8cxcb5is3qyg64r0na05ixd8xbirrks9ir7w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-eepic texlive-graphics))
     (home-page "https://www.ctan.org/pkg/overpic")
     (synopsis "Combine LaTeX commands over included graphics")
     (description
@@ -7423,6 +7412,8 @@ the included graphic.  LaTeX commands can be placed on the graphic at defined
 positions; a grid for orientation is available.")
     (license license:lppl1.0+)))
 
+(define-deprecated-package texlive-latex-overpic texlive-overpic)
+
 (define-public texlive-latex-parskip
   (package
     (name "texlive-latex-parskip")
-- 
cgit 1.4.1


From daf6f34c1e3d34dd515c153782aa51701a2bba62 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:42:51 +0200
Subject: gnu: texlive-latex-parskip -> texlive-parskip.

* gnu/packages/tex.scm (texlive-parskip): New variable.
(texlive-latex-parskip): Deprecate variable.
* gnu/packages/maths.scm (hypre):
* gnu/packages/plotutils.scm (asymptote):
* gnu/packages/python-xyz.scm (python-nbconvert):
* gnu/packages/sphinx.scm (python-sphinx): Use new name.
---
 gnu/packages/maths.scm      |  2 +-
 gnu/packages/plotutils.scm  |  2 +-
 gnu/packages/python-xyz.scm |  2 +-
 gnu/packages/sphinx.scm     |  2 +-
 gnu/packages/tex.scm        | 42 +++++++++++++++++-------------------------
 5 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 7a98c05e29..38d99ab2e5 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5810,7 +5810,7 @@ set.")
                                      texlive-natbib
                                      texlive-latex-needspace
                                      texlive-newunicodechar
-                                     texlive-latex-parskip
+                                     texlive-parskip
                                      texlive-stackengine
                                      texlive-latex-tabulary
                                      texlive-tocloft
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 6e4256ea99..6f052d2a04 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -323,7 +323,7 @@ colors, styles, options and details.")
                   texlive-latex-media9
                   texlive-oberdiek      ;for ifluatex
                   texlive-latex-ocgx2
-                  texlive-latex-parskip
+                  texlive-parskip
                   texlive-pdftexcmds
                   texlive-tex-texinfo))))
     (inputs
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c0c13a3734..66788cfa6f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15190,7 +15190,7 @@ time.")
            texlive-geometry
            texlive-jknapltx
            texlive-ms
-           texlive-latex-parskip
+           texlive-parskip
            texlive-trimspaces
            texlive-upquote
            texlive-stringenc
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index a69a8b44ed..97c05234ea 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -123,7 +123,7 @@
            texlive-graphics                       ;graphicx, color
            texlive-kvoptions
            texlive-latex-needspace
-           texlive-latex-parskip
+           texlive-parskip
            texlive-latex-preview
            texlive-latex-tabulary
            texlive-titlesec
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 720548289a..9650456b20 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7414,40 +7414,32 @@ positions; a grid for orientation is available.")
 
 (define-deprecated-package texlive-latex-overpic texlive-overpic)
 
-(define-public texlive-latex-parskip
+(define-public texlive-parskip
   (package
-    (name "texlive-latex-parskip")
+    (name "texlive-parskip")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/parskip"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1zll8jci8lsd7y44j567akf6y8fp2p7qq23rs527zhr0br9mn3sh"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/parskip")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/parskip/"
+                   "source/latex/parskip/"
+                   "tex/latex/parskip/")
+             (base32
+              "18yygddxv3kblvf4jhzqa8h1js0n8g1bw723r6ss2hlz4lj64kf0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etoolbox
+           texlive-kvoptions))
     (home-page "https://www.ctan.org/pkg/parskip")
-    (synopsis "Layout with zero \\parindent, non-zero \\parskip")
+    (synopsis "Layout with zero @code{\\parindent}, non-zero @code{\\parskip}")
     (description
      "Simply changing @code{\\parskip} and @code{\\parindent} leaves a layout
 that is untidy; this package (though it is no substitute for a properly
 designed class) helps alleviate this untidiness.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-parskip texlive-parskip)
+
 (define-public texlive-latex-pbox
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 87005d9aab364c462aef1b58e11dc231980de6bd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 13 May 2023 16:47:54 +0200
Subject: gnu: texlive-latex-pbox -> texlive-pbox.

* gnu/packages/tex.scm (texlive-pbox): New variable.
(texlive-latex-pbox): Deprecate variable.
---
 gnu/packages/tex.scm | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9650456b20..91b0d44e89 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7440,23 +7440,31 @@ designed class) helps alleviate this untidiness.")
 
 (define-deprecated-package texlive-latex-parskip texlive-parskip)
 
-(define-public texlive-latex-pbox
+(define-public texlive-pbox
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-pbox"
-              (list "doc/latex/pbox/"
-                    "tex/latex/pbox/")
-              (base32 "0902snjidmhjml01zcppcpp4j6pidin1sdvfi7gnbb5v86zd5f0n")
-              #:trivial? #t))
+    (name "texlive-pbox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pbox/"
+                   "source/latex/pbox/"
+                   "tex/latex/pbox/")
+             (base32
+              "104x4y22msgxhnlz2x331zq7rw28v129s5ym1jqhsk685izb3hcl")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-tools))
     (home-page "https://ctan.org/pkg/pbox")
-    (synopsis "\\parbox with a variable width")
+    (synopsis "@code{\\parbox} with a variable width")
     (description
-     "@code{pbox} defines a \\pbox{<max width>}{<text>} command which adjusts
-the box width to that of the enclosed text, up to the maximum width given.  The
-package also defines some associated length commands.")
+     "@code{pbox} defines a @code{\\pbox} command which adjusts the box width
+to that of the enclosed text, up to the maximum width given.  The package also
+defines some associated length commands.")
     (license license:gpl3+)))
 
+(define-deprecated-package texlive-latex-pbox texlive-pbox)
+
 (define-public texlive-pdfpages
   (let ((template (simple-texlive-package
                    "texlive-pdfpages"
-- 
cgit 1.4.1


From f9f02c5d471d4f308534c6bf965aa87d4ccd8411 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 10:22:41 +0200
Subject: gnu: texlive-latex-sidecap -> texlive-sidecap.

* gnu/packages/tex.scm (texlive-sidecap): New variable.
(texlive-latex-sidecap): Deprecate variable.
---
 gnu/packages/tex.scm | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 91b0d44e89..eb9b3b6914 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7532,24 +7532,32 @@ They combine a comprehensive Unicode-based collection of mathematical symbols
 and alphabets with a set of text faces suitable for professional publishing.")
       (license license:silofl1.1))))
 
-(define-public texlive-latex-sidecap
+(define-public texlive-sidecap
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-sidecap"
-              (list "doc/latex/sidecap/"
-                    "tex/latex/sidecap/")
-              (base32 "1biyxvh7fm70pq1rxqrla2vs013bpsd1j8jvlyl3vjg433d5bly3")
-              #:trivial? #t))
+    (name "texlive-sidecap")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sidecap/"
+                   "source/latex/sidecap/"
+                   "tex/latex/sidecap/")
+             (base32
+              "0bjb514a6j90ad7dgyyzrwk6pp7rlb3zk9mfy0fv5a615a5gz82x")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-ragged2e))
     (home-page "https://ctan.org/pkg/sidecap")
     (synopsis "Typeset captions sideways")
     (description
-     "@code{sidecap} defines environments called @code{SCfigure} and
-@code{SCtable} (analogous to @code{figure} and @code{table}) to typeset
+     "The @code{sidecap} package defines environments called @code{SCfigure}
+and @code{SCtable} (analogous to @code{figure} and @code{table}) to typeset
 captions sideways.  Options include @code{outercaption}, @code{innercaption},
 @code{leftcaption} and @code{rightcaption}.")
     (license license:lppl1.0+)))
 
+(define-deprecated-package texlive-latex-sidecap texlive-sidecap)
+
 (define-public texlive-stmaryrd
   (let ((template (simple-texlive-package
                    "texlive-stmaryrd"
-- 
cgit 1.4.1


From c81b4d6002d6942ffb24dc824eb47f9b3fe6d79e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 10:25:12 +0200
Subject: gnu: texlive-latex-tabulary -> texlive-tabulary.

* gnu/packages/tex.scm (texlive-tabulary): New variable.
(texlive-latex-tabulary): Deprecate variable.
* gnu/packages/maths.scm (hypre):
* gnu/packages/sphinx.scm (python-sphinx): Use new name.
---
 gnu/packages/maths.scm  |  2 +-
 gnu/packages/sphinx.scm |  2 +-
 gnu/packages/tex.scm    | 25 ++++++++++++++-----------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 38d99ab2e5..a61d790de0 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5812,7 +5812,7 @@ set.")
                                      texlive-newunicodechar
                                      texlive-parskip
                                      texlive-stackengine
-                                     texlive-latex-tabulary
+                                     texlive-tabulary
                                      texlive-tocloft
                                      texlive-upquote
                                      texlive-latex-varwidth
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 97c05234ea..69054efb50 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -125,7 +125,7 @@
            texlive-latex-needspace
            texlive-parskip
            texlive-latex-preview
-           texlive-latex-tabulary
+           texlive-tabulary
            texlive-titlesec
            texlive-tools                          ;multicol, longtable
            texlive-upquote
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index eb9b3b6914..65bbd125da 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7655,20 +7655,21 @@ the more recent @code{subcaption} package more satisfactory.")
 
 (define-deprecated-package texlive-latex-subfigure texlive-subfigure)
 
-(define-public texlive-latex-tabulary
+(define-public texlive-tabulary
   (package
-    (name "texlive-latex-tabulary")
+    (name "texlive-tabulary")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "tabulary"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1adkdx2zkk42g82nqf57lv1nc1z7kwl13jmy8vpcsizsa0xdnx9n"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tabulary/" "source/latex/tabulary/"
+                   "tex/latex/tabulary/")
+             (base32
+              "00afi9r5264rhfy5kg73fk763i7wm6bvzkmrlg7n17fwl6hx0sa1")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/tabulary"))
-    (home-page "https://www.ctan.org/pkg/tabulary")
+    (propagated-inputs
+     (list texlive-tools))
+    (home-page "https://ctan.org/pkg/tabulary")
     (synopsis "Tabular with variable width columns balanced")
     (description
      "The package defines a @code{tabular*}-like environment, @code{tabulary},
@@ -7680,6 +7681,8 @@ variable width columns (@code{\\raggedright}, @code{\\centering},
 according to the natural width of the widest cell in the column.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-tabulary texlive-tabulary)
+
 (define-public texlive-latex-threeparttable
   (package
     (name "texlive-latex-threeparttable")
-- 
cgit 1.4.1


From 06bc5b28b0f512b5f1c05e680d9db73334a33c46 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 10:28:34 +0200
Subject: gnu: texlive-latex-threeparttable -> texlive-threeparttable.

* gnu/packages/tex.scm (texlive-threeparttable): New variable.
(texlive-latex-threeparttable): Deprecate variable.
* gnu/packages/cran.scm (r-prereg)[propagated-inputs]: Use new name.  Re-order alphabetically.
---
 gnu/packages/cran.scm | 56 +++++++++++++++++++++++++--------------------------
 gnu/packages/tex.scm  | 39 +++++++++++++----------------------
 2 files changed, 42 insertions(+), 53 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 2ef6da13f6..c4276ea147 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -36179,40 +36179,40 @@ package online.")
     (name "r-prereg")
     (version "0.6.0")
     (source
-      (origin
-        (method url-fetch)
-        (uri (cran-uri "prereg" version))
-        (sha256
-          (base32
-            "039nrl5cirsx1ysh214dr6xnn1h6h3f90im6k9dgmzfksxdqigpw"))))
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "prereg" version))
+       (sha256
+        (base32
+         "039nrl5cirsx1ysh214dr6xnn1h6h3f90im6k9dgmzfksxdqigpw"))))
     (properties `((upstream-name . "prereg")))
     (build-system r-build-system)
     (propagated-inputs
-      (list r-rmarkdown
-            ;; The package provides a custom LaTex template in
-            ;; inst/rmd/prereg_form.tex, which depends on these packages:
-            texlive-amsmath
-            texlive-booktabs
-            texlive-etoolbox
-            texlive-iftex
-            texlive-fancyhdr
-            texlive-fancyvrb
-            texlive-geometry
-            texlive-graphics
-            texlive-latex-threeparttable
-            texlive-titlesec
-            texlive-upquote
-            texlive-listings
-            texlive-polyglossia
-            texlive-titling
-            texlive-tools
-            texlive-ulem
-            (texlive-updmap.cfg (list texlive-amsfonts texlive-lm))))
+     (list r-rmarkdown
+           ;; The package provides a custom LaTex template in
+           ;; inst/rmd/prereg_form.tex, which depends on these packages:
+           texlive-amsmath
+           texlive-booktabs
+           texlive-etoolbox
+           texlive-fancyhdr
+           texlive-fancyvrb
+           texlive-geometry
+           texlive-graphics
+           texlive-iftex
+           texlive-listings
+           texlive-polyglossia
+           texlive-threeparttable
+           texlive-titlesec
+           texlive-titling
+           texlive-tools
+           texlive-ulem
+           texlive-upquote
+           (texlive-updmap.cfg (list texlive-amsfonts texlive-lm))))
     (home-page "https://github.com/crsh/prereg")
     (synopsis
-      "R Markdown Templates to preregister Scientific Studies")
+     "R Markdown Templates to preregister Scientific Studies")
     (description
-      "This package provides a collection of templates to author
+     "This package provides a collection of templates to author
 preregistration documents for scientific studies in PDF format.")
     (license license:gpl3)))
 
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 65bbd125da..7b46971bc8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7683,33 +7683,22 @@ according to the natural width of the widest cell in the column.")
 
 (define-deprecated-package texlive-latex-tabulary texlive-tabulary)
 
-(define-public texlive-latex-threeparttable
+(define-public texlive-threeparttable
   (package
-    (name "texlive-latex-threeparttable")
+    (name "texlive-threeparttable")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/threeparttable"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "10vy9k150w2lviw8h22s2mcykff38xci653m5823s2vv44pwbmzq"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/threeparttable")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/threeparttable")
+    (source (texlive-origin
+             name version
+             (list "doc/latex/threeparttable/"
+                   "tex/latex/threeparttable/")
+             (base32
+              "05i50k1y736m52903nz4kf2xl23w6y7rrzyacs4kgd1w6kmjm6f7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-bookmark
+           texlive-hyperref))
+    (home-page "https://ctan.org/pkg/threeparttable")
     (synopsis "Tables with captions and notes all the same width")
     (description
      "This package facilitates tables with titles (captions) and notes.  The
-- 
cgit 1.4.1


From 8844e6072f61e2f32ff283efdf4fe1caf366d2c7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 10:32:49 +0200
Subject: gnu: texlive-latex-type1cm -> texlive-type1cm.

* gnu/packages/tex.scm (texlive-type1cm): New variable.
(texlive-latex-type1cm): Deprecate variable.
*
gnu/packages/python-xyz.scm (python-matplotlib-documentation)[native-inputs]:
Use new name.  Re-order alphabetically.
---
 gnu/packages/python-xyz.scm | 16 ++++++++--------
 gnu/packages/tex.scm        | 34 ++++++++++++++++------------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 66788cfa6f..60e0ed3d65 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8032,26 +8032,26 @@ toolkits.")
      (list graphviz
            inkscape/stable
            python-colorspacious
+           python-ipython
+           python-ipywidgets
            python-mpl-sphinx-theme
+           python-numpydoc
            python-scipy
            python-sphinx
            python-sphinx-copybutton
            python-sphinx-gallery
            python-sphinxcontrib-svg2pdfconverter
-           python-numpydoc
-           python-ipython
-           python-ipywidgets
+           texinfo
            texlive-amsfonts
            texlive-amsmath
            texlive-babel
+           texlive-etoolbox
            texlive-expdlist
            texlive-fontspec
-           texlive-unicode-math
-           texlive-etoolbox
-           texlive-underscore
-           texlive-latex-type1cm
            texlive-times
-           texinfo))
+           texlive-type1cm
+           texlive-underscore
+           texlive-unicode-math))
     (synopsis "Documentation for the @code{python-matplotlib} package")))
 
 (define-public python-matplotlib-inline
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7b46971bc8..a7388a5625 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7996,35 +7996,33 @@ floats in a page.  You may assign headers/footers to individual floats, too.")
 
 (define-deprecated-package texlive-latex-titlesec texlive-titlesec)
 
-(define-public texlive-latex-type1cm
+(define-public texlive-type1cm
   (package
-    (name "texlive-latex-type1cm")
+    (name "texlive-type1cm")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "type1cm"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1lvxrqfwcwa4p31zyfm80gr05v8c28xybv5ri79zi2ngz6834z12"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/type1cm/" "source/latex/type1cm/"
+                   "tex/latex/type1cm/")
+             (base32
+              "1922af5xvhrh4l8rqwz3bjd1gqvzfkxrfim28rpnvbx4n7jl6sdh")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/type1cm"))
-    (home-page "https://www.ctan.org/pkg/type1cm")
+    (home-page "https://ctan.org/pkg/type1cm")
     (synopsis "Arbitrary size font selection in LaTeX")
     (description
      "LaTeX, by default, restricts the sizes at which you can use its default
 computer modern fonts, to a fixed set of discrete sizes (effectively, a set
 specified by Knuth).  The @code{type1cm} package removes this restriction;
-this is particularly useful when using scalable versions of the CM
+this is particularly useful when using scalable versions of the @code{cm}
 fonts (Bakoma, or the versions from BSR/Y&Y, or True Type versions from Kinch,
-PCTeX, etc.).  In fact, since modern distributions will automatically generate
-any bitmap font you might need, @code{type1cm} has wider application than just
-those using scalable versions of the fonts.  Note that the LaTeX distribution
-now contains a package @code{fix-cm},f which performs the task of
-@code{type1cm}, as well as doing the same job for T1- and TS1-encoded
-@code{ec} fonts.")
+PCTeX, etc.).  Note that the LaTeX distribution now contains a package
+@code{fix-cm}, which performs the task of @code{type1cm}, as well as doing the
+same job for T1- and TS1-encoded @code{ec} fonts.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-type1cm texlive-type1cm)
+
 (define-public texlive-lh
   (let ((template (simple-texlive-package
                    "texlive-lh"
-- 
cgit 1.4.1


From 0bea37aae7a5b3a88602041a88a38bc4ecb2d337 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 11:14:52 +0200
Subject: gnu: texlive-booktabs: Fix build.

* gnu/packages/tex.scm (texlive-booktabs)[source]: Use TEXLIVE-ORIGIN
instead of TEXLIVE-REF and SVN-FETCH.
---
 gnu/packages/tex.scm | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a7388a5625..f5460553bc 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10424,17 +10424,15 @@ package to handle all of the possible unit-related needs of LaTeX users.")
   (package
     (name "texlive-booktabs")
     (version (number->string %texlive-revision))
-    (source
-     (origin
-       (method svn-fetch)
-       (uri (texlive-ref "latex" "booktabs"))
-       (file-name (string-append name "-" version "-checkout"))
-       (sha256
-        (base32
-         "1mycxzl761p2zzmva8xsjbxbvrxx3vhi5p160mh9kiqwhrs5biz5"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/booktabs/" "source/latex/booktabs/"
+                   "tex/latex/booktabs/")
+             (base32
+              "0pv2kv4hgayqfcij2sz1jmk6kbxqccyaksz8xlw5kvqrbag9vxm3")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/booktabs"))
-    (home-page "http://www.ctan.org/pkg/booktabs")
+    (home-page "https://ctan.org/pkg/booktabs")
     (synopsis "Publication quality tables in LaTeX")
     (description
      "This package enhances the quality of tables in LaTeX, providing extra
-- 
cgit 1.4.1


From 626d67e657042d98d02236159b2dc0b0a2c696d3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 11:20:42 +0200
Subject: gnu: texlive-ifmtarg: Fix build.

* gnu/packages/tex.scm (texlive-ifmtarg): Remove `simple-texlive-package'
call. Add missing location.
---
 gnu/packages/tex.scm | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f5460553bc..3c24310045 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11134,28 +11134,27 @@ floats merely delays the arrival of the inevitable error message.")
       (license license:lppl1.3c+))))
 
 (define-public texlive-ifmtarg
-  (let ((template (simple-texlive-package
-                   "texlive-ifmtarg"
-                   (list "/doc/latex/ifmtarg/"
-                         "/source/latex/ifmtarg/")
-                   (base32
-                    "0cwjn4bhq9zyfxr1595hgyc1d7rcsf9lva55x98q81xy5xrrmrb2"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/ifmtarg")
-         ((#:build-targets _ '())
-          ''("ifmtarg.ins"))
-         ((#:tex-format _ "latex") "latex")))
-      (inputs
-       (list texlive-filecontents))
-      (home-page "https://www.ctan.org/pkg/ifmtarg")
-      (synopsis "If-then-else command for processing potentially empty arguments")
-      (description "This package provides a command for the LaTeX programmer for
-testing whether an argument is empty.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-ifmtarg")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ifmtarg/" "source/latex/ifmtarg/"
+                   "tex/latex/ifmtarg/")
+             (base32
+              "19bfi12j5ra19k6vjd1q5fjsm68vipa7ida7pg9pf15l5pxwbgqz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:tex-format "latex"))
+    (native-inputs
+     (list texlive-filecontents))
+    (home-page "https://ctan.org/pkg/ifmtarg")
+    (synopsis "If-then-else command for processing potentially empty arguments")
+    (description
+     "This package provides a command for the LaTeX programmer for testing
+whether an argument is empty.")
+    (license license:lppl1.3c+)))
 
 (define-public texlive-pagenote
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From d4c175e015d6bf85785b5bdf8ead46905980de34 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 11:24:04 +0200
Subject: gnu: texlive-preprint: Fix build.

* gnu/packages/tex.scm (texlive-preprint)[source]: Use TEXLIVE-ORIGIN
instead of TEXLIVE-REF and SVN-FETCH.
---
 gnu/packages/tex.scm | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3c24310045..21d6fbf041 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10936,18 +10936,16 @@ figure versions offered by many professional fonts.")
 (define-public texlive-preprint
   (package
     (name "texlive-preprint")
-    (version "1.0e")
-    (source
-     (origin
-       (method svn-fetch)
-       (uri (texlive-ref "latex" "preprint"))
-       (file-name (string-append name "-" version "-checkout"))
-       (sha256
-        (base32
-         "173ik9xad3zih6gcdwdkzyljarh06ky6c5d2x1yjs22qqi75py5a"))))
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/preprint/" "source/latex/preprint/"
+                   "tex/latex/preprint/")
+             (base32
+              "198xwg6mll3yndc1kf79l6zgnq3nsk7fsh3rlj28nipd26ysw6lq")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/preprint"))
-    (home-page "http://www.ctan.org/pkg/preprint")
+    (home-page "https://ctan.org/pkg/preprint")
     (synopsis "Bundle of modules for preprints")
     (description "The bundle comprises: @code{authblk}, which permits
 footnote style author/affiliation input in the @command{\\author} command,
-- 
cgit 1.4.1


From c674958872bad20eda17bf800e2b31cddda07850 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 11:05:24 +0200
Subject: gnu: Add texlive-ctablestack.

* gnu/packages/tex.scm (texlive-ctablestack): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 21d6fbf041..b5e52d95e6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1321,6 +1321,27 @@ support (for use with a variety of encodings) is provided.")
     ;; additional but not legally binding clause.
     (license license:lppl1.3c+)))
 
+(define-public texlive-ctablestack
+  (package
+    (name "texlive-ctablestack")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/ctablestack/"
+                   "source/luatex/ctablestack/"
+                   "tex/luatex/ctablestack/")
+             (base32
+              "13l779436aj3hlchwvhkpiikbyfa2j4swzfrwqkjh9l8bc2cwg7n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ctablestack")
+    (synopsis "Catcode table stable support")
+    (description
+     "This package provides a method for defining category code table stacks
+in LuaTeX.  It is required by the @code{luatexbase} package which uses
+@code{ctablestack} to provide a back-compatibility form of this concept.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-lm
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From c1fd80b1c95b0da1cec7fe5908753bdad4152fb1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 11:03:11 +0200
Subject: gnu: Add texlive-luatexbase.

* gnu/packages/tex.scm (texlive-luatexbase): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b5e52d95e6..4447c81f83 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4260,6 +4260,33 @@ this bundle for use independent of ConTeXt.")
 in the same way as BSD/GNU @code{getopt_long(3)} functions do.")
     (license license:expat)))
 
+(define-public texlive-luatexbase
+  (package
+    (name "texlive-luatexbase")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+
+             name version
+             (list "doc/luatex/luatexbase/"
+                   "source/luatex/luatexbase/"
+                   "tex/luatex/luatexbase/")
+             (base32
+              "1nz2k9czqdmn08v75qa2bwanvcvyp9jmqcgwaxcy4fy4mpbrn8ra")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-ctablestack))
+    (home-page "https://ctan.org/pkg/luatexbase")
+    (synopsis "Basic resource management for LuaTeX code")
+    (description
+     "The LaTeX kernel builds in support for LuaTeX functionality, also
+available as @file{ltluatex.tex} for users of plain TeX and those with older
+LaTeX kernel implementations.  This support is based on ideas taken from the
+original @code{luatexbase} package, but there are interface differences.  This
+stub package provides a compatibility layer to allow existing packages to
+upgrade smoothly to the new support structure.")
+    (license license:lppl1.3+)))
+
 ;; TODO: We should be able to build this from the sources on Github with
 ;; texlive-l3build, but I haven't been able to get it to work.
 (define-public texlive-luaotfload
-- 
cgit 1.4.1


From 3a7b887b3d82d3d5359a85155f4d41a1cb23808f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 10:59:11 +0200
Subject: gnu: Add texlive-luacode.

* gnu/packages/tex.scm (texlive-luacode): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4447c81f83..62ea04d23b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4195,6 +4195,32 @@ releases.  The bundle consists of a Lua script to run the tasks and a
 context of LuaTeX.")
     (license (list license:lppl1.3c license:expat))))
 
+(define-public texlive-luacode
+  (package
+    (name "texlive-luacode")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luacode/"
+                   "source/lualatex/luacode/"
+                   "tex/lualatex/luacode/")
+             (base32
+              "1dyld5yb57p3j7wz591plbgjy7dk7ngn8cxw1lfmvx8iprgk1f8d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-iftex
+           texlive-luatexbase))
+    (home-page "https://ctan.org/pkg/luacode")
+    (synopsis "Helper for executing Lua code from within TeX")
+    (description
+     "Executing Lua code from within TeX with directlua can sometimes be
+tricky: there is no easy way to use the percent character, counting
+backslashes may be hard, and Lua comments don't work the way you expect.  The
+package provides the @code{\\luaexec} command and the @code{luacode}
+environments to help with these problems.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-lualatex-math
   (package
     (name "texlive-lualatex-math")
-- 
cgit 1.4.1


From 6734cfd2b7a86e005730e46f8b146f744a317eee Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 10:55:42 +0200
Subject: gnu: Add texlive-hyperxmp.

* gnu/packages/tex.scm (texlive-hyperxmp): New variable.
---
 gnu/packages/tex.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 62ea04d23b..2b50e35a15 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3765,6 +3765,53 @@ pdf and HTML backends.  The package is distributed with the @code{backref} and
 
 (define-deprecated-package texlive-latex-hyperref texlive-hyperref)
 
+(define-public texlive-hyperxmp
+  (package
+    (name "texlive-hyperxmp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hyperxmp/"
+                   "doc/man/man1/hyperxmp-add-bytecount.1"
+                   "doc/man/man1/hyperxmp-add-bytecount.man1.pdf"
+                   "scripts/hyperxmp/"
+                   "source/latex/hyperxmp/"
+                   "tex/latex/hyperxmp/")
+             (base32
+              "177wx80mc6ipl0ciddnwgjjfg9vqv71y9ql0y69sviplyy533ng7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-build
+            (lambda _
+              (delete-file "source/latex/hyperxmp/hyperxmp-stds.tex"))))))
+    (propagated-inputs
+     (list texlive-atenddvi
+           texlive-etoolbox
+           texlive-hyperref
+           texlive-ifmtarg
+           texlive-iftex
+           texlive-intcalc
+           texlive-kvoptions
+           texlive-luacode
+           texlive-oberdiek             ;for ifdraft
+           texlive-pdfescape
+           texlive-stringenc
+           texlive-totpages))
+    (home-page "https://ctan.org/pkg/hyperxmp")
+    (synopsis "Embed XMP metadata within a LaTeX document")
+    (description
+     "XMP (eXtensible Metadata Platform) is a mechanism proposed by Adobe for
+embedding document metadata, within the document itself.  The metadata is
+designed to be easy to extract, even by programs that are oblivious to the
+document's file format.  The @code{hyperxmp} package makes it trivial for
+LaTeX document authors to store XMP metadata in their documents as well.  It
+is compatible with pdfLaTeX, XeLaTeX, LaTeX+dvipdfm, and LaTeX+dvips+ps2pdf.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-oberdiek
   (let ((template (simple-texlive-package
                    "texlive-oberdiek"
-- 
cgit 1.4.1


From 89b54d1ea8f56bed39fe4d2480825d01da8efcde Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 10:35:40 +0200
Subject: gnu: texlive-latex-acmart -> texlive-acmart.

* gnu/packages/tex.scm (texlive-acmart): New variable.
(texlive-latex-acmart): Deprecate variable.
---
 gnu/packages/tex.scm | 54 ++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2b50e35a15..e445a93ea5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8239,26 +8239,56 @@ technical illustrations.  Its output is scalable PostScript or SVG, rather
 than the bitmaps Metafont creates.")
     (license license:lppl)))
 
-(define-public texlive-latex-acmart
+(define-public texlive-acmart
   (package
-    (name "texlive-latex-acmart")
-    (version "1.60")
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "acmart"))
-              (sha256
-               (base32
-                "12wxav9r6v7dlfja9myrwz7famgfpcfwd292qzmgg283xgngh9kd"))
-              (file-name (string-append name "-" version "-checkout"))))
+    (name "texlive-acmart")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/acmart/" "doc/latex/acmart/"
+                   "source/latex/acmart/" "tex/latex/acmart/")
+             (base32
+              "0vz0dla2frf5wgp5xrqc9q4z730k9wayfkfj0vg58a2xjriarrzn")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/acmart"))
-    (home-page "https://www.ctan.org/pkg/acmart")
+    (propagated-inputs
+     (list texlive-booktabs
+           texlive-caption
+           texlive-cmap
+           texlive-comment
+           texlive-draftwatermark
+           texlive-environ
+           texlive-etoolbox
+           texlive-fancyhdr
+           texlive-float
+           texlive-geometry
+           texlive-graphics
+           texlive-hyperref
+           texlive-hyperxmp
+           texlive-iftex
+           texlive-inconsolata
+           texlive-libertine
+           texlive-microtype
+           texlive-natbib
+           texlive-ncctools
+           texlive-newtx
+           texlive-preprint
+           texlive-refcount
+           texlive-setspace
+           texlive-textcase
+           texlive-totpages
+           texlive-xcolor
+           texlive-xkeyval
+           texlive-xstring))
+    (home-page "https://ctan.org/pkg/acmart")
     (synopsis "Class for typesetting publications of ACM")
     (description
      "This package provides a class for typesetting publications of the
 Association for Computing Machinery (ACM).")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-acmart texlive-acmart)
+
 (define-public texlive-latex-varwidth
   (package
     (name "texlive-latex-varwidth")
-- 
cgit 1.4.1


From 3c3bb270da36e495c8d3b7e672b330aa1810a485 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 11:11:24 +0200
Subject: gnu: texlive-latex-varwidth -> texlive-varwidth.

* gnu/packages/tex.scm (texlive-varwidth): New variable.
(texlive-latex-varwidth): Deprecate variable.
(texlive-adjustbox): Use new name.
* gnu/packages/maths.scm (hypre)[native-inputs]: Use new name. Re-order
alphabetically.
* gnu/packages/sphinx.scm (python-sphinx)[propagated-inputs]: Use new
name. Re-order alphabetically.
---
 gnu/packages/maths.scm  | 28 ++++++++++-----------
 gnu/packages/sphinx.scm | 16 ++++++------
 gnu/packages/tex.scm    | 65 +++++++++++++++----------------------------------
 3 files changed, 42 insertions(+), 67 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index a61d790de0..a6a015eca0 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5784,42 +5784,42 @@ set.")
                                      texlive-capt-of
                                      texlive-caption
                                      texlive-cm
+                                     texlive-cmap
+                                     texlive-colortbl
                                      texlive-courier
                                      texlive-enumitem
                                      texlive-etoc
                                      texlive-etoolbox
                                      texlive-fancyhdr
                                      texlive-fancyvrb
-                                     texlive-helvetic
-                                     texlive-jknappen
-                                     texlive-sectsty
-                                     texlive-tex-gyre
-                                     texlive-wasy
-                                     texlive-xcolor
-                                     texlive-xypic
-                                     texlive-listofitems
-                                     texlive-cmap
-                                     texlive-colortbl
                                      texlive-float
                                      texlive-fncychap
                                      texlive-framed
                                      texlive-geometry
                                      texlive-hanging
+                                     texlive-helvetic
                                      texlive-hyperref
+                                     texlive-jknappen
+                                     texlive-listofitems
                                      texlive-multirow
                                      texlive-natbib
                                      texlive-latex-needspace
                                      texlive-newunicodechar
                                      texlive-parskip
+                                     texlive-sectsty
                                      texlive-stackengine
                                      texlive-tabulary
-                                     texlive-tocloft
-                                     texlive-upquote
-                                     texlive-latex-varwidth
+                                     texlive-tex-gyre
                                      texlive-titlesec
+                                     texlive-tocloft
                                      texlive-ulem
+                                     texlive-upquote
+                                     texlive-varwidth
+                                     texlive-wasy
                                      texlive-wasysym
-                                     texlive-wrapfig))))
+                                     texlive-wrapfig
+                                     texlive-xcolor
+                                     texlive-xypic))))
     (inputs
      (list openblas lapack))
     (arguments
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 69054efb50..c2d744ed00 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -109,28 +109,28 @@
            texlive-amsmath
            texlive-capt-of
            texlive-carlisle             ;remreset
-           texlive-etoolbox
-           texlive-ltxcmds
-           texlive-hyperref
-           texlive-latex-base           ;alltt, atbegshi, makeidx, textcomp
            texlive-cmap
+           texlive-etoolbox
            texlive-fancyhdr
            texlive-fancyvrb
            texlive-float
            texlive-fncychap
            texlive-framed
            texlive-geometry
-           texlive-graphics                       ;graphicx, color
+           texlive-graphics             ;graphicx, color
+           texlive-hyperref
            texlive-kvoptions
+           texlive-latex-base           ;alltt, atbegshi, makeidx, textcomp
+           texlive-ltxcmds
            texlive-latex-needspace
+           texlive-oberdiek             ;hypcap
            texlive-parskip
            texlive-latex-preview
            texlive-tabulary
            texlive-titlesec
-           texlive-tools                          ;multicol, longtable
+           texlive-tools                ;multicol, longtable
            texlive-upquote
-           texlive-latex-varwidth
-           texlive-oberdiek             ;hypcap
+           texlive-varwidth
            texlive-wrapfig
            texlive-xcolor))
     (native-inputs
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e445a93ea5..fe955867d2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5757,7 +5757,7 @@ user may consider the @code{dnaseq} as a rather more powerful alternative.")
            texlive-graphics
            texlive-listings
            texlive-refcount
-           texlive-latex-varwidth))
+           texlive-varwidth))
     (home-page "https://ctan.org/pkg/showexpl")
     (synopsis "Typesetting LaTeX source code")
     (description
@@ -8289,54 +8289,29 @@ Association for Computing Machinery (ACM).")
 
 (define-deprecated-package texlive-latex-acmart texlive-acmart)
 
-(define-public texlive-latex-varwidth
+(define-public texlive-varwidth
   (package
-    (name "texlive-latex-varwidth")
+    (name "texlive-varwidth")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/varwidth"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1bmz9ap0ffyg7qry2xi7lki06qx4809w028xvk88cl66h7p46g52"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/varwidth")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/varwidth")
-    (synopsis "Variable-width minipage")
+    (source (texlive-origin
+             name version
+             (list "doc/latex/varwidth/" "tex/latex/varwidth/")
+             (base32
+              "0jcrv4klcjpl17ml0zyqfvkrq6qwn2imxv8syqs5m6qk0fk7hg6l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-bookmark
+           texlive-hyperref))
+    (home-page "https://ctan.org/pkg/varwidth")
+    (synopsis "Variable-width @code{minipage}")
     (description
-     "The @code{varwidth} environment is superficially similar to
-@code{minipage}, but the specified width is just a maximum value — the box may
-get a narrower “natural” width.")
+     "The @code{varwidth} environment is superficially similar to @code{minipage},
+but the specified width is just a maximum value -- the box may get a narrower
+natural width.")
     (license license:lppl)))
 
-(define-public texlive-varwidth
-  (package
-    (inherit (simple-texlive-package
-              "texlive-varwidth"
-              (list "doc/latex/varwidth/" "tex/latex/varwidth/")
-              (base32 "0jcrv4klcjpl17ml0zyqfvkrq6qwn2imxv8syqs5m6qk0fk7hg6l")
-              #:trivial? #t))
-    (home-page "https://ctan.org/macros/latex/contrib/varwidth")
-    (synopsis "Variable-width minipage LaTeX environment")
-    (description
-     "The varwidth environment is superficially similar to minipage, but the
-specified width is just a maximum value --- the box may get a narrower natural
-width.")
-    (license license:lppl)))
+(define-deprecated-package texlive-latex-varwidth texlive-varwidth)
 
 (define-public texlive-wasy
   (package
@@ -11481,7 +11456,7 @@ the list of graphics file extensions recognised by package graphics.")
              texlive-ifoddpage
              texlive-pgf
              texlive-storebox
-             texlive-latex-varwidth
+             texlive-varwidth
              texlive-xkeyval))
       (home-page "https://www.ctan.org/pkg/adjustbox")
       (synopsis "Graphics package-alike macros for “general” boxes")
-- 
cgit 1.4.1


From 91461e95d43f7270835df54185e534829d4031db Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 11:27:50 +0200
Subject: gnu: texlive-latex-ucs -> texlive-ucs.

* gnu/packages/tex.scm (texlive-ucs): New variable.
(texlive-latex-ucs): Deprecate variable.
* gnu/packages/python-xyz.scm (python-nbconvert)[propagated-inputs]: Use new
name.
---
 gnu/packages/python-xyz.scm |  2 +-
 gnu/packages/tex.scm        | 51 ++++++++++++++++++---------------------------
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 60e0ed3d65..c32dc25b88 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15205,11 +15205,11 @@ time.")
                                      texlive-eurosym
                                      texlive-fonts-rsfs
                                      texlive-jknappen
-                                     texlive-latex-ucs
                                      texlive-lm
                                      texlive-lm-math
                                      texlive-mathpazo
                                      texlive-oberdiek
+                                     texlive-ucs
                                      texlive-zapfding))))
     (home-page "https://jupyter.org")
     (synopsis "Converting Jupyter Notebooks")
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fe955867d2..88bec9b843 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8373,46 +8373,35 @@ It does not work in combination with list environments, but can be used in a
 
 (define-deprecated-package texlive-latex-wrapfig texlive-wrapfig)
 
-(define-public texlive-latex-ucs
+(define-public texlive-ucs
   (package
-    (name "texlive-latex-ucs")
+    (name "texlive-ucs")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/ucs"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0rrxwi60wmz5dfjifl4fwk66plf7wix85qnhfv4ylvmj6qi6hw37"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/ucs")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/ucs")
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ucs/" "tex/latex/ucs/data/"
+                   "tex/latex/ucs/utils/")
+             (base32
+              "1hr7dsfx7vggai1j7saba48lsm1a003my9qkbr6qmazgc3lbcvl8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics
+           texlive-hyperref))
+    (home-page "https://ctan.org/pkg/ucs")
     (synopsis "Extended UTF-8 input encoding support for LaTeX")
     (description
-     "The bundle provides the @code{ucs} package, and @code{utf8x.def},
-together with a large number of support files.  The @code{utf8x.def}
+     "The bundle provides the @code{ucs} package, and @file{utf8x.def},
+together with a large number of support files.  The @file{utf8x.def}
 definition file for use with @code{inputenc} covers a wider range of Unicode
-characters than does @code{utf8.def} in the LaTeX distribution.  The package
+characters than does @file{utf8.def} in the LaTeX distribution.  The package
 provides facilities for efficient use of its large sets of Unicode characters.
 Glyph production may be controlled by various options, which permits use of
-non-ASCII characters when coding mathematical formulae.  Note that the bundle
-previously had an alias “unicode”; that alias has now been withdrawn, and no
-package of that name now exists.")
+non-ASCII characters when coding mathematical formulae.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-ucs texlive-ucs)
+
 (define-public texlive-latex-preview
   (package
     (name "texlive-latex-preview")
-- 
cgit 1.4.1


From 58d6740f0c5829409d751f4adac5177e11892649 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 11:32:53 +0200
Subject: gnu: texlive-latex-preview -> texlive-preview.

* gnu/packages/tex.scm (texlive-preview): New variable.
(texlive-latex-preview): Deprecate variable.
* gnu/packages/graphviz.scm (dot2tex)[propagated-inputs]:
* gnu/packages/sphinx.scm (python-sphinx)[propagated-inputs]: Use new name.
---
 gnu/packages/graphviz.scm |  2 +-
 gnu/packages/sphinx.scm   |  2 +-
 gnu/packages/tex.scm      | 30 ++++++++++++------------------
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 0ca518bc2d..658cc494d1 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -390,9 +390,9 @@ graphs in Graphviz's DOT language, written in pure Python.")
            texlive-geometry
            texlive-graphics
            texlive-latex-base
-           texlive-latex-preview
            texlive-pgf
            texlive-pstricks
+           texlive-preview
            texlive-xcolor
            texlive-xkeyval))
     (home-page "https://github.com/kjellmf/dot2tex")
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index c2d744ed00..4c6d7263dd 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -125,7 +125,7 @@
            texlive-latex-needspace
            texlive-oberdiek             ;hypcap
            texlive-parskip
-           texlive-latex-preview
+           texlive-preview
            texlive-tabulary
            texlive-titlesec
            texlive-tools                ;multicol, longtable
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 88bec9b843..d807e97d9d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8402,27 +8402,19 @@ non-ASCII characters when coding mathematical formulae.")
 
 (define-deprecated-package texlive-latex-ucs texlive-ucs)
 
-(define-public texlive-latex-preview
+(define-public texlive-preview
   (package
-    (name "texlive-latex-preview")
+    (name "texlive-preview")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "preview"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0hnf821yvki9bzfkz79ns9m1msjp3yvd4dhf3268wrpr1zjx6w8v"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/preview/" "source/latex/preview/"
+                   "tex/latex/preview/")
+             (base32
+              "1njw4ziyigmzxky86sh6byn8jjdah51iyd8lkmwx5rxhaqp7snkp")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     '(#:tex-directory "latex/preview"
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-generated-file
-           (lambda _
-             (delete-file "preview.drv")
-             #t)))))
-    (home-page "https://www.ctan.org/pkg/preview")
+    (home-page "https://ctan.org/pkg/preview")
     (synopsis "Extract bits of a LaTeX source for output")
     (description
      "The main purpose of the preview package is the extraction of selected
@@ -8434,6 +8426,8 @@ dvipng, but it also works when you are using PDFTeX for generating PDF
 files.")
     (license license:gpl3+)))
 
+(define-deprecated-package texlive-latex-preview texlive-preview)
+
 (define-public texlive-acronym
   (let ((template (simple-texlive-package
                    "texlive-acronym"
-- 
cgit 1.4.1


From 50e49cf9b4507a4b2532f47050de3b24bcbad86b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 11:36:20 +0200
Subject: gnu: texlive-latex-needspace -> texlive-needspace.

* gnu/packages/tex.scm (texlive-needspace): New variable.
(texlive-latex-needspace): Deprecate variable.
* gnu/packages/maths.scm (hypre)[native-inputs]:
* gnu/packages/sphinx.scm (python-sphinx)[propagated-inputs]: Use new name.
---
 gnu/packages/maths.scm  |  2 +-
 gnu/packages/sphinx.scm |  2 +-
 gnu/packages/tex.scm    | 35 ++++++++++++++++++-----------------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index a6a015eca0..dc1d62e4ad 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5803,7 +5803,7 @@ set.")
                                      texlive-listofitems
                                      texlive-multirow
                                      texlive-natbib
-                                     texlive-latex-needspace
+                                     texlive-needspace
                                      texlive-newunicodechar
                                      texlive-parskip
                                      texlive-sectsty
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 4c6d7263dd..b2ad5d99e8 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -122,7 +122,7 @@
            texlive-kvoptions
            texlive-latex-base           ;alltt, atbegshi, makeidx, textcomp
            texlive-ltxcmds
-           texlive-latex-needspace
+           texlive-needspace
            texlive-oberdiek             ;hypcap
            texlive-parskip
            texlive-preview
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d807e97d9d..c074811fd7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9240,31 +9240,32 @@ and after the formatted number.")
 
 (define-deprecated-package texlive-latex-numprint texlive-numprint)
 
-(define-public texlive-latex-needspace
+(define-public texlive-needspace
   (package
-    (name "texlive-latex-needspace")
+    (name "texlive-needspace")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "needspace"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0kw80f5jh4gdpa2ka815abza3gr5z8b929w0745vrlc59pl0017y"))))
+    (source (texlive-origin name version
+                            (list "doc/latex/needspace/"
+                                  "source/latex/needspace/"
+                                  "tex/latex/needspace/")
+                            (base32
+                             "12hbvv1w6b1k29qjvp72bkpnzsxpvrimzshllwinrxh9rx1mn550")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     '(#:tex-directory "latex/needspace"
-       #:tex-format "latex"))
-    (inputs
+     (list #:tex-format "latex"))
+    (native-inputs
      (list texlive-filecontents))
-    (home-page "https://www.ctan.org/pkg/needspace")
+    (home-page "https://ctan.org/pkg/needspace")
     (synopsis "Insert pagebreak if not enough space")
     (description
-     "Provides commands to disable pagebreaking within a given vertical
-space.  If there is not enough space between the command and the bottom of the
-page, a new page will be started.")
+     "This package provides commands to disable pagebreaking within a given
+vertical space.  If there is not enough space between the command and the
+bottom of the page, a new page will be started.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-needspace texlive-needspace)
+
 (define-public texlive-latex-changepage
   (package
     (name "texlive-latex-changepage")
@@ -12271,7 +12272,7 @@ Polish of standard ``LaTeX names''.")
        "tex/latex/mdframed/")
       (base32 "1i5rm946wg43rjckxlfhx79zfx5cgd3bxk71206hd1dqkrgpdpa8")
       #:trivial? #t))
-    (propagated-inputs (list texlive-latex-needspace
+    (propagated-inputs (list texlive-needspace
                              texlive-zref))
     (home-page "https://ctan.org/pkg/mdframed")
     (synopsis "Framed environments that can split at page boundaries")
-- 
cgit 1.4.1


From d7fc4cec0777955c27063b0ef09c59d1a2596efb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 11:42:24 +0200
Subject: gnu: texlive-latex-media9 -> texlive-media9.

* gnu/packages/tex.scm (texlive-media9): New variable.
(texlive-latex-media9): Deprecate variable.
* gnu/packages/plotutils.scm (asymptote)[native-inputs]: Use new name.
---
 gnu/packages/plotutils.scm |  2 +-
 gnu/packages/tex.scm       | 51 +++++++++++++++++++---------------------------
 2 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 6f052d2a04..a49df67c29 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -320,7 +320,7 @@ colors, styles, options and details.")
                   texlive-kvoptions
                   texlive-l3backend
                   texlive-latex-base
-                  texlive-latex-media9
+                  texlive-media9
                   texlive-oberdiek      ;for ifluatex
                   texlive-latex-ocgx2
                   texlive-parskip
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c074811fd7..7dba840a5f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9037,46 +9037,37 @@ with documents of any length in which the usual processing abilities are
 required: automatic sectioning and pagination, spell checking and so forth.")
     (license license:gpl2+)))
 
-(define-public texlive-latex-media9
+(define-public texlive-media9
   (package
-    (name "texlive-latex-media9")
+    (name "texlive-media9")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/media9"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0a1v70k6231323y1lazfda1y9568w8hn7c8jhc7rblkhdfv3slw7"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/media9")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/media9")
+    (source (texlive-origin
+             name version
+             (list "doc/latex/media9/"
+                   "source/latex/media9/files/"
+                   "source/latex/media9/players/"
+                   "tex/latex/media9/javascript/"
+                   "tex/latex/media9/players/")
+             (base32
+              "1kx0zbwd7pd4mah0b8l595hyjc03g505kfmn6fv7iaqvkixqrgbi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/media9")
     (synopsis "Multimedia inclusion package with Adobe Reader-9/X compatibility")
     (description
-     "The package provides an interface to embed interactive Flash (SWF) and 3D
-objects (Adobe U3D & PRC), as well as video and sound files or streams in the
-popular MP4, FLV and MP3 formats into PDF documents with Acrobat-9/X
+     "The package provides an interface to embed interactive Flash (SWF) and
+3D objects (Adobe U3D & PRC), as well as video and sound files or streams in
+the popular MP4, FLV and MP3 formats into PDF documents with Acrobat-9/X
 compatibility.  Playback of multimedia files uses the built-in Flash Player of
-Adobe Reader and does, therefore, not depend on external plug-ins.  Flash Player
-supports the efficient H.264 codec for video compression.
+Adobe Reader and does, therefore, not depend on external plug-ins.  Flash
+Player supports the efficient H.264 codec for video compression.
 
 The package is based on the RichMedia Annotation, an Adobe addition to the PDF
 specification.  It replaces the now obsolete @code{movie15} package.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-media9 texlive-media9)
+
 (define-public texlive-latex-ocgx2
   (package
     (name "texlive-latex-ocgx2")
-- 
cgit 1.4.1


From b6ad756412fd5da6d9e0e8d16b969e4c27092106 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 11:47:34 +0200
Subject: gnu: texlive-latex-ocgx2 -> texlive-ocgx2.

* gnu/packages/tex.scm (texlive-ocgx2): New variable.
(texlive-latex-ocgx2): Deprecate variable.
* gnu/packages/plotutils.scm (asymptote): Use new name.
---
 gnu/packages/plotutils.scm |  2 +-
 gnu/packages/tex.scm       | 65 +++++++++++++++++-----------------------------
 2 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index a49df67c29..4a681d3ecb 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -322,7 +322,7 @@ colors, styles, options and details.")
                   texlive-latex-base
                   texlive-media9
                   texlive-oberdiek      ;for ifluatex
-                  texlive-latex-ocgx2
+                  texlive-ocgx2
                   texlive-parskip
                   texlive-pdftexcmds
                   texlive-tex-texinfo))))
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7dba840a5f..e37577d80d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9068,51 +9068,34 @@ specification.  It replaces the now obsolete @code{movie15} package.")
 
 (define-deprecated-package texlive-latex-media9 texlive-media9)
 
-(define-public texlive-latex-ocgx2
+(define-public texlive-ocgx2
   (package
-    (name "texlive-latex-ocgx2")
+    (name "texlive-ocgx2")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/ocgx2"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1mrz1mj59m27bfya52vi4lm84ifisaf30pmf8id1biqwcq4jyynh"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/ogcx2")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/ocgx2")
-    (synopsis "Provide OCG (Optional Content Groups) support within a PDF document")
-    (description
-     "This package provides OCG (Optional Content Groups) support within a PDF
-document.
-
-It re-implements the functionality of the @code{ocg}, @code{ocgx}, and
-@code{ocg-p} packages and adds support for all known engines and back-ends
-including:
-
-@itemize
-@item LaTeX → dvips → @code{ps2pdf}/Distiller
-@item (Xe)LaTeX(x) → @code{dvipdfmx}
-@item pdfLaTeX and LuaLaTeX .
-@end itemize
-
-It also ensures compatibility with the @code{media9} and @code{animate} packages.")
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ocgx2/" "tex/latex/ocgx2/")
+             (base32
+              "195zli0l69rvxxd7cs387g6bipppfl0pyfsf5invq191zlv319b2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-l3packages
+           texlive-media9
+           texlive-pgf))
+    (home-page "https://ctan.org/pkg/ocgx2")
+    (synopsis "Drop-in replacement for 'ocgx' and 'ocg-p'")
+    (description
+     "This package serves as a drop-in replacement for the packages
+@code{ocgx} by Paul Gaborit and @code{ocg-p} by Werner Moshammer for the
+creation of PDF Layers.  It re-implements the functionality of the @code{ocg},
+@code{ocgx}, and @code{ocg-p} packages and adds support for all known engines
+and back-ends.  It also ensures compatibility with the @code{media9} and
+@code{animate} packages.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-ocgx2 texlive-ocgx2)
+
 (define-public texlive-ms
   (let ((template
          (simple-texlive-package
-- 
cgit 1.4.1


From b14d5db8e144c5b11b4e0d204929fb1209bf7eee Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 11:49:34 +0200
Subject: gnu: texlive-latex-changepage -> texlive-changepage.

* gnu/packages/tex.scm (texlive-changepage): New variable.
(texlive-latex-changepage): Deprecate variable.
---
 gnu/packages/tex.scm | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e37577d80d..908ede3b5a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9240,33 +9240,35 @@ bottom of the page, a new page will be started.")
 
 (define-deprecated-package texlive-latex-needspace texlive-needspace)
 
-(define-public texlive-latex-changepage
+(define-public texlive-changepage
   (package
-    (name "texlive-latex-changepage")
+    (name "texlive-changepage")
     (version (number->string %texlive-revision))
-    (source
-     (origin
-       (method svn-fetch)
-       (uri (texlive-ref "latex" "changepage"))
-       (file-name (string-append name "-" version "-checkout"))
-       (sha256
-        (base32
-         "1rpw8xg5p4jsyh236jma9dz3l29wjx4062f154b3wak5yjcxyxyb"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/changepage/"
+                   "source/latex/changepage/"
+                   "tex/latex/changepage/")
+             (base32
+              "0g9zlbqrgxh3p2vys2s84i8v590qi4fbpppp5lkaqc1di8kw60lm")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     '(#:tex-directory "latex/changepage"
-       #:tex-format "latex"))
-    (inputs
+     (list #:tex-format "latex"))
+    (native-inputs
      (list texlive-filecontents))
-    (home-page "https://www.ctan.org/pkg/changepage")
+    (home-page "https://ctan.org/pkg/changepage")
     (synopsis "Margin adjustment and detection of odd/even pages")
     (description
      "The package provides commands to change the page layout in the middle of
-a document, and to robustly check for typesetting on odd or even pages.
-Instructions for use are at the end of the file.  The package is an extraction
-of code from the @code{memoir} class, whose user interface it shares.")
+a document, and to robustly check for typesetting on odd or even pages.  The
+package is an extraction of code from the @code{memoir} class, whose user
+interface it shares.  This package will eventually replace the @code{chngpage}
+package, which is distributed with the package.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-changepage texlive-changepage)
+
 (define-public texlive-latex-eukdate
   (package
     (name "texlive-latex-eukdate")
-- 
cgit 1.4.1


From e80460f398593daa008e801709b51ec1ad188d0c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 14:31:36 +0200
Subject: gnu: texlive-latex-eukdate -> texlive-eukdate.

* gnu/packages/tex.scm (texlive-eukdate): New variable.
(texlive-latex-eukdate): Deprecate variable.
(texlive-metalogo)[native-inputs]: Use new name.
---
 gnu/packages/tex.scm | 48 ++++++++++++++++++------------------------------
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 908ede3b5a..0cca1c3721 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6305,10 +6305,10 @@ output routine.")
     (native-inputs (list fontconfig    ;for XDG_DATA_DIRS, to locate OTF fonts
                          texlive-booktabs
                          texlive-cm
+                         texlive-eukdate
                          texlive-fontspec
                          texlive-iftex
                          texlive-latex-base
-                         texlive-latex-eukdate
                          texlive-graphics
                          texlive-multirow
                          texlive-lm     ;for lmroman10-regular
@@ -9269,42 +9269,30 @@ package, which is distributed with the package.")
 
 (define-deprecated-package texlive-latex-changepage texlive-changepage)
 
-(define-public texlive-latex-eukdate
+(define-public texlive-eukdate
   (package
-    (name "texlive-latex-eukdate")
+    (name "texlive-eukdate")
     (version (number->string %texlive-revision))
-    (source
-     (origin
-       (method svn-fetch)
-       (uri (svn-reference
-             (url (string-append "svn://www.tug.org/texlive/tags/"
-                                 %texlive-tag "/Master/texmf-dist/"
-                                 "/tex/latex/eukdate"))
-             (revision %texlive-revision)))
-       (file-name (string-append name "-" version "-checkout"))
-       (sha256
-        (base32
-         "18xan116l8w47v560bkw6nbhkrml7g04xrlzk3jrpc7qsyf3n5fz"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/eukdate")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/eukdate")
+    (source (texlive-origin
+             name version
+             (list "doc/latex/eukdate/" "source/latex/eukdate/"
+                   "tex/latex/eukdate/")
+             (base32
+              "1bz32l4500y4sx7ighpcvzfh0z45lzyyxm1dq1knmhdsv46gqaxi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/eukdate")
     (synopsis "UK format dates, with weekday")
     (description
      "The package is used to change the format of @code{\\today}’s date,
-including the weekday, e.g., \"Saturday, 26 June 2008\", the 'UK format', which
-is preferred in many parts of the world, as distinct from that which is used in
-@code{\\maketitle} of the article class, \"June 26, 2008\", the 'US format'.")
+including the weekday, e.g., @samp{Saturday, 26 June 2008}, the UK format,
+which is preferred in many parts of the world, as distinct from that which is
+used in @code{\\maketitle} of the article class, @samp{June 26, 2008}, the US
+format.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-eukdate texlive-eukdate)
+
 (define-public texlive-ulem
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From bb86f821857231c32f26b9022dadd9d48b857688 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 14:33:52 +0200
Subject: gnu: texlive-latex-readarray -> texlive-readarray.

* gnu/packages/tex.scm (texlive-readarray): New variable.
(texlive-latex-readarray): Deprecate variable.
(texlive-latex-verbatimbox)[propagated-inputs]: Use new name.
---
 gnu/packages/tex.scm | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0cca1c3721..ef0200a270 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9776,43 +9776,30 @@ values are not limited.")
 
 (define-deprecated-package texlive-generic-uniquecounter texlive-uniquecounter)
 
-(define-public texlive-latex-readarray
+(define-public texlive-readarray
   (package
-    (name "texlive-latex-readarray")
+    (name "texlive-readarray")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/readarray"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0c53k180ivn1n7fz3ngvd2w1i5dw3kxml0n64vhki88xsylz7lxp"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/readarray")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/readarray/" "tex/latex/readarray/")
+             (base32
+              "05yi37j8jq5a9pp9n6qg76m2fw899vpmwafzgnxbg0qp2fmch2ch")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (propagated-inputs
      (list texlive-listofitems))
     (home-page "https://www.ctan.org/pkg/readarray")
     (synopsis "Read, store and recall array-formatted data")
     (description
-     "This package allows the user to input formatted data into elements of a
-2-D or 3-D array and to recall that data at will by individual cell number.
+     "This package allows the user to input formatted data into elements of
+a 2-D or 3-D array and to recall that data at will by individual cell number.
 The data can be but need not be numerical in nature.  It can be, for example,
 formatted text.")
     (license license:lppl1.3)))
 
+(define-deprecated-package texlive-latex-readarray texlive-readarray)
+
 (define-public texlive-latex-verbatimbox
   (package
     (name "texlive-latex-verbatimbox")
@@ -9840,7 +9827,7 @@ formatted text.")
            (copy-recursively (assoc-ref %build-inputs "source") target)
            #t))))
     (propagated-inputs
-     (list texlive-latex-readarray))
+     (list texlive-readarray))
     (home-page "https://www.ctan.org/pkg/verbatimbox")
     (synopsis "Deposit verbatim text in a box")
     (description
-- 
cgit 1.4.1


From 8cfcce51945fb48c2204c61a94836ede1e8c8425 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 14:35:51 +0200
Subject: gnu: texlive-latex-verbatimbox -> texlive-verbatimbox.

* gnu/packages/tex.scm (texlive-verbatimbox): New variable.
(texlive-latex-verbatimbox): Deprecate variable.
* gnu/packages/bioinformatics.scm (discrover)[native-inputs]: Use new name.
---
 gnu/packages/bioinformatics.scm |  2 +-
 gnu/packages/tex.scm            | 38 +++++++++++++-------------------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 6bb188c2c2..742eb33a1c 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4775,7 +4775,7 @@ data and settings.")
                   texlive-natbib
                   texlive-bibtex        ;style files used by natbib
                   texlive-pgf           ;tikz
-                  texlive-latex-verbatimbox))
+                  texlive-verbatimbox))
            imagemagick))
     (home-page "https://dorina.mdc-berlin.de/public/rajewsky/discrover/")
     (synopsis "Discover discriminative nucleotide sequence motifs")
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ef0200a270..b10d7eeb46 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9800,34 +9800,20 @@ formatted text.")
 
 (define-deprecated-package texlive-latex-readarray texlive-readarray)
 
-(define-public texlive-latex-verbatimbox
+(define-public texlive-verbatimbox
   (package
-    (name "texlive-latex-verbatimbox")
+    (name "texlive-verbatimbox")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/verbatimbox"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0qh1cgvfs463zsi2pjg490gj0mkjfdpfc381j10cbb5la304psna"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/verbatimbox")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/verbatimbox/"
+                   "tex/latex/verbatimbox/")
+             (base32
+              "00n3x075ya3s2qwmcz2vvn8x70pbbgj2cbwz0ifw89jrc4ljisgi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (propagated-inputs
-     (list texlive-readarray))
+     (list texlive-tools))
     (home-page "https://www.ctan.org/pkg/verbatimbox")
     (synopsis "Deposit verbatim text in a box")
     (description
@@ -9839,6 +9825,8 @@ in places where the standard @code{verbatim} environment (which is based on a
 @code{trivlist}) may not appear.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-verbatimbox texlive-verbatimbox)
+
 (define-public texlive-latex-examplep
   (package
     (name "texlive-latex-examplep")
-- 
cgit 1.4.1


From 95e4d69805e849ca2c79d5f2a4e47c02d3012f86 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 14:39:10 +0200
Subject: gnu: texlive-latex-examplep -> texlive-examplep.

* gnu/packages/tex.scm (texlive-examplep): New variable.
(texlive-latex-examplep): Deprecate variable.
* gnu/packages/bioinformatics.scm (discrover)[native-inputs]: Use new name.
---
 gnu/packages/bioinformatics.scm |  2 +-
 gnu/packages/tex.scm            | 55 ++++++++++++++++-------------------------
 2 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 742eb33a1c..66e84d2925 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4769,7 +4769,7 @@ data and settings.")
                   texlive-amsfonts
                   texlive-doi
                   texlive-ec
-                  texlive-latex-examplep
+                  texlive-examplep
                   texlive-hyperref
                   texlive-ms
                   texlive-natbib
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b10d7eeb46..0f2246ae92 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9827,47 +9827,34 @@ in places where the standard @code{verbatim} environment (which is based on a
 
 (define-deprecated-package texlive-latex-verbatimbox texlive-verbatimbox)
 
-(define-public texlive-latex-examplep
+(define-public texlive-examplep
   (package
-    (name "texlive-latex-examplep")
+    (name "texlive-examplep")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/examplep"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0fsvvmz68ij0zwfzrny6x13d92grxr4ap59lxgah4smbkccd6s27"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/latex/examplep")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/examplep")
+    (source (texlive-origin
+             name version
+             (list "doc/latex/examplep/" "tex/latex/examplep/")
+             (base32
+              "0afbl77i57hxngc3l0czdzmmkhcgh2l4h2dpbg9ax9p9dv8c006n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/examplep")
     (synopsis "Verbatim phrases and listings in LaTeX")
     (description
-     "Examplep provides sophisticated features for typesetting verbatim source
-code listings, including the display of the source code and its compiled LaTeX
-or METAPOST output side-by-side, with automatic width detection and enabled
-page breaks (in the source), without the need for specifying the source twice.
-Special care is taken that section, page and footnote numbers do not interfere
-with the main document.  For typesetting short verbatim phrases, a replacement
-for the @code{\\verb} command is also provided in the package, which can be
-used inside tables and moving arguments such as footnotes and section
-titles.")
+     "The @code{examplep} package provides sophisticated features for
+typesetting verbatim source code listings, including the display of the source
+code and its compiled LaTeX or METAPOST output side-by-side, with automatic
+width detection and enabled page breaks (in the source), without the need for
+specifying the source twice.  Special care is taken that section, page and
+footnote numbers do not interfere with the main document.  For typesetting
+short verbatim phrases, a replacement for the @code{\\verb} command is also
+provided in the package, which can be used inside tables and moving arguments
+such as footnotes and section titles.")
     ;; No version of the GPL is specified.
     (license license:gpl3+)))
 
+(define-deprecated-package texlive-latex-examplep texlive-examplep)
+
 (define-public texlive-xunicode
   (package
     (inherit
-- 
cgit 1.4.1


From 8d32fb327d28636f67567eff33ebbe73ab01d878 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 14:42:07 +0200
Subject: gnu: texlive-latex-xmpincl -> texlive-xmpincl.

* gnu/packages/tex.scm (texlive-xmpincl): New variable.
(texlive-latex-xmpincl): Deprecate variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0f2246ae92..f3cac2060f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10119,21 +10119,21 @@ effects, varying slide transitions and animations.")
 
 (define-deprecated-package texlive-latex-beamer texlive-beamer)
 
-(define-public texlive-latex-xmpincl
+(define-public texlive-xmpincl
   (package
-    (name "texlive-latex-xmpincl")
+    (name "texlive-xmpincl")
     (version (number->string %texlive-revision))
-    (source
-     (origin
-       (method svn-fetch)
-       (uri (texlive-ref "latex" "xmpincl"))
-       (file-name (string-append name "-" version "-checkout"))
-       (sha256
-        (base32
-         "0lq3dfb4fsw955gjwllnk7cg00ciq5mva64mlpbva6g2jz117734"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xmpincl/" "source/latex/xmpincl/"
+                   "tex/latex/xmpincl/")
+             (base32
+              "1r9vga6pl8q0p40njr1l04nhga4i0pjyppsd9qmxx0kx408siram")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/xmpincl"))
-    (home-page "http://www.ctan.org/pkg/xmpincl")
+    (propagated-inputs
+     (list texlive-iftex))
+    (home-page "https://ctan.org/pkg/xmpincl")
     (synopsis "Include eXtensible Metadata Platform data in pdfLaTeX")
     (description
      "The XMP (eXtensible Metadata platform) is a framework to add metadata to
@@ -10142,6 +10142,8 @@ the metadata is stored in an XML file, and this XML stream is then embedded in
 the file to which it applies.")
     (license license:gpl3+)))
 
+(define-deprecated-package texlive-latex-xmpincl texlive-xmpincl)
+
 (define-public texlive-pdfx
   (let ((template (simple-texlive-package
                    "texlive-pdfx"
-- 
cgit 1.4.1


From f6d9293d96a8ecaabc6ba954d60eb633e46793ed Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 14:45:08 +0200
Subject: gnu: texlive-latex-ebproof -> texlive-ebproof.

* gnu/packages/tex.scm (texlive-ebproof): New variable.
(texlive-latex-ebproof): Deprecate variable.
---
 gnu/packages/tex.scm | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f3cac2060f..a761c1d104 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11437,27 +11437,22 @@ theorems.  The package supports saving and reuse of source code and text
 parts.")
       (license license:lppl1.3c+))))
 
-(define-public texlive-latex-ebproof
+(define-public texlive-ebproof
   (package
-    (name "texlive-latex-ebproof")
-    (version "2.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://framagit.org/manu/ebproof")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1zkrfaf343js0yc1x7m3d8hzbh5izn0lb01jrmdpjm51kdbh30xq"))))
+    (name "texlive-ebproof")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ebproof/" "source/latex/ebproof/"
+                   "tex/latex/ebproof/")
+             (base32
+              "1a3203jgxsgihfgb6wwm0gfpaxbf1lg5axcakan9rj316xrrj4lc")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/ebproof"))
     (propagated-inputs
      (list texlive-l3kernel))
-    (home-page "http://www.ctan.org/pkg/ebproof")
-    (synopsis
-     "Formal proofs in the style of sequent calculus")
+    (home-page "https://ctan.org/pkg/ebproof")
+    (synopsis "Formal proofs in the style of sequent calculus")
     (description
      "This package provides commands to typeset proof trees in the style of
 sequent calculus and related systems.  The commands allow for writing
@@ -11466,6 +11461,8 @@ an arbitrary point.  Various options allow complete control over spacing,
 styles of inference rules, placement of labels, etc.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-ebproof texlive-ebproof)
+
 (define-public texlive-latex-bussproofs
   (let ((template (simple-texlive-package
                    "texlive-latex-bussproofs"
-- 
cgit 1.4.1


From 685c59c2e074a4f6a6fe8c8eb634bf35476f0b6e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 14:46:40 +0200
Subject: gnu: texlive-latex-bussproofs -> texlive-bussproofs.

* gnu/packages/tex.scm (texlive-bussproofs): New variable.
(texlive-latex-bussproofs): Deprecate variable.
---
 gnu/packages/tex.scm | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a761c1d104..1723515987 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11463,31 +11463,26 @@ styles of inference rules, placement of labels, etc.")
 
 (define-deprecated-package texlive-latex-ebproof texlive-ebproof)
 
-(define-public texlive-latex-bussproofs
-  (let ((template (simple-texlive-package
-                   "texlive-latex-bussproofs"
-                   (list "/doc/latex/bussproofs/"
-                         "/tex/latex/bussproofs/")
-                   (base32
-                    "1gb8y9g89fqw1kix4d2vb7mj440vlb8hnpsa3jqpk9yicndwcyk6"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/bussproofs")
-         ((#:build-targets _ '())
-          ''()) ; "bussproofs.sty"
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "tex/latex/bussproofs")))))))
-      (home-page "https://www.math.ucsd.edu/~sbuss/ResearchWeb/bussproofs/index.html")
-      (synopsis "Formal proofs in the style of sequent calculus")
-      (description
-       "This package provides commands to typeset proof trees in the style of
+(define-public texlive-bussproofs
+  (package
+    (name "texlive-bussproofs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bussproofs/"
+                   "tex/latex/bussproofs/")
+             (base32
+              "1gb8y9g89fqw1kix4d2vb7mj440vlb8hnpsa3jqpk9yicndwcyk6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bussproofs")
+    (synopsis "Proof trees in the style of the sequent calculus")
+    (description
+     "This package provides commands to typeset proof trees in the style of
 sequent calculus and related systems.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
+
+(define-deprecated-package texlive-latex-bussproofs texlive-bussproofs)
 
 (define-public texlive-euenc
   (package
-- 
cgit 1.4.1


From 1c74ba8ca2ad7a0edefae056d48edde712a73309 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 14:49:36 +0200
Subject: gnu: texlive-latex-textpos -> texlive-textpos.

* gnu/packages/tex.scm (texlive-textpos): New variable.
(texlive-latex-textpos): Deprecate variable.
---
 gnu/packages/tex.scm | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1723515987..d01eb51d0c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11619,28 +11619,31 @@ language preferred by the user.  This package is not intended to be used to
 automatically translate more than a few words.")
     (license (list license:lppl license:gpl1+))))
 
-(define-public texlive-latex-textpos
+(define-public texlive-textpos
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-textpos"
-              (list "doc/latex/textpos/"
-                    "tex/latex/textpos/")
-              (base32 "0sqm3pr9jyf9sf432qawscbf50glj58acwcfzyk58ijic2g01hzl")
-              #:trivial? #t))
+    (name "texlive-textpos")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/textpos/" "source/latex/textpos/"
+                   "tex/latex/textpos/")
+             (base32
+              "0gg6b2ckafj8fbrlw85m538c08qyq2cv5z59r9pzcwg1c1xdyn02")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-everyshi
+           texlive-graphics))
     (home-page "https://ctan.org/pkg/textpos")
-    (synopsis "Absolute positioning of text on the LaTeX page")
+    (synopsis "Place boxes at arbitrary positions on the LaTeX page")
     (description
-     "This package facilitates placing boxes at absolute positions on the
-LaTeX page.  There are several reasons why this might be useful, but the main
-one (or at least my motivating one) is to help produce a large-format
-conference poster.
+     "This package provides a package to facilitate placement of boxes at
+absolute positions on the LaTeX page.  There are several reasons why this
+might be useful, an important one being to help the creation of large-format
+conference posters.")
+    (license license:lppl1.3+)))
 
-This package provides a single environment, plus a starred variant, which
-contains the text (or graphics, or table, or whatever) which is to be placed
-on the page, and which specifies where it is to be placed.  The environment is
-accompanied by various configuration commands.")
-    (license license:lppl)))
+(define-deprecated-package texlive-latex-textpos texlive-textpos)
 
 (define-public texlive-unicode-math
   (package
-- 
cgit 1.4.1


From 443cf97f4e99b200813765e8c05e56e4e95f65f1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 20:03:28 +0200
Subject: gnu: texlive-latex-hyphenat -> texlive-hyphenat.

* gnu/packages/tex.scm (texlive-hyphenat): New variable.
(texlive-latex-hyphenat): Deprecate variable.
---
 gnu/packages/tex.scm | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d01eb51d0c..e517129616 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12670,24 +12670,29 @@ Adobe in both Adobe Type 1 and OpenType formats, plus macros supporting the
 use of the fonts in LaTeX (Type 1) and XeLaTeX/LuaLaTeX (OTF).")
     (license (list license:lppl1.3+ license:silofl1.1))))
 
-(define-public texlive-latex-hyphenat
+(define-public texlive-hyphenat
   (package
-    (inherit (simple-texlive-package
-              "texlive-latex-hyphenat"
-              (list "doc/latex/hyphenat/"
-                    "tex/latex/hyphenat/")
-              (base32 "0b3jx2yvryx95am0ll9h6yc99niw2lwgsbq7r89j84z2qyp2llsq")
-              #:trivial? #t))
+    (name "texlive-hyphenat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hyphenat/" "source/latex/hyphenat/"
+                   "tex/latex/hyphenat/")
+             (base32
+              "0gm7s7bidp9b4sfgylvwydban8jylfcskmqrf0sxlwxsqxqq5fy5")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/hyphenat")
-    (synopsis "Disable/enable hyphenation")
+    (synopsis "Disable/enable hypenation")
     (description
      "This package can disable all hyphenation or enable hyphenation of
 non-alphabetics or monospaced fonts.  The package can also enable hyphenation
-within ‘words’ that contain non-alphabetic characters (e.g., that include
-underscores), and hyphenation of text typeset in monospaced (e.g., cmtt)
-fonts.")
-    (license license:lppl1.3c+)))
+within words that contain non-alphabetic characters (e.g., that include
+underscores), and hyphenation of text typeset in monospaced (e.g.,
+@code{cmtt}) fonts.")
+    (license license:lppl1.3+)))
+
+(define-deprecated-package texlive-latex-hyphenat texlive-hyphenat)
 
 (define-public texlive-lastpage
   (let ((template  (simple-texlive-package
-- 
cgit 1.4.1


From 55aa692e2266a0a941c25ccdcfc8c1a41c5246d6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 20:06:12 +0200
Subject: gnu: texlive-latex-tabto-ltx -> texlive-tabto-ltx.

* gnu/packages/tex.scm (texlive-tabto-ltx): New variable.
(texlive-latex-tabto-ltx): Deprecate variable.
---
 gnu/packages/tex.scm | 42 +++++++++++++++---------------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e517129616..2321bfb096 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12720,44 +12720,32 @@ It is particularly useful in the page footer that says: @samp{Page N of M}.")
 
 (define-deprecated-package texlive-latex-lastpage texlive-lastpage)
 
-(define-public texlive-latex-tabto-ltx
+(define-public texlive-tabto-ltx
   (package
-    (name "texlive-latex-tabto-ltx")
+    (name "texlive-tabto-ltx")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference (url (string-append
-                                        "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/tabto-ltx"))
-                                  (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1vq9s3n0mdgx2w84bjdsqxp3vcasfb824agjy56713902li1g8vm"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder (begin
-                   (use-modules (guix build utils))
-                   (let ((target (string-append (assoc-ref %outputs "out")
-                                  "/share/texmf-dist/tex/latex/tabto")))
-                     (mkdir-p target)
-                     (copy-recursively (assoc-ref %build-inputs "source")
-                                       target) #t))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tabto-ltx/" "tex/latex/tabto-ltx/")
+             (base32
+              "0q0v1pc4hvj71nayfpkj6gfwcbi18s5c526r1k7j4p9m5fcqmbgm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/tabto-ltx")
-    (synopsis "``Tab'' to a measured position in the line")
+    (synopsis "Tab to a measured position in the line")
     (description
      "This package provides @code{\\tabto{<length>}}, which moves the
 typesetting position to @code{<length>} from the left margin of the paragraph.
-If the typesetting position is already further along, @code{\\tabto} starts a
-new line; the command @code{\\tabto*} will move position backwards if
+If the typesetting position is already further along, @code{\\tabto} starts
+a new line; the command @code{\\tabto*} will move position backwards if
 necessary, so that previous text may be overwritten.  In addition, the command
 @code{\\TabPositions} may be used to define a set of tabbing positions, after
 which the command @code{\\tab} advances typesetting position to the next
-defined ``tab stop''.")
+defined tab stop.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-latex-tabto-ltx texlive-tabto-ltx)
+
 (define-public texlive-soul
   (let ((template (simple-texlive-package
                    "texlive-soul"
-- 
cgit 1.4.1


From c0b892b696473213754f34f7d58158cc0db2f51c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 21:11:04 +0200
Subject: gnu: Add texlive-regexpatch.

* gnu/packages/tex.scm (texlive-regexpatch): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2321bfb096..cf4d150de9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3849,6 +3849,32 @@ arrows; record information about document class(es) used; and many more.")
 
 (define-deprecated-package texlive-latex-oberdiek texlive-oberdiek)
 
+(define-public texlive-regexpatch
+  (package
+    (name "texlive-regexpatch")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/regexpatch/"
+                   "source/latex/regexpatch/"
+                   "tex/latex/regexpatch/")
+             (base32
+              "1jv8hvkvq0yvc8mh68ybj8fvhf6kcdzwjin1czs45i26s0dpsngj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-l3kernel
+           texlive-l3packages))
+    (home-page "https://ctan.org/pkg/regexpatch")
+    (synopsis "High level patching of commands")
+    (description
+     "The package generalises the macro patching commands provided by
+P. Lehmann's @code{etoolbox}.  The difference between this package and its
+sibling @code{xpatch} is that this package sports a very powerful
+@code{\\regexpatchcmd} based on the @code{l3regex} module of the LaTeX3
+experimental packages.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-rerunfilecheck
   (let ((template (simple-texlive-package
                    "texlive-rerunfilecheck"
-- 
cgit 1.4.1


From d2ddbfff440bd6dbe7a6121680088f2431d982d8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 21:26:06 +0200
Subject: gnu: texlive-latex-koma-script -> texlive-koma-script.

* gnu/packages/tex.scm (texlive-koma-script): New variable.
(texlive-latex-koma-script): Deprecate variable.
---
 gnu/packages/tex.scm | 92 +++++++++++++++++++++++-----------------------------
 1 file changed, 40 insertions(+), 52 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cf4d150de9..83bd66f57d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9388,64 +9388,52 @@ pstricks, it can produce either PostScript or PDF output.")
 
 (define-deprecated-package texlive-latex-pgf texlive-pgf)
 
-(define-public texlive-latex-koma-script
+(define-public texlive-koma-script
   (package
-    (name "texlive-latex-koma-script")
+    (name "texlive-koma-script")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/latex/koma-script"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1m6i8162r6ka19q517llrf0lax80rrsq564qirwk1chv5dqsmnfi"))))
-    (build-system trivial-build-system)
+    (source (texlive-origin
+             name version
+             (list "doc/latex/koma-script/"
+                   "source/latex/koma-script/"
+                   "tex/latex/koma-script/")
+             (base32
+              "0k8mhikpll066x3683gmg3xas7a2mz93b9fip4k56hacxxb6map1")))
+    (build-system texlive-build-system)
     (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils)
-                      (ice-9 match))
-         (let ((root (string-append (assoc-ref %outputs "out")
-                                    "/share/texmf-dist/"))
-               (pkgs '(("source" . "tex/latex/koma-script"))))
-           (for-each (match-lambda
-                       ((pkg . dir)
-                        (let ((target (string-append root dir)))
-                          (mkdir-p target)
-                          (copy-recursively (assoc-ref %build-inputs pkg)
-                                            target))))
-                     pkgs)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/koma-script")
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'move-required-files
+            ;; These files are required by the build process.
+            (lambda _
+              (for-each (lambda (f)
+                          (install-file
+                           (string-append "doc/latex/koma-script/" f)
+                           "build/"))
+                        '("komabug.tex" "manifest.txt" "INSTALL.txt"
+                          "INSTALLD.txt" "lppl.txt" "lppl-de.txt")))))))
+    (propagated-inputs
+     (list texlive-bookmark
+           texlive-eso-pic
+           texlive-etoolbox
+           texlive-graphics
+           texlive-l3packages
+           texlive-xpatch))
+    (home-page "https://ctan.org/pkg/koma-script")
     (synopsis "Bundle of versatile classes and packages")
     (description
-     "The KOMA-Script bundle provides replacements for the article, report, and
-book classes with emphasis on typography and versatility.  There is also a
-letter class.
-
-The bundle also offers:
-
-@itemize
-@item a package for calculating type areas in the way laid down by the
-typographer Jan Tschichold,
-@item packages for easily changing and defining page styles,
-@item a package scrdate for getting not only the current date but also the name
-of the day, and
-@item a package scrtime for getting the current time.
-@end itemize
-
-All these packages may be used not only with KOMA-Script classes but also with
-the standard classes.
+     "The KOMA-Script bundle provides replacements for the article, report,
+and book classes with emphasis on typography and versatility.  There is also
+a letter class.  The bundle also offers: a package for calculating type areas
+in the way laid down by the typographer Jan Tschichold, packages for easily
+changing and defining page styles, a package @code{scrdate} for getting not
+only the current date but also the name of the day, and a package
+@code{scrtime} for getting the current time.  All these packages may be used
+not only with KOMA-Script classes but also with the standard classes.")
+    (license license:lppl1.3c+)))
 
-Since every package has its own version number, the version number quoted only
-refers to the version of scrbook, scrreprt, scrartcl, scrlttr2 and
-typearea (which are the main parts of the bundle).")
-    (license license:lppl1.3+)))
+(define-deprecated-package texlive-latex-koma-script texlive-koma-script)
 
 (define-public texlive-atbegshi
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From 3623832a328953c1382d9cd8c68aa18894afb452 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 21:29:55 +0200
Subject: gnu: texlive-generic-babel-german -> texlive-babel-german.

* gnu/packages/tex.scm (texlive-babel-german): New variable.
(texlive-generic-babel-german): Deprecate variable.
---
 gnu/packages/tex.scm | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 83bd66f57d..2bf4f3225c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4666,29 +4666,31 @@ language of the document).")
 
 (define-deprecated-package texlive-generic-babel-french texlive-babel-french)
 
-(define-public texlive-generic-babel-german
+(define-public texlive-babel-german
   (package
-    (name "texlive-generic-babel-german")
+    (name "texlive-babel-german")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "generic" "babel-german"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1x9hnr9gz5mqdb97cinivn9xjnfr4qi996aa4cnr2sm2dsbhqxnp"))))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-german/"
+                   "source/generic/babel-german/"
+                   "tex/generic/babel-german/")
+             (base32
+              "0iwnn35xnpczi2gxrzrgyilh30qbnj6w05p3q0gvcmnisawfva9q")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "generic/babel-german"))
-    (home-page "https://www.ctan.org/pkg/babel-german")
-    (synopsis "Babel support for German")
-    (description
-     "This package provides the language definition file for support of German
-in @code{babel}.  It provides all the necessary macros, definitions and
-settings to typeset German documents.  The bundle includes support for the
-traditional and reformed German orthography as well as for the Austrian and
-Swiss varieties of German.")
+    (home-page "https://ctan.org/pkg/babel-german")
+    (synopsis "Babel support for documents written in German")
+    (description
+     "This bundle is an extension to the babel package for multilingual typesetting.
+It provides all the necessary macros, definitions and settings to typeset
+German documents.  The bundle includes support for the traditional and
+reformed German orthography as well as for the Austrian and Swiss varieties of
+German.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-generic-babel-german texlive-babel-german)
+
 (define-public texlive-babel-swedish
   (let ((template (simple-texlive-package
                    "texlive-babel-swedish"
-- 
cgit 1.4.1


From fc8cd00953081b07d549cbdf0c90f0305a1c6934 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 21:32:37 +0200
Subject: gnu: texlive-generic-babel-norsk -> texlive-babel-norsk.

* gnu/packages/tex.scm (texlive-babel-norsk): New variable.
(texlive-generic-babel-norsk): Deprecate variable.
---
 gnu/packages/tex.scm | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2bf4f3225c..d069251a4d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12135,27 +12135,29 @@ Finnish in @code{babel}.  It provides all the necessary macros, definitions and
 settings to typeset Finnish documents.")
       (license license:lppl1.3c+))))
 
-(define-public texlive-generic-babel-norsk
+(define-public texlive-babel-norsk
   (package
-    (name "texlive-generic-babel-norsk")
+    (name "texlive-babel-norsk")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "generic" "babel-norsk"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1yf538l2isxgmab8jslxxx5fbdk4njf147n4raf5vyw3l4slxm6m"))))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-norsk/"
+                   "source/generic/babel-norsk/"
+                   "tex/generic/babel-norsk/")
+             (base32
+              "1zsssgcdllhjk7r58k4rv8bh59nmj091syqj45chvp1i667ndryp")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "generic/babel-norsk"))
-    (home-page "https://www.ctan.org/pkg/babel-norsk")
+    (home-page "https://ctan.org/pkg/babel-norsk")
     (synopsis "Babel support for Norwegian")
     (description
-       "The package provides the language definition file for support of
-Norwegian in @code{babel}.  Some shortcuts are defined, as well as translations
-to Norsk of standard “LaTeX names”.")
+     "The package provides the language definition file for support of
+Norwegian in Babel.  Some shortcuts are defined, as well as translations to
+Norsk of standard LaTeX names.")
     (license license:lppl1.3+)))
 
+(define-deprecated-package texlive-generic-babel-norsk texlive-babel-norsk)
+
 (define-public texlive-babel-danish
   (let ((template (simple-texlive-package
                    "texlive-babel-danish"
-- 
cgit 1.4.1


From 16b71431dd7d3b1e79db557a09deeb65b684ba74 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 21:39:48 +0200
Subject: gnu: texlive-fonts-rsfs -> texlive-rsfs.

* gnu/packages/tex.scm (texlive-rsfs): New variable.
(texlive-fonts-rsfs): Deprecate variable.
* gnu/packages/docbook.scm (dblatex)[inputs]:
* gnu/packages/python-xyz.scm (python-nbconvert)[propagated-inputs]: Use new
name.
---
 gnu/packages/docbook.scm    |   2 +-
 gnu/packages/python-xyz.scm |   2 +-
 gnu/packages/tex.scm        | 123 ++++++++++++++++++++++----------------------
 3 files changed, 64 insertions(+), 63 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 674186a9fa..f16c8130e4 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -556,7 +556,7 @@ the in DocBook SGML DTDs.")
                                              texlive-titlesec
                                              texlive-wasysym
 
-                                             texlive-fonts-rsfs
+                                             texlive-rsfs
                                              texlive-stmaryrd
 
                                              texlive-iftex)))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c32dc25b88..2b615680e2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15203,12 +15203,12 @@ time.")
            (texlive-updmap.cfg (list texlive-amsfonts
                                      texlive-amsmath
                                      texlive-eurosym
-                                     texlive-fonts-rsfs
                                      texlive-jknappen
                                      texlive-lm
                                      texlive-lm-math
                                      texlive-mathpazo
                                      texlive-oberdiek
+                                     texlive-rsfs
                                      texlive-ucs
                                      texlive-zapfding))))
     (home-page "https://jupyter.org")
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d069251a4d..f98945d1f4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7303,79 +7303,80 @@ modules that use it.")
 
 (define-deprecated-package texlive-fonts-adobe-zapfding texlive-zapfding)
 
-(define-public texlive-fonts-rsfs
+(define-public texlive-rsfs
   (package
-    (name "texlive-fonts-rsfs")
+    (name "texlive-rsfs")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/fonts/source/public/rsfs/"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0r12pn02r4a955prcvq0048nifh86ihlcgvw3pppqqvfngv34l5h"))))
-    (build-system gnu-build-system)
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/rsfs/"
+                   "fonts/afm/public/rsfs/"
+                   "fonts/map/dvips/rsfs/"
+                   "fonts/source/public/rsfs/"
+                   "fonts/tfm/public/rsfs/"
+                   "fonts/type1/public/rsfs/"
+                   "tex/plain/rsfs/")
+             (base32
+              "1sa32wnsj84wbwqji1fb4k9ik99dy5ji7zz4v0xbd7306agyhns5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (arguments
-     `(#:modules ((guix build gnu-build-system)
-                  (guix build utils)
-                  (srfi srfi-1)
-                  (srfi srfi-26))
-       #:tests? #f                      ; no tests
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'build
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((mf (assoc-ref inputs "texlive-metafont")))
-               ;; Tell mf where to find mf.base
-               (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c"))
-               ;; Tell mf where to look for source files
-               (setenv "MFINPUTS"
-                       (string-append (getcwd) ":"
-                                      mf "/share/texmf-dist/metafont/base:"
-                                      (assoc-ref inputs "texlive-cm")
-                                      "/share/texmf-dist/fonts/source/public/cm")))
-             (mkdir "build")
-             (for-each (lambda (font)
-                         (format #t "building font ~a\n" font)
-                         (invoke "mf" "-progname=mf"
-                                 "-output-directory=build"
-                                 (string-append "\\"
-                                                "mode:=ljfour; "
-                                                "mag:=1; "
-                                                "batchmode; "
-                                                "input " (basename font ".mf"))))
-                       (find-files "." "[0-9]+\\.mf$"))
-             #t))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (tfm (string-append
-                          out "/share/texmf-dist/fonts/tfm/public/rsfs"))
-                    (mf  (string-append
-                          out "/share/texmf-dist/fonts/source/public/rsfs")))
-               (for-each (cut install-file <> tfm)
-                         (find-files "build" "\\.*"))
-               (for-each (cut install-file <> mf)
-                         (find-files "." "\\.mf"))
-               #t))))))
+     (list
+      #:modules
+      '((guix build texlive-build-system)
+        (guix build utils)
+        (srfi srfi-1)
+        (srfi srfi-26))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 're-generate-fonts-metrics
+            (lambda _
+              (let ((mf #$(this-package-native-input "texlive-metafont"))
+                    (cm #$(this-package-native-input "texlive-cm"))
+                    (root (getcwd)))
+                (mkdir-p "build")
+                (with-directory-excursion "fonts/source/public/rsfs"
+                  ;; Tell mf where to find mf.base.
+                  (setenv "MFBASES"
+                          (string-append mf "/share/texmf-dist/web2c"))
+                  ;; Tell mf where to look for source files.
+                  (setenv "MFINPUTS"
+                          (string-append
+                           (getcwd) ":"
+                           mf "/share/texmf-dist/metafont/base:"
+                           cm "/share/texmf-dist/fonts/source/public/cm"))
+                  ;; Build font metrics (tfm).
+                  (for-each (lambda (font)
+                              (format #t "building font ~a\n" font)
+                              (invoke "mf" "-progname=mf"
+                                      (string-append "-output-directory="
+                                                     root "/build")
+                                      (string-append "\\"
+                                                     "mode:=ljfour; "
+                                                     "mag:=1; "
+                                                     "batchmode; "
+                                                     "input "
+                                                     (basename font ".mf"))))
+                            (find-files "." "[0-9]+\\.mf$")))
+                ;; Install font metrics at the appropriate location.
+                (for-each
+                 (cut install-file <> "fonts/tfm/public/rsfs/")
+                 (find-files "build/" "\\.tfm$"))))))))
     (native-inputs
      (list texlive-bin texlive-metafont texlive-cm))
-    (home-page "https://www.ctan.org/pkg/rsfs")
+    (home-page "https://ctan.org/pkg/rsfs")
     (synopsis "Ralph Smith's Formal Script font")
     (description
      "The fonts provide uppercase formal script letters for use as symbols in
 scientific and mathematical typesetting (in contrast to the informal script
 fonts such as that used for the calligraphic symbols in the TeX maths symbol
-font).  The fonts are provided as Metafont source, and as derived Adobe Type 1
-format.  LaTeX support, for using these fonts in mathematics, is available via
-one of the packages @code{calrsfs} and @code{mathrsfs}.")
+font).  The fonts are provided as Metafont source, and as derived Adobe Type
+1 format.  LaTeX support, for using these fonts in mathematics, is available
+via one of the packages @code{calrsfs} and @code{mathrsfs}.")
     (license (license:fsf-free "http://mirrors.ctan.org/fonts/rsfs/README"))))
 
+(define-deprecated-package texlive-fonts-rsfs texlive-rsfs)
+
 (define-public texlive-eso-pic
   (let ((template (simple-texlive-package
                    "texlive-eso-pic"
-- 
cgit 1.4.1


From 8ace45c088497583c5a0a03cff3c09600a3d09b9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 21:44:45 +0200
Subject: gnu: texlive-fonts-iwona -> texlive-iwona.

* gnu/packages/tex.scm (texlive-iwona): New variable.
(texlive-fonts-iwona): Deprecate variable.
* gnu/packages/guile-xyz.scm (guile-cv)[native-inputs]: Use new name.
---
 gnu/packages/guile-xyz.scm | 13 ++++++------
 gnu/packages/tex.scm       | 53 +++++++++++++++++++---------------------------
 2 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 334996df0d..9c0b642b97 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -4044,12 +4044,13 @@ feature-set, fully programmable in Guile Scheme.")
     (inputs
      (list vigra vigra-c guile-2.2))
     (native-inputs
-     `(("texlive" ,(texlive-updmap.cfg (list texlive-booktabs
-                                        texlive-lm
-                                        texlive-siunitx
-                                        texlive-standalone
-                                        texlive-xcolor
-                                        texlive-fonts-iwona)))
+     `(("texlive" ,(texlive-updmap.cfg
+                    (list texlive-booktabs
+                          texlive-iwona
+                          texlive-lm
+                          texlive-siunitx
+                          texlive-standalone
+                          texlive-xcolor)))
        ("pkg-config" ,pkg-config)))
     (propagated-inputs
      `(("guile-lib" ,guile2.2-lib)))
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f98945d1f4..884f35c959 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7895,39 +7895,28 @@ TeX metrics (VF and TFM files) and macros for use with LaTeX.")
 
 (define-deprecated-package texlive-fonts-txfonts texlive-txfonts)
 
-(define-public texlive-fonts-iwona
+(define-public texlive-iwona
   (package
-    (name "texlive-fonts-iwona")
-    (version "0.995b")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://jmn.pl/pliki/Iwona-tex-"
-                                  (string-map (lambda (c)
-                                                (if (char=? c #\.)
-                                                    #\_ c))
-                                              version)
-                                  ".zip"))
-              (sha256
-               (base32
-                "13684iqx5granpc5rfvqnmyvdpgpbr1x9y7i7y7bcaq0qxv7ph1x"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/"))
-               (unzip  (search-input-file %build-inputs "/bin/unzip")))
-           (invoke unzip (assoc-ref %build-inputs "source"))
-           (mkdir-p target)
-           (copy-recursively "iwona" target)
-           #t))))
-    (native-inputs
-     (list unzip))
-    (home-page "http://jmn.pl/en/kurier-i-iwona/")
+    (name "texlive-iwona")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/iwona/"
+                   "fonts/afm/nowacki/iwona/"
+                   "fonts/enc/dvips/iwona/"
+                   "fonts/map/dvips/iwona/"
+                   "fonts/opentype/nowacki/iwona/"
+                   "fonts/tfm/nowacki/iwona/"
+                   "fonts/type1/nowacki/iwona/"
+                   "tex/latex/iwona/"
+                   "tex/plain/iwona/")
+             (base32
+              "1gk80zj711rcnk06cvszic7lpm06nj47kbypg13rpijdzfsvmi8m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/iwona")
     (synopsis "Sans-serif typeface for TeX")
-    (description "Iwona is a two-element sans-serif typeface. It was created
+    (description "Iwona is a two-element sans-serif typeface.  It was created
 as an alternative version of the Kurier typeface, which was designed in 1975
 for a diploma in typeface design at the Warsaw Academy of Fine Arts under the
 supervision of Roman Tomaszewski.  Kurier was designed for linotype
@@ -7936,6 +7925,8 @@ alternative version of the Kurier fonts.  The difference lies in the absence
 of ink traps which typify the Kurier font.")
     (license license:gfl1.0)))
 
+(define-deprecated-package texlive-fonts-iwona texlive-iwona)
+
 (define-public texlive-jknappen
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From ac29f53d304ed6b875562375fbc66c9cd366f8fd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 21:47:36 +0200
Subject: gnu: texlive-tex-texinfo -> texlive-texinfo.

* gnu/packages/tex.scm (texlive-texinfo): New variable.
(texlive-tex-texinfo): Deprecate variable.
* doc/build.scm (pdf-manual):
* gnu/packages/finance.scm (optionmatrix):
* gnu/packages/lisp.scm (sbcl):
* gnu/packages/plotutils.scm (asymptote):
* gnu/packages/scheme.scm (mit-scheme):
* gnu/packages/xdisorg.scm (xforms): Use new name.
---
 doc/build.scm              |  2 +-
 gnu/packages/finance.scm   |  2 +-
 gnu/packages/lisp.scm      |  2 +-
 gnu/packages/plotutils.scm |  2 +-
 gnu/packages/scheme.scm    |  5 +++--
 gnu/packages/tex.scm       | 38 ++++++++++++--------------------------
 gnu/packages/xdisorg.scm   |  2 +-
 7 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/doc/build.scm b/doc/build.scm
index 995f4878e1..9c0cc99404 100644
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -916,7 +916,7 @@ makeinfo OPTIONS."
                      texlive-bin        ;for GUIX_TEXMF
                      texlive-epsf
                      texlive-ec
-                     texlive-tex-texinfo)))))
+                     texlive-texinfo)))))
 
   (define build
     (with-imported-modules '((guix build utils))
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index eb480762ed..e0d6bd6e2c 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -2073,7 +2073,7 @@ trading, and risk management in real-life.")
      (list gsl gtk+ ncurses))
     (native-inputs
      (list pkg-config texinfo
-           (texlive-updmap.cfg (list texlive-epsf texlive-tex-texinfo))))
+           (texlive-updmap.cfg (list texlive-epsf texlive-texinfo))))
     (home-page "https://anthonybradford.github.io/optionmatrix/")
     (synopsis "Financial derivative calculator")
     (description
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 37735020ad..900daca53c 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -481,7 +481,7 @@ an interpreter, a compiler, a debugger, and much more.")
            ed
            inetutils         ;for hostname(1)
            texinfo
-           (texlive-updmap.cfg (list texlive-tex-texinfo))
+           (texlive-updmap.cfg (list texlive-texinfo))
            which))
     (inputs
      (list gmp                          ; for sb-gmp
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 4a681d3ecb..db14272804 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -325,7 +325,7 @@ colors, styles, options and details.")
                   texlive-ocgx2
                   texlive-parskip
                   texlive-pdftexcmds
-                  texlive-tex-texinfo))))
+                  texlive-texinfo))))
     (inputs
      (list bash-minimal
            eigen
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 215ea741f8..a4f43001ca 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -191,8 +191,9 @@
        ("autoconf" ,autoconf)
        ("automake" ,automake)
        ("libtool" ,libtool)
-       ("texlive" ,(texlive-updmap.cfg (list texlive-tex-texinfo
-                                             texlive-epsf)))
+       ("texlive" ,(texlive-updmap.cfg
+                    (list texlive-epsf
+                          texlive-texinfo)))
        ("texinfo" ,texinfo)
        ("ghostscript" ,ghostscript)
        ("m4" ,m4)))
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 884f35c959..a83310619e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6523,34 +6523,18 @@ a few situations where longtable has problems.")
 
 (define-deprecated-package texlive-latex-supertabular texlive-supertabular)
 
-(define-public texlive-tex-texinfo
+(define-public texlive-texinfo
   (package
-    (name "texlive-tex-texinfo")
+    (name "texlive-texinfo")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/tex/texinfo"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1qcmcsxdsibca0mad559vhz36xaxsbkivgv1hc98vdyd90fg4y31"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/texinfo")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/texinfo")
-    (synopsis "TeX macros to handle Texinfo files")
+    (source (texlive-origin
+             name version
+             (list "tex/texinfo/")
+             (base32
+              "0wbbhjr1jqiicnssiy6n5s4v5p6axhlilpkfhix4kavbj8mb6mfn")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/texinfo")
+    (synopsis "Texinfo documentation system")
     (description
      "Texinfo is the preferred format for documentation in the GNU project;
 the format may be used to produce online or printed output from a single
@@ -6559,6 +6543,8 @@ other programs in the distribution offer online interactive use (with
 hypertext linkages in some cases).")
     (license license:gpl3+)))
 
+(define-deprecated-package texlive-tex-texinfo texlive-texinfo)
+
 (define-public texlive-textcase
   (package
     (inherit (simple-texlive-package
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 1f7539764c..da5ca76e10 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -3486,7 +3486,7 @@ the following features:
                            texinfo
                            texi2html
                            (texlive-updmap.cfg (list texlive-epsf
-                                                     texlive-tex-texinfo))
+                                                     texlive-texinfo))
                            imagemagick))
       (propagated-inputs (list libx11 libxpm libjpeg-turbo))
       (home-page "http://xforms-toolkit.org/")
-- 
cgit 1.4.1


From f626769b3aaa9c3ba9c5b0b56f68b0591ce574b8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 21:53:07 +0200
Subject: gnu: texlive-tex-plain -> texlive-plain.

* gnu/packages/tex.scm (texlive-plain): New variable.
(texlive-tex-plain): Deprecate variable.
(texlive-hyph-utf8):
(texlive-latex-base):
(texlive-pdftex):
(texlive-xetex):
* gnu/packages/chez.scm (chez-web): Use new name.
---
 gnu/packages/chez.scm |  2 +-
 gnu/packages/tex.scm  | 42 ++++++++++++++++++++++++++----------------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index b988b00fd7..86dd47d2ec 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -1025,7 +1025,7 @@ create compilers, making them easier to understand and maintain.")
                                        texlive-pdftex
                                        texlive-context
                                        texlive-cm
-                                       texlive-tex-plain))))
+                                       texlive-plain))))
       (arguments
        (list
         #:make-flags
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a83310619e..643030870d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1723,15 +1723,23 @@ programmers may assume e-TeX functionality.  The pdftex engine directly
 incorporates the e-TeX extensions.")
       (license license:knuth))))
 
-(define-public texlive-tex-plain
+(define-public texlive-plain
   (package
-    (inherit (simple-texlive-package
-              "texlive-tex-plain"
-              (list "/tex/plain/")
-              (base32
-               "1hafbphx1486069cky87hyksx6ia5gd83m4wp2xmgc09z87faf0h")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/plain")
+    (name "texlive-plain")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "makeindex/plain/" "tex/plain/base/"
+                   "tex/plain/config/")
+             (base32
+              "0zwvrfw8z28c9dy8nby5qfwbyrd2a0cdfwyd5jndscjczhw0yi62")))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:tex-engine "tex"
+      #:tex-format #f
+      #:texlive-latex-base #f))
+    (home-page "https://ctan.org/pkg/plain")
     (synopsis "Plain TeX format and supporting files")
     (description
      "This package contains files used to build the Plain TeX format, as
@@ -1739,6 +1747,8 @@ described in the TeXbook, together with various supporting files (some also
 discussed in the book).")
     (license license:knuth)))
 
+(define-deprecated-package texlive-tex-plain texlive-plain)
+
 (define-public texlive-halloweenmath
   (let ((template (simple-texlive-package
                    "texlive-halloweenmath"
@@ -2724,7 +2734,7 @@ T1/EC and UTF-8 encodings.")
                (mkdir-p where)
                (with-directory-excursion where
                  (invoke "tex" "-ini"
-                         (string-append (assoc-ref inputs "texlive-tex-plain")
+                         (string-append (assoc-ref inputs "texlive-plain")
                                         "/share/texmf-dist/tex/plain/config/tex.ini"))))))
          (add-before 'build 'build-loaders-and-converters
            (lambda* (#:key outputs #:allow-other-keys)
@@ -2759,12 +2769,12 @@ T1/EC and UTF-8 encodings.")
     (native-inputs
      (list ruby-2.7
            texlive-bin
-           ;; The following packages are needed for build "tex.fmt", which we need
-           ;; for a working "tex".
-           texlive-tex-plain
+           ;; The following packages are needed for build "tex.fmt", which we
+           ;; need for a working "tex".
            texlive-cm
            texlive-knuth-lib
-           texlive-hyphen-base))
+           texlive-hyphen-base
+           texlive-plain))
     (home-page "https://ctan.org/pkg/hyph-utf8")
     (synopsis "Hyphenation patterns expressed in UTF-8")
     (description "Modern native UTF-8 engines such as XeTeX and LuaTeX need
@@ -3152,7 +3162,7 @@ formats.")
       (native-inputs
        `(("texlive-bin" ,texlive-bin)
          ("texlive-tex-ini-files" ,texlive-tex-ini-files)
-         ("texlive-tex-plain" ,texlive-tex-plain)
+         ("texlive-plain" ,texlive-plain)
          ("texlive-kpathsea" ,texlive-kpathsea)
          ("texlive-cm" ,texlive-cm)
          ("texlive-latex-fonts" ,texlive-latex-fonts)
@@ -8489,7 +8499,7 @@ e-TeX.")
            texlive-hyphen-base
            texlive-kpathsea
            texlive-tex-ini-files
-           texlive-tex-plain))
+           texlive-plain))
     (home-page "https://www.ctan.org/pkg/pdftex")
     (synopsis "TeX extension for direct creation of PDF")
     (description
@@ -12929,7 +12939,7 @@ itself may be shipped out to the DVI file.")
            texlive-l3packages
            texlive-lm
            texlive-tex-ini-files
-           texlive-tex-plain
+           texlive-plain
            texlive-unicode-data))
     (home-page "https://www.tug.org/texlive/")
     (synopsis "Extended variant of TeX for use with Unicode sources")
-- 
cgit 1.4.1


From c89e6f6d3228d20b36a13511767af449c4bd4ee0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 21:59:42 +0200
Subject: gnu: texlive-metapost: Refresh package definition.

* gnu/packages/tex.scm (texlive-metapost)[source]: Use TEXLIVE-ORIGIN
instead of TEXLIVE-REF and SVN-FETCH.
[build-system]: Use TEXLIVE-BUILD-SYSTEM.
---
 gnu/packages/tex.scm | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 643030870d..7d64eef2a8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8225,29 +8225,29 @@ the derived Type 1 font, together with support files for TeX (LaTeX).")
   (package
     (name "texlive-metapost")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (svn-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist/"
-                                        "/metapost"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "140k9dz2g2vj5ypgyqx3px9c1y9a820y8kq139p96lw0yk6839aw"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/metapost")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/metapost")
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/dvitomp.1"
+                   "doc/man/man1/dvitomp.man1.pdf"
+                   "doc/man/man1/mpost.1"
+                   "doc/man/man1/mpost.man1.pdf"
+                   "doc/metapost/base/"
+                   "fonts/afm/metapost/"
+                   "fonts/enc/dvips/metapost/"
+                   "fonts/map/dvips/metapost/"
+                   "fonts/tfm/metapost/"
+                   "fonts/type1/metapost/"
+                   "metapost/base/"
+                   "metapost/config/"
+                   "metapost/misc/"
+                   "metapost/support/charlib/"
+                   "tex/generic/metapost/")
+             (base32
+              "04pgi23frfk6ds10zypqvki0852ds7m1s52c5qvbpyl647nfbgc5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-kpathsea))
+    (home-page "https://ctan.org/pkg/metapost")
     (synopsis "Create scalable illustrations")
     (description
      "MetaPost uses a language based on that of Metafont to produce precise
-- 
cgit 1.4.1


From 280e221b821643ba565ed522c0982cce69cf70a2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 22:04:42 +0200
Subject: gnu: texlive-wasysym: Refresh package definition.

* gnu/packages/tex.scm (texlive-wasysym)[source]: Use TEXLIVE-ORIGIN
instead of TEXLIVE-REF and SVN-FETCH.
---
 gnu/packages/tex.scm | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7d64eef2a8..d890ce42db 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8351,23 +8351,22 @@ the @code{wasysym} package.")
   (package
     (name "texlive-wasysym")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "wasysym"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0zxcf0pfqf439cfwl0r5dd93b0v4pbiih36n2pwshdlvnmy0nr50"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/wasysym/" "source/latex/wasysym/"
+                   "tex/latex/wasysym/")
+             (base32
+              "1n0rrrh510hy04a4fkxqh7skwfhp3xiiji78cw3mc65g06h1jyjc")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/wasysym"))
-    (home-page "https://www.ctan.org/pkg/wasysym")
-    (synopsis "LaTeX support file to use the @code{wasy} fonts")
+    (home-page "https://ctan.org/pkg/wasysym")
+    (synopsis "LaTeX support for the @code{wasy} fonts")
     (description
-     "The @code{wasy} (Waldi Symbol) font by Roland Waldi provides many glyphs like
-male and female symbols and astronomical symbols, as well as the complete
+     "The @code{wasy} (Waldi Symbol) font by Roland Waldi provides many glyphs
+like male and female symbols and astronomical symbols, as well as the complete
 @code{lasy} font set and other odds and ends.  The @code{wasysym} package
 implements an easy to use interface for these symbols.")
-    (license license:lppl)))
+    (license license:lppl1.3c)))
 
 (define-deprecated-package texlive-latex-wasysym texlive-wasysym)
 
-- 
cgit 1.4.1


From 5cabaffe677cb767b5b8666528e060218e7c4956 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 22:07:43 +0200
Subject: gnu: texlive-bibtex: Refresh package definition.

* gnu/packages/tex.scm (texlive-bibtex)[source]: Use TEXLIVE-ORIGIN
instead of TEXLIVE-REF and SVN-FETCH.
[build-system]: Use TEXLIVE-BUILD-SYSTEM.
---
 gnu/packages/tex.scm | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d890ce42db..384509f17a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9918,30 +9918,20 @@ AMS-LaTeX, AMS-TeX, and plain TeX).  The distribution includes Michael Barr's
   (package
     (name "texlive-bibtex")
     (version (number->string %texlive-revision))
-    (source
-     (origin
-       (method svn-fetch)
-       (uri (svn-reference
-             (url (string-append "svn://www.tug.org/texlive/tags/"
-                                 %texlive-tag "/Master/texmf-dist/"
-                                 "/bibtex"))
-             (revision %texlive-revision)))
-       (file-name (string-append name "-" version "-checkout"))
-       (sha256
-        (base32
-         "0fr0s3jhrvplddb42if570dxllz54fa0pf4d2am27h8m385nghbf"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let ((target (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/bibtex")))
-           (mkdir-p target)
-           (copy-recursively (assoc-ref %build-inputs "source") target)
-           #t))))
-    (home-page "https://www.ctan.org/pkg/bibtex")
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/base/"
+                   "bibtex/bst/base/"
+                   "doc/bibtex/base/"
+                   "doc/man/man1/bibtex.1"
+                   "doc/man/man1/bibtex.man1.pdf"
+                   "tex/generic/bibtex/")
+             (base32
+              "0h72ckha1mv1a2i5v85l68amfc0kf0km9iyin6vxxal69146j8gp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-kpathsea))
+    (home-page "https://ctan.org/pkg/bibtex")
     (synopsis "Process bibliographies for LaTeX")
     (description
      "BibTeX allows the user to store his citation data in generic form, while
-- 
cgit 1.4.1


From 75ce154dd69218a76bd9d7ff0210e95cd28c6c52 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 22:24:58 +0200
Subject: gnu: Add texlive-newverbs.

* gnu/packages/tex.scm (texlive-newverbs): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 384509f17a..06a0dbc73d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5610,6 +5610,33 @@ Unicode option of @code{inputenc} or @code{inputenx}, or by XeLaTeX/LuaLaTeX.")
 
 (define-deprecated-package texlive-latex-newunicodechar texlive-newunicodechar)
 
+(define-public texlive-newverbs
+  (package
+    (name "texlive-newverbs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/newverbs/" "source/latex/newverbs/"
+                   "tex/latex/newverbs/")
+             (base32
+              "1m3afrpyc75g5gdxfknad565r5jgmwks98skkqycm66i92ky9dqr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs
+     (list texlive-ydoc))
+    (home-page "https://ctan.org/pkg/newverbs")
+    (synopsis "Define new versions of @code{\\verb}")
+    (description
+     "The package allows the definition of @code{\\verb} variants which add
+TeX code before and after the verbatim text (e.g., quotes or surrounding
+@code{\\fbox@{@}}).  When used together with the @code{shortvrb} package it
+allows the definition of short verbatim characters which use this package's
+variant instead of the normal @code{\\verb}.  In addition, it is possible to
+collect an argument verbatim to either typeset or write it into a file.  The
+@code{\\Verbdef} command defines verbatim text to a macro which can later be
+used to write the verbatim text to a file.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-pdftexcmds
   (let ((template (simple-texlive-package
                    "texlive-pdftexcmds"
-- 
cgit 1.4.1


From 38bef53c0b8081c7cb67e12b55fc73c3ed37bea2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 22:26:18 +0200
Subject: gnu: Add texlive-svn-prov.

* gnu/packages/tex.scm (texlive-svn-prov): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 06a0dbc73d..0989eecc04 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4210,6 +4210,27 @@ default is a stub that just loads @code{graphicx}.")
 string between different encodings.  Both LaTeX and plain-TeX are supported.")
     (license license:lppl1.3c+)))
 
+(define-public texlive-svn-prov
+  (package
+    (name "texlive-svn-prov")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/svn-prov/" "source/latex/svn-prov/"
+                   "tex/latex/svn-prov/")
+             (base32
+              "1w416cf1yb1m2j9y38002zq6rbhbmkafi7w100y9m9lrzya0ws06")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/svn-prov")
+    (synopsis "Subversion variants of @code{\\Provides}... macros")
+    (description
+     "The package introduces Subversion variants of the standard LaTeX macros
+@code{\\ProvidesPackage}, @code{\\ProvidesClass} and @code{\\ProvidesFile}
+where the file name and date is extracted from Subversion Id keywords.  The
+file name may also be given explicitly as an optional argument.")
+    (license license:lppl)))
+
 (define-public texlive-l3build
   (let ((template (simple-texlive-package
                    "texlive-l3build"
-- 
cgit 1.4.1


From e9af8651ed3a3cc1f554c6f3c8a612a0dce00c00 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 22:57:18 +0200
Subject: gnu: Add texlive-gincltex.

* gnu/packages/tex.scm (texlive-gincltex): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0989eecc04..109c3e8468 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3498,6 +3498,30 @@ verbatim source).")
 
 (define-deprecated-package texlive-latex-fancyvrb texlive-fancyvrb)
 
+(define-public texlive-gincltex
+  (package
+    (name "texlive-gincltex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gincltex/" "source/latex/gincltex/"
+                   "tex/latex/gincltex/")
+             (base32
+              "1x6bsf445dp8wc5hfgyywlal8vky5w23d69zlpybkp2d9am9a71p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-adjustbox
+           texlive-svn-prov))
+    (home-page "https://ctan.org/pkg/gincltex")
+    (synopsis "Include TeX files as graphics")
+    (description
+     "The package builds on the standard LaTeX packages @code{graphics} and
+allows external LaTeX source files to be included, in the same way as graphic
+files, by @code{\\includegraphics}.  In effect, then package adds support for
+the @file{.tex} extension.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-glyphlist
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 3a9c2bd78231ca082362693e1942b246b846eb07 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 22:15:17 +0200
Subject: gnu: texlive-ydoc: Refresh package definition.

* gnu/packages/tex.scm (texlive-ydoc): Remove `simple-texlive-package' call.
[propagated-inputs]: Add TEXLIVE-ETOOLBOX, TEXLIVE-FLOAT, TEXLIVE-HYPERREF,
TEXLIVE-LISTINGS, TEXLIVE-NEEDSPACE, TEXLIVE-SVN-PROV, TEXLIVE-TOOLS,
TEXLIVE-URL, TEXLIVE-XCOLOR.
---
 gnu/packages/tex.scm | 65 ++++++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 109c3e8468..1559028b4c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10241,42 +10241,47 @@ standards-compliant PDF documents with pdfTeX, LuaTeX and XeTeX.")
 (define-deprecated-package texlive-latex-pdfx texlive-pdfx)
 
 (define-public texlive-ydoc
-  (let ((template (simple-texlive-package
-                   "texlive-ydoc"
-                   (list "/doc/latex/ydoc/"
-                         "/source/latex/ydoc/")
-                   (base32
-                    "0ckcpy1b8v1fk3qc8qkxgiag2wc0qzxm6bgksv000m4m1hsi2g8b")
-                   #:trivial? #f)))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "latex/ydoc")
-         ((#:build-targets _ #t)
-          ''("ydoc.dtx"))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'chdir
-               (lambda _ (chdir "source/latex/ydoc") #t))
-             (add-after 'copy-files 'move-files
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 (let ((source (assoc-ref inputs "source"))
-                       (doc (string-append (assoc-ref outputs "doc")
-                                           "/share/texmf-dist/doc")))
-                   (copy-recursively (string-append source "/doc")  doc))))))))
-      (home-page "http://www.ctan.org/pkg/ydoc")
-      (synopsis "Macros for documentation of LaTeX classes and packages")
-      (description "The package provides macros and environments to document
+  (package
+    (name "texlive-ydoc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ydoc/" "source/latex/ydoc/"
+                   "tex/generic/ydoc/" "tex/latex/ydoc/")
+             (base32
+              "1z7690vin47mw47gjg7k4h49b4ckg6g96l1zlziyjmjbkyzmyhdn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'create-missing-directories
+            ;; XXX: These directories are not created even though they belong
+            ;; to locations in TEXLIVE-ORIGIN.  Create them manually.
+            (lambda _
+              (mkdir-p "tex/generic/ydoc/")
+              (mkdir-p "tex/latex/ydoc/"))))))
+    (propagated-inputs
+     (list texlive-etoolbox
+           texlive-float
+           texlive-hyperref
+           texlive-listings
+           texlive-needspace
+           texlive-svn-prov
+           texlive-tools
+           texlive-url
+           texlive-xcolor))
+    (home-page "https://ctan.org/pkg/ydoc")
+    (synopsis "Macros for documentation of LaTeX classes and packages")
+    (description "The package provides macros and environments to document
 LaTeX packages and classes.  It is an (as yet unfinished) alternative to the
 @code{ltxdoc} class and the @code{doc} or @code{xdoc} packages.  The aim is to
 provide a different layout and more modern styles (using the @code{xcolor},
 @code{hyperref} packages, etc.)  This is an alpha release, and should probably
 not (yet) be used with other packages, since the implementation might
 change.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
 
 (define-public texlive-pstricks
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From ee42abab0755d13507b460d79072766fbb791c94 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 22:33:00 +0200
Subject: gnu: texlive-fontaxes: Refresh package definition.

* gnu/packages/tex.scm (texlive-fontaxes)[source]: Use TEXLIVE-ORIGIN
instead of TEXLIVE-REF and SVN-FETCH.
---
 gnu/packages/tex.scm | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1559028b4c..6138020564 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11021,24 +11021,22 @@ matching maths fonts are provided by the @code{fourier} and
 (define-public texlive-fontaxes
   (package
     (name "texlive-fontaxes")
-    (version "1.0e")
-    (source
-     (origin
-       (method svn-fetch)
-       (uri (texlive-ref "latex" "fontaxes"))
-       (file-name (string-append name "-" version "-checkout"))
-       (sha256
-        (base32
-         "0j3w1y66pkf3bjl9dh5xy3lfg33rg08s4wx37a3jcndvcji20j3f"))))
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fontaxes/" "source/latex/fontaxes/"
+                   "tex/latex/fontaxes/")
+             (base32
+              "1d9ji2qvjf1ky8l6rfqbag2hw61r0hyjxkzsp18s4pckyq4dqwdm")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/fontaxes"))
-    (home-page "http://www.ctan.org/pkg/fontaxes")
+    (home-page "https://ctan.org/pkg/fontaxes")
     (synopsis "Additional font axes for LaTeX")
-    (description "The @code{fontaxes} package adds several new font
-axes on top of LaTeX's New Font Selection Scheme (NFSS).  In
-particular, it splits the shape axis into a primary and a secondary
-shape axis and it adds three new axes to deal with the different
-figure versions offered by many professional fonts.")
+    (description "The @code{fontaxes} package adds several new font axes on
+top of LaTeX's New Font Selection Scheme (NFSS).  In particular, it splits the
+shape axis into a primary and a secondary shape axis and it adds three new
+axes to deal with the different figure versions offered by many professional
+fonts.")
     (license license:lppl1.3+)))
 
 (define-public texlive-preprint
-- 
cgit 1.4.1


From 42b6162483de728994b016d5a2dec6adb7359b36 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 22:35:19 +0200
Subject: gnu: texlive-kastrup: Refresh package definition.

* gnu/packages/tex.scm (texlive-kastrup)[source]: Use TEXLIVE-ORIGIN
instead of TEXLIVE-REF and SVN-FETCH.
---
 gnu/packages/tex.scm | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6138020564..b0aa3a5086 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11608,31 +11608,23 @@ pre-compiled font files, and documentation.")
   (package
     (name "texlive-kastrup")
     (version (number->string %texlive-revision))
-    (source
-     (origin
-       (method svn-fetch)
-       (uri (texlive-ref "generic" "kastrup"))
-       (file-name (string-append name "-" version "-checkout"))
-       (sha256
-        (base32
-         "1kkshc48brkq2nx3rlbv78a2130izykbf33ri1q2shqr8pjfmmq8"))))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/kastrup/"
+                   "source/generic/kastrup/"
+                   "tex/generic/kastrup/")
+             (base32
+              "0sbf4xw1jsh9pbjhqw3f0bg067f0rhf936wfnqpzj9kp2167n41j")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     '(#:tex-directory "generic/kastrup"
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-generated-file
-           (lambda _
-             (delete-file "binhex.drv")
-             #t)))))
-    (home-page "http://www.ctan.org/pkg/binhex")
+    (home-page "https://ctan.org/pkg/binhex")
     (synopsis "Convert numbers into binary, octal and hexadecimal")
-    (description "The @code{kastrup} package provides the
-@emph{binhex.tex} file.  This file provides expandable macros for both
-fixed-width and minimum-width numbers to bases 2, 4, 8 and 16.  All
-constructs TeX accepts as arguments to its @code{\\number} primitive
-are valid as arguments for the macros.  The package may be used under
-LaTeX and plain TeX.")
+    (description
+     "The @code{kastrup} package provides the @emph{binhex.tex} file.  This
+file provides expandable macros for both fixed-width and minimum-width numbers
+to bases 2, 4, 8 and 16.  All constructs TeX accepts as arguments to its
+@code{\\number} primitive are valid as arguments for the macros.  The package
+may be used under LaTeX and plain TeX.")
     (license (license:fsf-free "file:/binhex.dtx"))))
 
 (define-public texlive-translations
-- 
cgit 1.4.1


From 51cb4f98370e889c724a3775a2a65e867836359f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 23:00:15 +0200
Subject: gnu: texlive-collectbox: Refresh package definition.

* gnu/packages/tex.scm (texlive-collectbox): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b0aa3a5086..948be9a296 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11363,24 +11363,24 @@ DVI is output, store boxes behave the same as save boxes.")
       (license license:lppl1.3))))
 
 (define-public texlive-collectbox
-  (let ((template (simple-texlive-package
-                   "texlive-collectbox"
-                   (list "/source/latex/collectbox/")
-                   (base32
-                    "1k0bbphvr20k9hgpr3dv869h9ygxx3g8vjapkc63nq8i13crpsvz"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/collectbox")
-         ((#:build-targets _ '())
-          ''("collectbox.ins"))))
-      (native-inputs
-       (list texlive-ydoc))
-      (home-page "https://www.ctan.org/pkg/collectbox")
-      (synopsis "Collect and process macro arguments as boxes")
-      (description "The package provides macros to collect and process a macro
+  (package
+    (name "texlive-collectbox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/collectbox/"
+                   "source/latex/collectbox/"
+                   "tex/latex/collectbox/")
+             (base32
+              "106k01lgnvikndk48r5ms9xj3gmynv2xy20090frr7sa3g9k42za")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs
+     (list texlive-ydoc))
+    (home-page "https://ctan.org/pkg/collectbox")
+    (synopsis "Collect and process macro arguments as boxes")
+    (description
+     "The package provides macros to collect and process a macro
 argument (i.e., something which looks like a macro argument) as a horizontal
 box rather than as a real macro argument.  The \"arguments\" are stored as if
 they had been saved by @code{\\savebox} or by the @code{lrbox} environment.
@@ -11389,7 +11389,7 @@ the user to have the beginning and end of a group in different macro
 invocations, or to place them in the begin and end code of an environment.
 Arguments may contain verbatim material or other special use of characters.
 The macros were designed for use within other macros.")
-      (license license:lppl1.3))))
+    (license license:lppl1.3)))
 
 (define-public texlive-grfext
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From a1998bb56cabb2ecfe66bbdd9454f49cc6a14c50 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 23:02:28 +0200
Subject: gnu: texlive-ifoddpage: Refresh package definition.

* gnu/packages/tex.scm (texlive-ifoddpage): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 948be9a296..3e04c0adc4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11312,30 +11312,30 @@ a physical page.")
       (license license:lppl))))
 
 (define-public texlive-ifoddpage
-  (let ((template (simple-texlive-package
-                   "texlive-ifoddpage"
-                   (list "/source/latex/ifoddpage/")
-                   (base32
-                    "14x0haj3xjsk9dn2djg117sl7x5nbwgbivhjj3ichnxlgrlf1bis"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/ifoddpage")
-         ((#:build-targets _ '())
-          ''("ifoddpage.ins"))))
-      (native-inputs
-       (list texlive-ydoc))
-      (home-page "https://www.ctan.org/pkg/ifoddpage")
-      (synopsis "Determine if the current page is odd or even")
-      (description "This package provides an @code{\\ifoddpage} conditional to
-determine if the current page is odd or even.  The macro @code{\\checkoddpage}
-must be used directly before to check the page number using a label.  Two
-compiler runs are therefore required to achieve correct results.  In addition,
-the conditional @code{\\ifoddpageoronside} is provided which is also true in
-@code{oneside} mode where all pages use the odd page layout.")
-      (license license:lppl1.3))))
+  (package
+    (name "texlive-ifoddpage")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ifoddpage/"
+                   "source/latex/ifoddpage/"
+                   "tex/latex/ifoddpage/")
+             (base32
+              "06xn3dwf6aa8j3lmvvgwfadw2ahw770jx91x8nyl8zir58aiys5s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs
+     (list texlive-ydoc))
+    (home-page "https://ctan.org/pkg/ifoddpage")
+    (synopsis "Determine if the current page is odd or even")
+    (description
+     "This package provides an @code{\\ifoddpage} conditional to determine if
+the current page is odd or even.  The macro @code{\\checkoddpage} must be used
+directly before to check the page number using a label.  Two compiler runs are
+therefore required to achieve correct results.  In addition, the conditional
+@code{\\ifoddpageoronside} is provided which is also true in @code{oneside}
+mode where all pages use the odd page layout.")
+    (license license:lppl1.3)))
 
 (define-public texlive-storebox
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From 2a9e1049698cf9b44789886d8c012bf27a2ba6c2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 23:04:13 +0200
Subject: gnu: texlive-storebox: Refresh package definition.

* gnu/packages/tex.scm (texlive-storebox): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 48 +++++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3e04c0adc4..7da5d65f6e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11338,29 +11338,31 @@ mode where all pages use the odd page layout.")
     (license license:lppl1.3)))
 
 (define-public texlive-storebox
-  (let ((template (simple-texlive-package
-                   "texlive-storebox"
-                   (list "/source/latex/storebox/")
-                   (base32
-                    "1ybpjfrria57fwvr9kriiw6y76ivwvsyb6ayp0bi750smsv8k5n1"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/storebox")
-         ((#:build-targets _ '())
-          ''("storebox.ins"))))
-      (native-inputs
-       (list texlive-ydoc))
-      (home-page "https://www.ctan.org/pkg/storebox")
-      (synopsis "Storing information for reuse")
-      (description "The package provides \"store boxes\" whose user interface
-matches that of normal LaTeX \"save boxes\", except that the content of a
-store box appears at most once in the output PDF file, however often it is
-used.  The present version of the package supports pdfLaTeX and LuaLaTeX; when
-DVI is output, store boxes behave the same as save boxes.")
-      (license license:lppl1.3))))
+  (package
+    (name "texlive-storebox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/storebox/" "source/latex/storebox/"
+                   "tex/latex/storebox/")
+             (base32
+              "1vbjq9aq2kbncq1dn4rk7jspfb6kcxk66h49z0xz1qix5yg94gmx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs
+     (list texlive-ydoc))
+    (propagated-inputs
+     (list texlive-collectbox
+           texlive-iftex))
+    (home-page "https://ctan.org/pkg/storebox")
+    (synopsis "Storing information for reuse")
+    (description
+     "The package provides store boxes whose user interface matches that of
+normal LaTeX save boxes, except that the content of a store box appears at
+most once in the output PDF file, however often it is used.  The present
+version of the package supports pdfLaTeX and LuaLaTeX; when DVI is output,
+store boxes behave the same as save boxes.")
+    (license license:lppl1.3+)))
 
 (define-public texlive-collectbox
   (package
-- 
cgit 1.4.1


From 2682be0aa7614831a9812b67c7c98b93c0932d0a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 23:07:37 +0200
Subject: gnu: texlive-adjustbox: Refresh package definition.

* gnu/packages/tex.scm (texlive-adjustbox): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-GRAPHICS, TEXLIVE-TOOLS.
---
 gnu/packages/tex.scm | 54 ++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7da5d65f6e..227a365807 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11417,32 +11417,32 @@ the list of graphics file extensions recognised by package graphics.")
       (license license:lppl1.3c+))))
 
 (define-public texlive-adjustbox
-  (let ((template (simple-texlive-package
-                   "texlive-adjustbox"
-                   (list "/doc/latex/adjustbox/"
-                         "/source/latex/adjustbox/")
-                   (base32
-                    "074nxbnl184b6iwhis5n85pilq3b2pld3bbrq0wc30hw462m898k"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/adjustbox")
-         ((#:build-targets _ '())
-          ''("adjustbox.ins"))))
-      (native-inputs
-       (list texlive-ydoc))
-      (propagated-inputs
-       (list texlive-collectbox
-             texlive-ifoddpage
-             texlive-pgf
-             texlive-storebox
-             texlive-varwidth
-             texlive-xkeyval))
-      (home-page "https://www.ctan.org/pkg/adjustbox")
-      (synopsis "Graphics package-alike macros for “general” boxes")
-      (description "The package provides several macros to adjust boxed
+  (package
+    (name "texlive-adjustbox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/adjustbox/"
+                   "source/latex/adjustbox/"
+                   "tex/latex/adjustbox/")
+             (base32
+              "01r6cb8aadbgsfcqhqnwaig3xwzgr0nfxci3mzb8ln3k4dghmq97")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs
+     (list texlive-ydoc))
+    (propagated-inputs
+     (list texlive-collectbox
+           texlive-graphics
+           texlive-ifoddpage
+           texlive-pgf
+           texlive-storebox
+           texlive-tools
+           texlive-varwidth
+           texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/adjustbox")
+    (synopsis "Graphics package-alike macros for general boxes")
+    (description "The package provides several macros to adjust boxed
 content.  One purpose is to supplement the standard @code{graphics} package,
 which defines the macros @code{\\resizebox}, @code{\\scalebox} and
 @code{\\rotatebox} , with the macros @code{\\trimbox} and @code{\\clipbox}.
@@ -11451,7 +11451,7 @@ The main feature is the general @code{\\adjustbox} macro which extends the
 @code{graphics} package and applies it to general text content.  Additional
 provided box macros are @code{\\lapbox}, @code{\\marginbox},
 @code{\\minsizebox}, @code{\\maxsizebox} and @code{\\phantombox}.")
-      (license license:lppl1.3))))
+    (license license:lppl1.3+)))
 
 (define-public texlive-qrcode
   (package
-- 
cgit 1.4.1


From ef74e252d735c65393f8a92debf9d3cbc521e816 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 22:12:14 +0200
Subject: gnu: texlive-standalone: Refresh package definition.

* gnu/packages/tex.scm (texlive-standalone)[source]: Use TEXLIVE-ORIGIN
instead of TEXLIVE-REF and SVN-FETCH.
---
 gnu/packages/tex.scm | 52 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 227a365807..391c6956cd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10469,30 +10469,42 @@ keys.")
   (package
     (name "texlive-standalone")
     (version (number->string %texlive-revision))
-    (source
-     (origin
-       (method svn-fetch)
-       (uri (texlive-ref "latex" "standalone"))
-       (file-name (string-append name "-" version "-checkout"))
-       (sha256
-        (base32
-         "192ydxcn8ir96q8qwvnppksmqf5i0p50i0wz6iqazbwmh3dqxpx4"))))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/standalone/"
+                   "source/latex/standalone/"
+                   "tex/latex/standalone/"
+                   "tex/plain/standalone/")
+             (base32
+              "00cs6bxpcpl8fjld280af52njkv44fm81yww9ynhqa9xp49q0p90")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/standalone"))
-    (propagated-inputs
-     (list texlive-xkeyval))
     (native-inputs
      (list texlive-ydoc))
-    (home-page "http://www.ctan.org/pkg/standalone")
+    (propagated-inputs
+     (list texlive-adjustbox
+           texlive-currfile
+           texlive-filemod
+           texlive-gincltex
+           texlive-iftex
+           texlive-multido
+           texlive-pdftexcmds
+           texlive-pgf
+           texlive-preview
+           texlive-pstricks
+           texlive-tools
+           texlive-varwidth
+           texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/standalone")
     (synopsis "Compile TeX pictures stand-alone or as part of a document")
-    (description "A class and package is provided which allows TeX pictures or
-other TeX code to be compiled standalone or as part of a main document.
-Special support for pictures with beamer overlays is also provided.  The
-package is used in the main document and skips extra preambles in sub-files.
-The class may be used to simplify the preamble in sub-files.  By default the
-@code{preview} package is used to display the typeset code without margins.
-The behaviour in standalone mode may adjusted using a configuration file
-@code{standalone.cfg} to redefine the standalone environment.")
+    (description
+     "This package provides a class and package is provided which allows TeX
+pictures or other TeX code to be compiled standalone or as part of a main
+document.  Special support for pictures with @code{beamer} overlays is also
+provided.  The package is used in the main document and skips extra preambles
+in sub-files.  The class may be used to simplify the preamble in sub-files.
+By default the @code{preview} package is used to display the typeset code
+without margins.")
     (license license:lppl1.3+)))
 
 (define-public texlive-siunitx
-- 
cgit 1.4.1


From 2791f221f82efaf74fb43cecab8897e53a95f46b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 23:20:19 +0200
Subject: gnu: Add texlive-modes.

* gnu/packages/tex.scm (texlive-modes): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 391c6956cd..5835663c6f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -957,6 +957,32 @@ word in the phrase, where the words are separated by regular
 spaces.  (Exceptions can be made for words that shouldn't be converted.)")
     (license license:lppl1.3+)))
 
+(define-public texlive-modes
+  (package
+    (name "texlive-modes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/modes/"
+                   "fonts/source/public/modes/")
+             (base32
+              "1vz3ygpixswnk7hr3qfn3nffw460cp5wjq09q5ac83ddw3nya1ca")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:texlive-latex-base #f))
+    (home-page "https://ctan.org/pkg/modes")
+    (synopsis "Collection of Metafont @code{mode_def}'s")
+    (description
+     "The modes file collects all known Metafont modes for printing or display
+devices, of whatever printing technology.  Special provision is made for
+write-white printers, and a landscape mode is available, for making suitable
+fonts for printers with pixels whose aspect is non-square.  The file also
+provides definitions that make @code{\\specials} identifying the mode in
+Metafont's GF output, and put coding information and other Xerox-world
+information in the TFM file.")
+    (license license:public-domain)))
+
 (define-public texlive-fontinst
   (let ((template (simple-texlive-package
                    "texlive-fontinst"
-- 
cgit 1.4.1


From e98ecc95491d20e43571e5fe9f5d46a494319d47 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 23:20:42 +0200
Subject: gnu: texlive-metafont: Refresh package definition.

* gnu/packages/tex.scm (texlive-metafont)[source]: Use TEXLIVE-ORIGIN instead
of SVN-MULTI-FETCH and SVN-MULTI-REFERENCE.
[build-system]: Use TEXLIVE-BUILD-SYSTEM.
[native-inputs]: Add texlive-modes.
---
 gnu/packages/tex.scm | 92 +++++++++++++++++++++++++---------------------------
 1 file changed, 45 insertions(+), 47 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5835663c6f..8e85d5c78e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -873,55 +873,53 @@ to adapt the plain e-TeX source file to work with XeTeX and LuaTeX.")
   (package
     (name "texlive-metafont")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-multi-fetch)
-              (uri (svn-multi-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        %texlive-tag "/Master/texmf-dist"))
-                    (locations '("/metafont/"
-                                 "/fonts/source/public/modes/"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "17y72xmz5a36vdsq7pfrwj0j4c7llrm9j5kcq349cpaas7r32lmb"))))
-    (build-system gnu-build-system)
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/inimf.1"
+                   "doc/man/man1/inimf.man1.pdf"
+                   "doc/man/man1/mf-nowin.1"
+                   "doc/man/man1/mf-nowin.man1.pdf"
+                   "doc/man/man1/mf.1"
+                   "doc/man/man1/mf.man1.pdf"
+                   "metafont/base/"
+                   "metafont/config/"
+                   "metafont/misc/")
+             (base32
+              "1zzab3b8h2xsp88jqjr64i7f0yiqzd9rmzyvpgbfpyhd4sdl4fk4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (arguments
-     `(#:tests? #f ; no test target
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'build
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let* ((cwd (getcwd))
-                    (mf (string-append cwd "/metafont"))
-                    (modes (string-append cwd "/fonts/source/public/modes")))
-               (setenv "MFINPUTS"
-                       (string-append modes ":"
-                                      mf "/base:"
-                                      mf "/misc:"
-                                      mf "/roex:"
-                                      mf "/feynmf:"
-                                      mf "/mfpic:"
-                                      mf "/config")))
-             (mkdir "build")
-             (with-directory-excursion "build"
-               (invoke "inimf" "mf.mf"))))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out  (assoc-ref outputs "out"))
-                    (base (string-append out "/share/texmf-dist/web2c"))
-                    (mf   (string-append out "/share/texmf-dist/metafont/")))
-               (mkdir-p base)
-               (mkdir-p mf)
-               (install-file "build/mf.base" base)
-               (with-directory-excursion "metafont"
-                 (for-each (lambda (where)
-                             (copy-recursively where (string-append mf where)))
-                           (list "base" "misc" "config")))))))))
+     (list
+      #:texlive-latex-base #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'build 'generate-mf.base
+            ;; Even though the file "mf.base" does not appear in tlpdb, it
+            ;; must be generated and provided in metafont package.
+            (lambda _
+              (let* ((cwd (getcwd))
+                     (mf (string-append cwd "/metafont"))
+                     (modes #$(this-package-native-input "texlive-modes")))
+                (setenv "MFINPUTS"
+                        (string-append
+                         modes "/share/texmf-dist/fonts/source/public/modes:"
+                         mf "/base:"
+                         mf "/misc:"
+                         mf "/roex:"
+                         mf "/feynmf:"
+                         mf "/mfpic:"
+                         mf "/config")))
+              ;; "build" directory was not created during `build' phases since
+              ;; there is no ".ins" nor ".dtx" file to process.
+              (mkdir-p "build")
+              (with-directory-excursion "build"
+                (invoke "inimf" "mf.mf")
+                (install-file "mf.base"
+                              (string-append #$output
+                                             "/share/texmf-dist/web2c"))))))))
     (native-inputs
-     (list texlive-bin))
-    (home-page "https://www.ctan.org/pkg/metafont")
+     (list texlive-bin texlive-modes))
+    (home-page "https://ctan.org/pkg/metafont")
     (synopsis "Metafont base files")
     (description "This package provides the Metafont base files needed to
 build fonts using the Metafont system.")
-- 
cgit 1.4.1


From 7ad5fc1b83630f89011646a58116a516286d8ca8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 23:28:14 +0200
Subject: gnu: texlive-docstrip: Refresh package definition.

* gnu/packages/tex.scm (texlive-docstrip): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8e85d5c78e..52a72f0b8d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -719,12 +719,16 @@ Alphalph's commands can be used as a replacement for LaTeX's
 
 (define texlive-docstrip
   (package
-    (inherit (simple-texlive-package
-              "texlive-docstrip"
-              (list "/tex/latex/base/docstrip.tex")
-              (base32
-               "1pxbqbia0727vg01xv8451szm55z2w8sb0vv3kf4iqx5ibb6m0d2")
-              #:trivial? #t))
+    (name "texlive-docstrip")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "/tex/latex/base/docstrip.tex")
+             (base32
+              "1pxbqbia0727vg01xv8451szm55z2w8sb0vv3kf4iqx5ibb6m0d2")))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:texlive-latex-base #f))
     (home-page "https://www.ctan.org/texlive")
     (synopsis "Utility to strip documentation from TeX files")
     (description "This package provides the docstrip utility to strip
-- 
cgit 1.4.1


From 9e3beaa3acf36325ee06c9d5eab8b2b9bc6f97fb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 14 May 2023 23:59:18 +0200
Subject: gnu: Add texlive-xetexconfig.

* gnu/packages/tex.scm (texlive-xetexconfig): New variable.
---
 gnu/packages/tex.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 52a72f0b8d..4aedaaaf2f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13008,6 +13008,22 @@ reporting the number of the last page, as does @code{lastpage}).  The counter
 itself may be shipped out to the DVI file.")
       (license license:lppl))))
 
+(define-public texlive-xetexconfig
+  (package
+    (name "texlive-xetexconfig")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/xelatex/xetexconfig/")
+             (base32
+              "1253njshiwdayzq0xir9cmbi8syhjb3sc4pyrw9p6kzyqvckkcxm")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xetexconfig")
+    (synopsis "@file{crop.cfg} for XeLaTeX")
+    (description "The @file{crop.cfg} file attempts to persuade
+@file{crop.sty} to work with XeTeX.")
+    (license license:public-domain)))
+
 (define-public texlive-xetex
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 167c27f33fbaadd1fc79e95f5ee69bccc857d185 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:04:16 +0200
Subject: gnu: texlive-xetex: Refresh package definition.

* gnu/packages/tex.scm (texlive-xetex): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-XETEXCONFIG.  Re-order alphabetically.
---
 gnu/packages/tex.scm | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4aedaaaf2f..160f926ba4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13026,16 +13026,20 @@ itself may be shipped out to the DVI file.")
 
 (define-public texlive-xetex
   (package
-    (inherit (simple-texlive-package
-              "texlive-xetex"
-              (list "/doc/man/man1/xetex.1"
-                    "/doc/man/man1/xelatex.1"
-                    "/doc/xetex/base/"
-                    "/fonts/misc/xetex/fontmapping/base/"
-                    "/tex/xelatex/xetexconfig/")
-              (base32
-               "0j396anlhk5pqrnwxr8bpq55sp3qfyb6n9g08x4nmaa6p9b9y8ab")
-              #:trivial? #t))
+    (name "texlive-xetex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/xelatex.1"
+                   "doc/man/man1/xelatex.man1.pdf"
+                   "doc/man/man1/xetex.1"
+                   "doc/man/man1/xetex.man1.pdf"
+                   "doc/xetex/base/"
+                   "fonts/misc/xetex/fontmapping/base/")
+             (base32
+              "15bjr41p9l5d6837hy3nrhkkylgv04b0150vysyg5730svh3fnan")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (propagated-inputs
      (list texlive-atbegshi
            texlive-atveryend
@@ -13046,16 +13050,17 @@ itself may be shipped out to the DVI file.")
            texlive-everyshi
            texlive-firstaid
            texlive-hyphen-base
-           texlive-latex-base
-           texlive-latex-fonts
            texlive-l3backend
            texlive-l3kernel
            texlive-l3packages
+           texlive-latex-base
+           texlive-latex-fonts
            texlive-lm
-           texlive-tex-ini-files
            texlive-plain
-           texlive-unicode-data))
-    (home-page "https://www.tug.org/texlive/")
+           texlive-tex-ini-files
+           texlive-unicode-data
+           texlive-xetexconfig))
+    (home-page "https://ctan.org/pkg/xetex")
     (synopsis "Extended variant of TeX for use with Unicode sources")
     (description
      "XeTeX is a TeX typesetting engine using Unicode and supporting modern font
-- 
cgit 1.4.1


From 16da792e2ff6ccfda05e8e19db3801a43ea975da Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:06:31 +0200
Subject: gnu: texlive-substr: Refresh package definition.

* gnu/packages/tex.scm (texlive-substr): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 160f926ba4..0fad3dab4e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12930,24 +12930,22 @@ recurrences of, a substring.  The package works equally in Plain TeX and LaTeX
 
 (define-public texlive-substr
   (package
-    (inherit (simple-texlive-package
-              "texlive-substr"
-              (list "doc/latex/substr/"
-                    "tex/latex/substr/")
-              (base32
-               "0kfd4kq5yrg65f2mpric1cs1xr416wgj9bdixpibgjsdg5fb73sw")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/substr")
+    (name "texlive-substr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/substr/" "tex/latex/substr/")
+             (base32
+              "0kfd4kq5yrg65f2mpric1cs1xr416wgj9bdixpibgjsdg5fb73sw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/substr")
     (synopsis "Deal with substrings in strings")
     (description
-     "The package provides commands to deal with substrings of strings.  Macros
-are provided to:
-
-@itemize
-@item determine if one string is a substring of another,
-@item return the parts of a string before or after a substring, and
-@item count the number of occurrences of a substring.
-@end itemize")
+     "The package provides commands to deal with substrings of strings.
+Macros are provided to determine if one string is a substring of another,
+return the parts of a string before or after a substring, and count the number
+of occurrences of a substring.")
     (license license:lppl1.0+)))
 
 (define-public texlive-totcount
-- 
cgit 1.4.1


From eb4c4b26fa8d76319d858f663273d5eea6cebd3f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:08:12 +0200
Subject: gnu: texlive-xstring: Refresh package definition.

* gnu/packages/tex.scm (texlive-xstring): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0fad3dab4e..a0eea5963f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12906,25 +12906,26 @@ UTF-8.  Namely the input encodings in @file{utf8.def} from package
       (license license:lppl1.3+))))
 
 (define-public texlive-xstring
-  (let ((template (simple-texlive-package
-                   "texlive-xstring"
-                   (list "/doc/generic/xstring/"
-                         "/tex/generic/xstring/")
-                   (base32
-                    "1azpq855kq1l4686bjp8haxim5c8wycz1b6lcg5q7x8kb4g9sppn")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (home-page "http://www.ctan.org/pkg/xstring")
-      (synopsis "String manipulation for (La)TeX")
-      (description
-       "@code{xstring} package provides macros for manipulating strings --
+  (package
+    (name "texlive-xstring")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/xstring/" "tex/generic/xstring/")
+             (base32
+              "1azpq855kq1l4686bjp8haxim5c8wycz1b6lcg5q7x8kb4g9sppn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xstring")
+    (synopsis "String manipulation for (La)TeX")
+    (description
+     "The @code{xstring} package provides macros for manipulating strings, i.e.,
 testing a string's contents, extracting substrings, substitution of substrings
 and providing numbers such as string length, position of, or number of
-recurrences of, a substring.  The package works equally in Plain TeX and LaTeX
-(though e-TeX is always required).  The strings to be processed may contain
-(expandable) macros.")
-      (license license:lppl1.3c))))
+recurrences of, a substring.  The package works equally in Plain TeX and
+LaTeX (though e-TeX is always required).  The strings to be processed may
+contain (expandable) macros.")
+    (license license:lppl1.3c)))
 
 (define-deprecated texlive-generic-xstring texlive-xstring)
 
-- 
cgit 1.4.1


From 849074f7938d46e323be12d6f6519939b791d40f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:11:10 +0200
Subject: gnu: texlive-sourcecodepro: Refresh package definition.

* gnu/packages/tex.scm (texlive-sourcecodepro): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-FONTAXES, TEXLIVE-IFTEX, TEXLIVE-MWEIGHTS, TEXLIVE-XKEYVAL.
---
 gnu/packages/tex.scm | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a0eea5963f..f7ecc6a9ac 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12753,20 +12753,28 @@ use of the fonts in LaTeX (Type 1) and XeLaTeX/LuaLaTeX (OTF).")
 
 (define-public texlive-sourcecodepro
   (package
-    (inherit (simple-texlive-package
-              "texlive-sourcecodepro"
-              '("/doc/latex/sourcecodepro/"
-                "/fonts/enc/dvips/sourcecodepro/"
-                "/fonts/map/dvips/sourcecodepro/"
-                "/fonts/opentype/adobe/sourcecodepro/"
-                ;; ^ see comment on texlive-sourcesanspro
-                "/fonts/tfm/adobe/sourcecodepro/"
-                "/fonts/type1/adobe/sourcecodepro/"
-                "/fonts/vf/adobe/sourcecodepro/"
-                "/tex/latex/sourcecodepro/")
-              (base32
-               "009v9y7d3vsljgq9nw5yx4kzyqavxbwrlvwhfjj83s6rmb9xcrmh")
-              #:trivial? #t))
+    (name "texlive-sourcecodepro")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sourcecodepro/"
+                   "fonts/enc/dvips/sourcecodepro/"
+                   "fonts/map/dvips/sourcecodepro/"
+                   "fonts/opentype/adobe/sourcecodepro/"
+                   ;; ^ See comment in `texlive-sourcesanspro'.
+                   "fonts/tfm/adobe/sourcecodepro/"
+                   "fonts/type1/adobe/sourcecodepro/"
+                   "fonts/vf/adobe/sourcecodepro/"
+                   "tex/latex/sourcecodepro/")
+             (base32
+              "009v9y7d3vsljgq9nw5yx4kzyqavxbwrlvwhfjj83s6rmb9xcrmh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-fontaxes
+           texlive-iftex
+           texlive-mweights
+           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/sourcecodepro")
     (synopsis "Use Source Code Pro with TeX(-alike) systems")
     (description "This package provides the Source Code Pro font family from
-- 
cgit 1.4.1


From 51a6a326c7e6d06970f3fbb4294777e025891109 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:14:10 +0200
Subject: gnu: texlive-sourceserifpro: Refresh package definition.

* gnu/packages/tex.scm (texlive-sourceserifpro): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-FONTAXES, TEXLIVE-IFTEX, TEXLIVE-MWEIGHTS, TEXLIVE-XKEYVAL.
---
 gnu/packages/tex.scm | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f7ecc6a9ac..932b5aa89d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12730,25 +12730,34 @@ use of the fonts in LaTeX (Type 1) and XeLaTeX/LuaLaTeX (OTF).")
 
 (define-public texlive-sourceserifpro
   (package
-    (inherit (simple-texlive-package
-              "texlive-sourceserifpro"
-              '("/doc/latex/sourceserifpro/"
-                "/fonts/enc/dvips/sourceserifpro/"
-                "/fonts/map/dvips/sourceserifpro/"
-                "/fonts/opentype/adobe/sourceserifpro/"
-                ;; ^ see comment on texlive-sourcesanspro
-                "/fonts/tfm/adobe/sourceserifpro/"
-                "/fonts/type1/adobe/sourceserifpro/"
-                "/fonts/vf/adobe/sourceserifpro/"
-                "/tex/latex/sourceserifpro/")
-              (base32
-               "18xxncg8ybv86r46zq5mvgkrfnvlhx93n55fy8nkk8vdmminrh8w")
-              #:trivial? #t))
+    (name "texlive-sourceserifpro")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sourceserifpro/"
+                   "fonts/enc/dvips/sourceserifpro/"
+                   "fonts/map/dvips/sourceserifpro/"
+                   "fonts/opentype/adobe/sourceserifpro/"
+                   ;; ^ See comment in `texlive-sourcesanspro'.
+                   "fonts/tfm/adobe/sourceserifpro/"
+                   "fonts/type1/adobe/sourceserifpro/"
+                   "fonts/vf/adobe/sourceserifpro/"
+                   "tex/latex/sourceserifpro/")
+             (base32
+              "18xxncg8ybv86r46zq5mvgkrfnvlhx93n55fy8nkk8vdmminrh8w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-fontaxes
+           texlive-iftex
+           texlive-mweights
+           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/sourceserifpro")
     (synopsis "Use Source Serif Pro with TeX(-alike) systems")
-    (description "This package provides the Source Serif Pro font family from
-Adobe in both Adobe Type 1 and OpenType formats, plus macros supporting the
-use of the fonts in LaTeX (Type 1) and XeLaTeX/LuaLaTeX (OTF).")
+    (description
+     "This package provides the Source Serif Pro font family from Adobe in
+both Adobe Type 1 and OpenType formats, plus macros supporting the use of the
+fonts in LaTeX (Type 1) and XeLaTeX/LuaLaTeX (OTF).")
     (license (list license:lppl1.3+ license:silofl1.1))))
 
 (define-public texlive-sourcecodepro
-- 
cgit 1.4.1


From 3284c1eed33001b6cda0d3a286659bb9f49d03a8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:17:47 +0200
Subject: gnu: texlive-sourcesanspro: Refresh package definition.

* gnu/packages/tex.scm (texlive-sourcesanspro): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-FONTAXES, TEXLIVE-IFTEX, TEXLIVE-MWEIGHTS, TEXLIVE-XKEYVAL.
---
 gnu/packages/tex.scm | 53 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 932b5aa89d..b18cd1fd7e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12702,30 +12702,39 @@ algebra, using Dirac notation.")
 
 (define-public texlive-sourcesanspro
   (package
-    (inherit (simple-texlive-package
-              "texlive-sourcesanspro"
-              '("/doc/latex/sourcesanspro/"
-                "/fonts/enc/dvips/sourcesanspro/"
-                "/fonts/map/dvips/sourcesanspro/"
-                "/fonts/opentype/adobe/sourcesanspro/"
-                ;; ^ It would be tempting to use our
-                ;; font-adobe-source-sans-pro for these, but the version in
-                ;; texlive could differ from our version: probably the
-                ;; difference would be small, but debugging would not be fun.
-                ;; If the files are really identical, Guix will hard-link them
-                ;; anyway.
-                "/fonts/tfm/adobe/sourcesanspro/"
-                "/fonts/type1/adobe/sourcesanspro/"
-                "/fonts/vf/adobe/sourcesanspro/"
-                "/tex/latex/sourcesanspro/")
-              (base32
-               "18z7ln8dyh0sp6v0vdvc6qqxnpg3h3ix0f5magjcjbpay54kl0i3")
-              #:trivial? #t))
+    (name "texlive-sourcesanspro")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sourcesanspro/"
+                   "fonts/enc/dvips/sourcesanspro/"
+                   "fonts/map/dvips/sourcesanspro/"
+                   "fonts/opentype/adobe/sourcesanspro/"
+                   ;; ^ It would be tempting to use our
+                   ;; font-adobe-source-sans-pro for these, but the version in
+                   ;; texlive could differ from our version: probably the
+                   ;; difference would be small, but debugging would not be
+                   ;; fun.  If the files are really identical, Guix will
+                   ;; hard-link them anyway.
+                   "fonts/tfm/adobe/sourcesanspro/"
+                   "fonts/type1/adobe/sourcesanspro/"
+                   "fonts/vf/adobe/sourcesanspro/"
+                   "tex/latex/sourcesanspro/")
+             (base32
+              "18z7ln8dyh0sp6v0vdvc6qqxnpg3h3ix0f5magjcjbpay54kl0i3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-fontaxes
+           texlive-iftex
+           texlive-mweights
+           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/sourcesanspro")
     (synopsis "Use Source Sans Pro with TeX(-alike) systems")
-    (description "This package provides the Source Sans Pro font family from
-Adobe in both Adobe Type 1 and OpenType formats, plus macros supporting the
-use of the fonts in LaTeX (Type 1) and XeLaTeX/LuaLaTeX (OTF).")
+    (description
+     "This package provides the Source Sans Pro font family from Adobe in both
+Adobe Type 1 and OpenType formats, plus macros supporting the use of the fonts
+in LaTeX (Type 1) and XeLaTeX/LuaLaTeX (OTF).")
     (license (list license:lppl1.3+ license:silofl1.1))))
 
 (define-public texlive-sourceserifpro
-- 
cgit 1.4.1


From 05184cdaf304a2e7490a7cb8834b57d9c2ae131a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:20:40 +0200
Subject: gnu: texlive-physics: Refresh package definition.

* gnu/packages/tex.scm (texlive-physics): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-AMSMATHS, TEXLIVE-L3PACKAGES.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b18cd1fd7e..e0b2f6423c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12686,18 +12686,24 @@ bibliographies, and displaying personal pronouns.")
 
 (define-public texlive-physics
   (package
-    (inherit (simple-texlive-package
-              "texlive-physics"
-              '("/doc/latex/physics/"
-                "/tex/latex/physics/")
-              (base32
-               "1wy58wwcv1pv18xs1n71abnm73dqnxqijxvhfxk0rcmvbc6wvwrb")
-              #:trivial? #t))
+    (name "texlive-physics")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/physics/" "tex/latex/physics/")
+             (base32
+              "1wy58wwcv1pv18xs1n71abnm73dqnxqijxvhfxk0rcmvbc6wvwrb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-amsmath
+           texlive-l3packages))
     (home-page "https://ctan.org/pkg/physics")
     (synopsis "Macros supporting the Mathematics of Physics")
-    (description "The package defines simple and flexible macros for
-typesetting equations in the languages of vector calculus and linear
-algebra, using Dirac notation.")
+    (description
+     "The package defines simple and flexible macros for typesetting equations
+in the languages of vector calculus and linear algebra, using Dirac
+notation.")
     (license license:lppl)))
 
 (define-public texlive-sourcesanspro
-- 
cgit 1.4.1


From b407ff1506d444a2e57a83520a065f6e0dc60c72 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:22:19 +0200
Subject: gnu: texlive-comment: Refresh package definition.

* gnu/packages/tex.scm (texlive-comment): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e0b2f6423c..a75c2aa015 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12645,13 +12645,15 @@ package allows such line breaks in the generated links.")
 
 (define-public texlive-comment
   (package
-    (inherit (simple-texlive-package
-              "texlive-comment"
-              '("/doc/latex/comment/"
-                "/tex/latex/comment/")
-              (base32
-               "1c1mqziwxyf1bqzpw6ji65n7ypygm3lyknblxmf0c70w0ivw76pa")
-              #:trivial? #t))
+    (name "texlive-comment")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/comment/" "tex/latex/comment/")
+             (base32
+              "1c1mqziwxyf1bqzpw6ji65n7ypygm3lyknblxmf0c70w0ivw76pa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/comment")
     (synopsis "Selectively include/exclude portions of text")
     (description "This package provides environments for selectively including
-- 
cgit 1.4.1


From 428914a8979986c210c2bcd02bd676a237642ebf Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:24:26 +0200
Subject: gnu: texlive-everyshi: Refresh package definition.

* gnu/packages/tex.scm (texlive-everyshi): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[arguments]<#:tex-format>: Set to "latex".
---
 gnu/packages/tex.scm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a75c2aa015..918f6516fe 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12548,14 +12548,18 @@ compatibility reasons.  See @code{lthooks-doc.pdf} for instructions how to use
 
 (define-public texlive-everyshi
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-everyshi"
-      (list "doc/latex/everyshi/"
-            "source/latex/everyshi/"
-            "tex/latex/everyshi/")
-      (base32 "11y6xazv1nk0m2hzsainjr8ijn5cff04xfccm6a65hzg7ipggraj")
-      #:trivial? #t))
+    (name "texlive-everyshi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/everyshi/" "source/latex/everyshi/"
+                   "tex/latex/everyshi/")
+             (base32
+              "11y6xazv1nk0m2hzsainjr8ijn5cff04xfccm6a65hzg7ipggraj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:tex-format "latex"))
     (home-page "https://ctan.org/pkg/everyshi")
     (synopsis "Take action at every @code{\\shipout}")
     (description
-- 
cgit 1.4.1


From c81bf9c1e4375096f13caa1ec53d29040345764a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:26:15 +0200
Subject: gnu: texlive-everysel: Refresh package definition.

* gnu/packages/tex.scm (texlive-everysel): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[arguments]<#:tex-format>: Set to "latex".
---
 gnu/packages/tex.scm | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 918f6516fe..940df9dd96 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12526,24 +12526,27 @@ layout, etc.")
 
 (define-public texlive-everysel
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-everysel"
-      (list "doc/latex/everysel/"
-            "source/latex/everysel/"
-            "tex/latex/everysel/")
-      (base32 "0skzm2qsk5vpjxgslclp4pvbbcrrnm1w3df8xfvfq252dyd7w8s5")
-      #:trivial? #t))
+    (name "texlive-everysel")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/everysel/" "source/latex/everysel/"
+                   "tex/latex/everysel/")
+             (base32
+              "0skzm2qsk5vpjxgslclp4pvbbcrrnm1w3df8xfvfq252dyd7w8s5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:tex-format "latex"))
     (home-page "https://ctan.org/pkg/everysel")
     (synopsis "Provides hooks into @code{\\selectfont}")
     (description
-     "The @code{everysel} package provided hooks whose arguments are executed just
-after LaTeX has loaded a new font by means of @code{\\selectfont}.  It has
-become obsolete with LaTeX versions 2021/01/05 or newer, since LaTeX now
+     "The @code{everysel} package provided hooks whose arguments are executed
+just after LaTeX has loaded a new font by means of @code{\\selectfont}.  It
+has become obsolete with LaTeX versions 2021/01/05 or newer, since LaTeX now
 provides its own hooks to fulfill this task.  For newer versions of LaTeX
 @code{everysel} only provides macros using LaTeX's hook management due to
-compatibility reasons.  See @code{lthooks-doc.pdf} for instructions how to use
-@code{lthooks} instead of @code{everysel}.")
+compatibility reasons.")
     (license license:lppl1.3c)))
 
 (define-public texlive-everyshi
-- 
cgit 1.4.1


From dc3b2e5ae31a5eb29f9d33df081095b979bf5afe Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:27:32 +0200
Subject: gnu: texlive-relsize: Refresh package definition.

* gnu/packages/tex.scm (texlive-relsize): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 940df9dd96..5e5ce93a21 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12486,13 +12486,15 @@ to the @code{xr} package for external document references.")
 
 (define-public texlive-relsize
   (package
-    (inherit (simple-texlive-package
-              "texlive-relsize"
-              (list "doc/latex/relsize/"
-                    "tex/latex/relsize/")
-              (base32
-               "07g9wqxsh3a9rmfbppaqhyic82a1i1habizaf4hpdi3246w6nnby")
-              #:trivial? #t))
+    (name "texlive-relsize")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/relsize/" "tex/latex/relsize/")
+             (base32
+              "07g9wqxsh3a9rmfbppaqhyic82a1i1habizaf4hpdi3246w6nnby")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/relsize")
     (synopsis "Set the font size relative to the current font size")
     (description
-- 
cgit 1.4.1


From e47494e51a7545faa7b49934c437b353f460de02 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:29:20 +0200
Subject: gnu: texlive-ragged2e: Refresh package definition.

* gnu/packages/tex.scm (texlive-ragged2e): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-EVERYSEL, TEXLIVE-FOOTMISC.
---
 gnu/packages/tex.scm | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5e5ce93a21..65e00f8d8e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12438,22 +12438,30 @@ tables).")
 
 (define-public texlive-ragged2e
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-ragged2e"
-      (list "doc/latex/ragged2e/"
-            "source/latex/ragged2e/"
-            "tex/latex/ragged2e/")
-      (base32 "1cxj5jdgvr3xk1inrb3yzpm3l386jjawgpqiwsz53k6yshb6yfml")
-      #:trivial? #t))
+    (name "texlive-ragged2e")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ragged2e/" "source/latex/ragged2e/"
+                   "tex/latex/ragged2e/")
+             (base32
+              "1cxj5jdgvr3xk1inrb3yzpm3l386jjawgpqiwsz53k6yshb6yfml")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:tex-format "latex"))
+    (propagated-inputs
+     (list texlive-everysel
+           texlive-footmisc))
     (home-page "https://ctan.org/pkg/ragged2e")
-    (synopsis "Alternative versions of \"ragged\"-type commands")
-    (description
-     "The @code{ragged2e} package defines new commands @code{\\Centering}, @code{\\RaggedLeft},
-and @code{\\RaggedRight} and new environments @code{Center}, @code{FlushLeft},
-and @code{FlushRight}, which set ragged text and are easily configurable to
-allow hyphenation (the corresponding commands in LaTeX, all of whose names are
-lower-case, prevent hyphenation altogether).")
+    (synopsis "Alternative versions of ragged-type commands")
+    (description
+     "The @code{ragged2e} package defines new commands @code{\\Centering},
+@code{\\RaggedLeft}, and @code{\\RaggedRight} and new environments
+@code{Center}, @code{FlushLeft}, and @code{FlushRight}, which set ragged text
+and are easily configurable to allow hyphenation (the corresponding commands
+in LaTeX, all of whose names are lower-case, prevent hyphenation
+altogether).")
     (license license:lppl1.3c)))
 
 (define-public texlive-refstyle
-- 
cgit 1.4.1


From ba4df33577eca7b9ac45fe39f9c2aeab574598fc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:31:38 +0200
Subject: gnu: texlive-ltablex: Refresh package definition.

* gnu/packages/tex.scm (texlive-ltablex): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-TOOLS.
---
 gnu/packages/tex.scm | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 65e00f8d8e..2d5751a2ba 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12421,18 +12421,23 @@ non-LaTeX users.")
 
 (define-public texlive-ltablex
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-ltablex"
-      (list "doc/latex/ltablex/" "tex/latex/ltablex/")
-      (base32 "14lmgj820j6zwj1xnd6ad38kzb9w132kp7sp55cv5bk9vhx3621w")
-      #:trivial? #t))
+    (name "texlive-ltablex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ltablex/" "tex/latex/ltablex/")
+             (base32
+              "14lmgj820j6zwj1xnd6ad38kzb9w132kp7sp55cv5bk9vhx3621w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-tools))
     (home-page "https://ctan.org/pkg/ltablex")
     (synopsis "Table package extensions")
     (description
      "The @code{ltablex} package modifies the @code{tabularx} environment to
-combine the features of the @code{tabularx} package (auto-sized columns in a
-fixed-width table) with those of the @code{longtable} package (multi-page
+combine the features of the @code{tabularx} package (auto-sized columns in
+a fixed-width table) with those of the @code{longtable} package (multi-page
 tables).")
     (license license:lppl)))
 
-- 
cgit 1.4.1


From ae5d9c82bb1276bcc1a6b74370a9e29057a233bb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:33:59 +0200
Subject: gnu: texlive-tracklang: Refresh package definition.

* gnu/packages/tex.scm (texlive-tracklang): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2d5751a2ba..284981a2bd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12399,23 +12399,26 @@ replaces @code{datetime.sty} which is now obsolete.")
 
 (define-public texlive-tracklang
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-tracklang"
-      (list "doc/generic/tracklang/"
-            "source/latex/tracklang/"
-            "tex/generic/tracklang/"
-            "tex/latex/tracklang/")
-      (base32 "1386sg25y6zb4ixvrbdv6n1gp54h18mjd984bnwwqda6jafxx4zr")
-      #:trivial? #t))
-    (home-page "https://ctan.org/macros/generic/tracklang")
+    (name "texlive-tracklang")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/tracklang/"
+                   "source/latex/tracklang/"
+                   "tex/generic/tracklang/"
+                   "tex/latex/tracklang/")
+             (base32
+              "1386sg25y6zb4ixvrbdv6n1gp54h18mjd984bnwwqda6jafxx4zr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tracklang")
     (synopsis "Language and dialect tracker")
     (description
-     "The @code{tracklang} package is provided for package developers who want a
-simple interface to find out which languages the user has requested through
+     "The @code{tracklang} package is provided for package developers who want
+a simple interface to find out which languages the user has requested through
 packages such as @code{babel} or @code{polyglossia}.  This package does not
 provide any translations!  Its purpose is simply to track which languages have
-been requested by the user.  Generic TeX code is in @code{tracklang.tex} for
+been requested by the user.  Generic TeX code is in @file{tracklang.tex} for
 non-LaTeX users.")
     (license license:lppl1.3+)))
 
-- 
cgit 1.4.1


From 7f50ce17251ceb162cdd052cbf27f27560b3348e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:36:18 +0200
Subject: gnu: texlive-datetime2: Refresh package definition.

* gnu/packages/tex.scm (texlive-datetime2): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-ETOOLBOX, TEXLIVE-PGF, TEXLIVE-TRACKLANG, and
TEXLIVE-XKEYVAL.
---
 gnu/packages/tex.scm | 68 +++++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 284981a2bd..4e5e91ac4f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12370,57 +12370,61 @@ orientation by conforming PDF viewers.")
 
 (define-public texlive-datetime2
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-datetime2"
-      (list "doc/latex/datetime2/"
-            "source/latex/datetime2/"
-            "tex/latex/datetime2/")
-      (base32 "0yjkpfic1ni4j2g61rrjj5hjyd43shc9c0sg1aivbbsmqh30dn33")
-      #:trivial? #t))
+    (name "texlive-datetime2")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/datetime2/"
+                   "source/latex/datetime2/"
+                   "tex/latex/datetime2/")
+             (base32
+              "0yjkpfic1ni4j2g61rrjj5hjyd43shc9c0sg1aivbbsmqh30dn33")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (propagated-inputs
      (list texlive-etoolbox
-           texlive-latex-xkeyval
-           texlive-tracklang))
+           texlive-pgf
+           texlive-tracklang
+           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/datetime2")
     (synopsis "Formats for dates, times and time zones")
     (description
-     "The @code{datetime2} package provides commands for formatting dates, times
-and time zones and redefines @code{\\today} to use the same formatting style.
-In addition to @code{\\today}, you can also use
+     "The @code{datetime2} package provides commands for formatting dates,
+times and time zones and redefines @code{\\today} to use the same formatting
+style.  In addition to @code{\\today}, you can also use
 @code{\\DTMcurrenttime} (current time) or @code{\\DTMnow} (current date and
 time).  Dates and times can be saved for later use.  The accompanying
 @code{datetime2-calc} package can be used to convert date-times to UTC+00:00.
 Language and regional support is provided by independently maintained and
 installed modules.  The @code{datetime2-calc} package uses the
 @code{pgfcalendar} package (part of the PGF/TikZ bundle).  This package
-replaces @code{datetime.sty} which is now obsolete.")
+replaces @code{datetime.sty}, which is now obsolete.")
     (license license:lppl1.3+)))
 
 (define-public texlive-tracklang
-  (package
-    (name "texlive-tracklang")
-    (version (number->string %texlive-revision))
-    (source (texlive-origin
-             name version
-             (list "doc/generic/tracklang/"
-                   "source/latex/tracklang/"
-                   "tex/generic/tracklang/"
-                   "tex/latex/tracklang/")
-             (base32
-              "1386sg25y6zb4ixvrbdv6n1gp54h18mjd984bnwwqda6jafxx4zr")))
-    (outputs '("out" "doc"))
-    (build-system texlive-build-system)
-    (home-page "https://ctan.org/pkg/tracklang")
-    (synopsis "Language and dialect tracker")
-    (description
-     "The @code{tracklang} package is provided for package developers who want
+(package
+  (name "texlive-tracklang")
+  (version (number->string %texlive-revision))
+  (source (texlive-origin
+           name version
+           (list "doc/generic/tracklang/"
+                 "source/latex/tracklang/"
+                 "tex/generic/tracklang/"
+                 "tex/latex/tracklang/")
+           (base32
+            "1386sg25y6zb4ixvrbdv6n1gp54h18mjd984bnwwqda6jafxx4zr")))
+  (outputs '("out" "doc"))
+  (build-system texlive-build-system)
+  (home-page "https://ctan.org/pkg/tracklang")
+  (synopsis "Language and dialect tracker")
+  (description
+   "The @code{tracklang} package is provided for package developers who want
 a simple interface to find out which languages the user has requested through
 packages such as @code{babel} or @code{polyglossia}.  This package does not
 provide any translations!  Its purpose is simply to track which languages have
 been requested by the user.  Generic TeX code is in @file{tracklang.tex} for
 non-LaTeX users.")
-    (license license:lppl1.3+)))
+  (license license:lppl1.3+)))
 
 (define-public texlive-ltablex
   (package
-- 
cgit 1.4.1


From fcf0197dced17fd3f1a6d9b97fa36f4c5fca52fc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 00:57:07 +0200
Subject: gnu: texlive-pdflscape: Refresh package definition.

* gnu/packages/tex.scm (texlive-pdflscape): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-ATBEGSHI, TEXLIVE-GRAPHICS, and
TEXLIVE-IFTEX.
---
 gnu/packages/tex.scm | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4e5e91ac4f..9a8fa4ccbf 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12351,14 +12351,21 @@ Several keys customize the appearance of the chart elements.")
 
 (define-public texlive-pdflscape
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-pdflscape"
-      (list "doc/latex/pdflscape/"
-            "source/latex/pdflscape/"
-            "tex/latex/pdflscape/")
-      (base32 "05vvmwd8vlzs2x2rm6pfzlvrrihqf924d7krlrkvc6giiwyfsic4")
-      #:trivial? #t))
+    (name "texlive-pdflscape")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pdflscape/"
+                   "source/latex/pdflscape/"
+                   "tex/latex/pdflscape/")
+             (base32
+              "05vvmwd8vlzs2x2rm6pfzlvrrihqf924d7krlrkvc6giiwyfsic4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-atbegshi
+           texlive-graphics
+           texlive-iftex))
     (home-page "https://ctan.org/pkg/pdflscape")
     (synopsis "Make landscape pages display as landscape")
     (description
-- 
cgit 1.4.1


From 1492c5a7de848b625fb2c37bad4b52642dd65180 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 12:09:35 +0200
Subject: gnu: texlive-pgfgantt: Refresh package definition.

* gnu/packages/tex.scm (texlive-pgfgantt): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9a8fa4ccbf..67918d7d5c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12331,17 +12331,18 @@ spacings also available.")
 
 (define-public texlive-pgfgantt
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-pgfgantt"
-      (list
-       "doc/latex/pgfgantt/"
-       "source/latex/pgfgantt/"
-       "tex/latex/pgfgantt/")
-      (base32 "0bm034iizk4sd7p5x7vkj7v57dc0bf2lswpsb32s4qlg4s7h6jqz")
-      #:trivial? #t))
+    (name "texlive-pgfgantt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgfgantt/" "source/latex/pgfgantt/"
+                   "tex/latex/pgfgantt/")
+             (base32
+              "0bm034iizk4sd7p5x7vkj7v57dc0bf2lswpsb32s4qlg4s7h6jqz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (propagated-inputs (list texlive-pgf))
-    (home-page "https://ctan.org/graphics/pgf/contrib/pgfgantt")
+    (home-page "https://ctan.org/pkg/pgfgantt")
     (synopsis "Draw Gantt charts with TikZ")
     (description
      "The @code{pgfgantt} package provides an environment for drawing Gantt charts
-- 
cgit 1.4.1


From 98eede996774ab6d680c15a077a60f3b1e254268 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 12:11:11 +0200
Subject: gnu: texlive-setspace: Refresh package definition.

* gnu/packages/tex.scm (texlive-setspace): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 67918d7d5c..d0d2ef1345 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12312,22 +12312,25 @@ TikZ.")
 
 (define-public texlive-setspace
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-setspace"
-      (list "doc/latex/setspace/" "tex/latex/setspace/")
-      (base32 "00ik8qgkw3ivh3z827zjf7gbwkbsmdcmv22c6ap543mpgaqqjcfm")
-      #:trivial? #t))
+    (name "texlive-setspace")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/setspace/" "tex/latex/setspace/")
+             (base32
+              "00ik8qgkw3ivh3z827zjf7gbwkbsmdcmv22c6ap543mpgaqqjcfm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/setspace")
     (synopsis "Set space between lines")
     (description
-     "The @code{setspace} package provides support for setting the spacing between
-lines in a document.  Package options include @code{singlespacing},
+     "The @code{setspace} package provides support for setting the spacing
+between lines in a document.  Package options include @code{singlespacing},
 @code{onehalfspacing}, and @code{doublespacing}.  Alternatively the spacing
 can be changed as required with the @code{\\singlespacing},
 @code{\\onehalfspacing}, and @code{\\doublespacing} commands.  Other size
 spacings also available.")
-    (license license:lppl)))
+    (license license:lppl1.3+)))
 
 (define-public texlive-pgfgantt
   (package
-- 
cgit 1.4.1


From 349ad09c7cd06e0ee528fff43982c237c27888d0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 12:29:39 +0200
Subject: gnu: Add texlive-lipsum.

* gnu/packages/tex.scm (texlive-lipsum): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d0d2ef1345..96e567d10d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7056,6 +7056,30 @@ and a BibTeX bibliography style.  The individual packages are: @code{abbrevs},
 
 (define-deprecated-package texlive-latex-frankenstein texlive-frankenstein)
 
+(define-public texlive-lipsum
+  (package
+    (name "texlive-lipsum")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lipsum/" "source/latex/lipsum/"
+                   "tex/latex/lipsum/")
+             (base32
+              "1iwk2iqq5s5sn2z2kr7m59fm5j14dr4nsxivia3lhph8q38p5q6q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-l3kernel
+           texlive-l3packages))
+    (home-page "https://ctan.org/pkg/lipsum")
+    (synopsis "Easy access to the Lorem Ipsum dummy text")
+    (description
+     "This package gives you easy access to the Lorem Ipsum dummy text; an
+option is available to separate the paragraphs of the dummy text into
+TeX-paragraphs.  All the paragraphs are taken with permission from
+@url{http://lipsum.com/}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-listings
   (let ((template
          (simple-texlive-package
-- 
cgit 1.4.1


From 6a38ddb178c62c39a6533481114502614691072a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 12:29:55 +0200
Subject: gnu: Add texlive-kantlipsum.

* gnu/packages/tex.scm (texlive-kantlipsum): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 96e567d10d..eade52319f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7056,6 +7056,31 @@ and a BibTeX bibliography style.  The individual packages are: @code{abbrevs},
 
 (define-deprecated-package texlive-latex-frankenstein texlive-frankenstein)
 
+(define-public texlive-kantlipsum
+  (package
+    (name "texlive-kantlipsum")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/kantlipsum/"
+                   "source/latex/kantlipsum/"
+                   "tex/latex/kantlipsum/")
+             (base32
+              "1bz08i8b7ihzd2qi4v9r9kjl2kr5a3l516lqb36spxyyrlmmwv4p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-l3kernel
+           texlive-l3packages))
+    (home-page "https://ctan.org/pkg/kantlipsum")
+    (synopsis "Generate sentences in Kant's style")
+    (description
+     "The package spits out sentences in Kantian style; the text is provided
+by the Kant generator for Python by Mark Pilgrim, described in the book ``Dive
+into Python''.  The package is modelled on @code{lipsum}, and may be used for
+similar purposes.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-lipsum
   (package
     (name "texlive-lipsum")
-- 
cgit 1.4.1


From d085624bdab0c3b500e84696cfcaf097eed82930 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 12:31:38 +0200
Subject: gnu: Add texlive-selinput.

* gnu/packages/tex.scm (texlive-selinput): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index eade52319f..efeb64931e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5828,6 +5828,29 @@ corresponding thing with the page reference of the label.")
 
 (define-deprecated-package texlive-latex-refcount texlive-refcount)
 
+(define-public texlive-selinput
+  (package
+    (name "texlive-selinput")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/selinput/" "source/latex/selinput/"
+                   "tex/latex/selinput/")
+             (base32
+              "0x8l98r6xzyi4lc909bv7ii2nbpff8j7j3q4z86l7rrjk1jkx9qi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-kvoptions
+           texlive-kvsetkeys
+           texlive-stringenc))
+    (home-page "https://ctan.org/pkg/selinput")
+    (synopsis "Semi-automatic detection of input encoding")
+    (description
+     "This package selects the input encoding by specifying pairs of input
+characters and their glyph names.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-seminar
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 4b2ceb27532bba4289429d17e514fbc2dc994553 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 12:32:47 +0200
Subject: gnu: Add texlive-ntheorem.

* gnu/packages/tex.scm (texlive-ntheorem): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index efeb64931e..3c9186c19d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11954,6 +11954,30 @@ TeX users have no access to package options, so need to redefine macros for
 these changes.")
     (license license:public-domain)))
 
+(define-public texlive-ntheorem
+  (package
+    (name "texlive-ntheorem")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ntheorem/" "source/latex/ntheorem/"
+                   "tex/latex/ntheorem/")
+             (base32
+              "16xain8s0azcnhwj5xwh3m365sb9bhdvxanh19kvmnc52dggjc1y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-amsfonts))
+    (home-page "https://ctan.org/pkg/ntheorem")
+    (synopsis "Enhanced theorem environment")
+    (description
+     "The package offers enhancements for theorem-like environments: easier
+control of layout; proper placement of endmarks even when the environment ends
+with @code{\\end@{enumerate@}} or @code{\\end@{displaymath@}} (including
+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-fmtcount
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From e911b9f9a1b89230cb25fde4ddb782c63a8620f2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 12:12:50 +0200
Subject: gnu: texlive-mdframed: Refresh package definition.

* gnu/packages/tex.scm (texlive-mdframed): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-AMSMATH, TEXLIVE-BOOKTABS, TEXLIVE-CSQUOTES,
TEXLIVE-ESO-PIC, TEXLIVE-ETOOLBOX, TEXLIVE-IFTEX, TEXLIVE-GEOMETRY,
TEXLIVE-GRAPHICS, TEXLIVE-KANTLIPSUM, TEXLIVE-KVOPTIONS,
TEXLIVE-LISTINGS, TEXLIVE-L3KERNEL, TEXLIVE-L3PACKAGES, TEXLIVE-LIPSUM,
TEXLIVE-LISTINGS, TEXLIVE-MICROTYPE, TEXLIVE-NTHEOREM, TEXLIVE-OBERDIEK,
TEXLIVE-PGF, TEXLIVE-SELINPUT, TEXLIVE-TOOLS, TEXLIVE-XCOLOR.
---
 gnu/packages/tex.scm | 45 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3c9186c19d..612d6f6f20 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12386,17 +12386,40 @@ Polish of standard ``LaTeX names''.")
 
 (define-public texlive-mdframed
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-mdframed"
-      (list
-       "doc/latex/mdframed/"
-       "source/latex/mdframed/"
-       "tex/latex/mdframed/")
-      (base32 "1i5rm946wg43rjckxlfhx79zfx5cgd3bxk71206hd1dqkrgpdpa8")
-      #:trivial? #t))
-    (propagated-inputs (list texlive-needspace
-                             texlive-zref))
+    (name "texlive-mdframed")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mdframed/" "source/latex/mdframed/"
+                   "tex/latex/mdframed/")
+             (base32
+              "1i5rm946wg43rjckxlfhx79zfx5cgd3bxk71206hd1dqkrgpdpa8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-amsmath
+           texlive-booktabs
+           texlive-csquotes
+           texlive-eso-pic
+           texlive-etoolbox
+           texlive-iftex
+           texlive-geometry
+           texlive-graphics
+           texlive-kantlipsum
+           texlive-kvoptions
+           texlive-l3kernel
+           texlive-l3packages
+           texlive-lipsum
+           texlive-listings
+           texlive-microtype
+           texlive-needspace
+           texlive-ntheorem
+           texlive-oberdiek
+           texlive-pgf
+           texlive-selinput
+           texlive-tools
+           texlive-xcolor
+           texlive-zref))
     (home-page "https://ctan.org/pkg/mdframed")
     (synopsis "Framed environments that can split at page boundaries")
     (description
-- 
cgit 1.4.1


From 07092d64f1f4893d384fd39c49ba337a89a9f810 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 12:37:40 +0200
Subject: gnu: texlive-lineno: Refresh package definition.

* gnu/packages/tex.scm (texlive-lineno): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-TOOLS.
---
 gnu/packages/tex.scm | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 612d6f6f20..52b79094b8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12235,20 +12235,25 @@ threeparttable package to tables created using the longtable package.")
 
 (define-public texlive-lineno
   (package
-    (inherit (simple-texlive-package
-              "texlive-lineno"
-              (list "doc/latex/lineno/"
-                    "source/latex/lineno/"
-                    "tex/latex/lineno/")
-              (base32
-               "1xf8ljgcj411yqmng89wc49rqfz19j95yqqpnb35dj3qc1chvm2a")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/lineno")
+    (name "texlive-lineno")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lineno/" "source/latex/lineno/"
+                   "tex/latex/lineno/")
+             (base32
+              "1xf8ljgcj411yqmng89wc49rqfz19j95yqqpnb35dj3qc1chvm2a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-tools))
+    (home-page "https://ctan.org/pkg/lineno")
     (synopsis "Line numbers on paragraphs")
-    (description "Adds line numbers to selected paragraphs with reference
-possible through the LaTeX @code{\\ref} and @code{\\pageref} cross reference
-mechanism.  Line numbering may be extended to footnote lines, using the
-fnlineno package.")
+    (description
+     "The @code{lineno} package adds line numbers to selected paragraphs with
+reference possible through the LaTeX @code{\\ref} and @code{\\pageref} cross
+reference mechanism.  Line numbering may be extended to footnote lines, using
+the @code{fnlineno} package.")
     (license license:lppl1.3a+)))
 
 (define-public texlive-babel-czech
-- 
cgit 1.4.1


From fe0ce730c6e517a114b1cd1fb0027b54cca2b12d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 12:40:01 +0200
Subject: gnu: texlive-threeparttablex: Refresh package definition.

* gnu/packages/tex.scm (texlive-threeparttablex): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-ENVIRON, TEXLIVE-THREEPARTTABLE.
---
 gnu/packages/tex.scm | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 52b79094b8..e54a501635 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12220,17 +12220,24 @@ provided by Philipp Lehmann’s etoolbox.")
 
 (define-public texlive-threeparttablex
   (package
-    (inherit (simple-texlive-package
-              "texlive-threeparttablex"
-              (list "doc/latex/threeparttablex/"
-                    "tex/latex/threeparttablex/")
-              (base32
-               "19pvw2ifswxcf8dxw0mzjmqhl592477w5hcfh97f4wpya0dv2m9p")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/threeparttablex")
-    (synopsis "Notes in longtables")
-    (description "The package provides the functionality of the
-threeparttable package to tables created using the longtable package.")
+    (name "texlive-threeparttablex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/threeparttablex/"
+                   "tex/latex/threeparttablex/")
+             (base32
+              "19pvw2ifswxcf8dxw0mzjmqhl592477w5hcfh97f4wpya0dv2m9p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-environ
+           texlive-threeparttable))
+    (home-page "https://ctan.org/pkg/threeparttablex")
+    (synopsis "Notes in @code{longtables}")
+    (description
+     "The package provides the functionality of the @code{threeparttable}
+package to tables created using the @code{longtable} package.")
     (license license:lppl1.3+)))
 
 (define-public texlive-lineno
-- 
cgit 1.4.1


From 4c60535bb3a71f51b660a353e98ccfa8e795de92 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 12:41:51 +0200
Subject: gnu: texlive-xpatch: Refresh package definition.

* gnu/packages/tex.scm (texlive-xpatch): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-ETOOLBOX, TEXLIVE-L3KERNEL, TEXLIVE-L3PACKAGES.
---
 gnu/packages/tex.scm | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e54a501635..7f2831ff5f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12204,18 +12204,25 @@ possible to register these float types with endfloat.")
 
 (define-public texlive-xpatch
   (package
-    (inherit (simple-texlive-package
-              "texlive-xpatch"
-              (list "doc/latex/xpatch/"
-                    "source/latex/xpatch/"
-                    "tex/latex/xpatch/")
-              (base32
-               "0r08hadnwx9vyppzmbn1bj69b12i5fw1mhk49piw2rqbk01722zk")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/xpatch")
-    (synopsis "Extending etoolbox patching commands")
-    (description "The package generalises the macro patching commands
-provided by Philipp Lehmann’s etoolbox.")
+    (name "texlive-xpatch")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xpatch/" "source/latex/xpatch/"
+                   "tex/latex/xpatch/")
+             (base32
+              "0r08hadnwx9vyppzmbn1bj69b12i5fw1mhk49piw2rqbk01722zk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etoolbox
+           texlive-l3kernel
+           texlive-l3packages))
+    (home-page "https://ctan.org/pkg/xpatch")
+    (synopsis "Extending @code{etoolbox} patching commands")
+    (description
+     "The package generalises the macro patching commands provided by Philipp
+Lehmann's @code{etoolbox}.")
     (license license:lppl1.3c+)))
 
 (define-public texlive-threeparttablex
-- 
cgit 1.4.1


From f778e76f5d27e005650ff8292aeff069acefd914 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 12:43:38 +0200
Subject: gnu: texlive-was: Refresh package definition.

* gnu/packages/tex.scm (texlive-was): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7f2831ff5f..6575669987 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12182,24 +12182,23 @@ possible to register these float types with endfloat.")
 
 (define-public texlive-was
   (package
-    (inherit (simple-texlive-package
-              "texlive-was"
-              (list "doc/latex/was/"
-                    "source/latex/was/"
-                    "tex/latex/was/")
-              (base32
-               "1fp0l9sn9yrhf8hz175dzc2x28byk1ygfirn23am5ak72csmi0cp")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/was")
+    (name "texlive-was")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/was/" "source/latex/was/"
+                   "tex/latex/was/")
+             (base32
+              "1fp0l9sn9yrhf8hz175dzc2x28byk1ygfirn23am5ak72csmi0cp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/was")
     (synopsis "Collection of small packages by Walter Schmidt")
-    (description "A bundle of packages that arise in the author’s area of interest:
-
-@itemize
-@item compliance of maths typesetting with ISO standards;
-@item symbols that work in both maths and text modes
-@item commas for both decimal separator and maths; and
-@item upright Greek letters in maths
-@end itemize")
+    (description
+     "This package provides a bundle of packages that arise in the author's
+area of interest: compliance of maths typesetting with ISO standards; symbols
+that work in both maths and text modes commas for both decimal separator and
+maths; and upright Greek letters in maths.")
     (license license:lppl1.2+)))
 
 (define-public texlive-xpatch
-- 
cgit 1.4.1


From 39517adc4872d08ef3d9bcf51e6c4f67cd4d2208 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 12:45:44 +0200
Subject: gnu: texlive-endfloat: Refresh package definition.

* gnu/packages/tex.scm (texlive-endfloat): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-GRAPHICS.
---
 gnu/packages/tex.scm | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6575669987..c7ff1a5e99 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12162,23 +12162,25 @@ index for a document.")
 
 (define-public texlive-endfloat
   (package
-    (inherit (simple-texlive-package
-              "texlive-endfloat"
-              (list "doc/latex/endfloat/"
-                    "source/latex/endfloat/"
-                    "tex/latex/endfloat/")
-              (base32
-               "1zslmc5g28z6adfyd8bdlbw03jawxmgafq0mgwy811hrbcppb2kg")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/endfloat")
+    (name "texlive-endfloat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/endfloat/" "source/latex/endfloat/"
+                   "tex/latex/endfloat/")
+             (base32
+              "1zslmc5g28z6adfyd8bdlbw03jawxmgafq0mgwy811hrbcppb2kg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics))
+    (home-page "https://ctan.org/pkg/endfloat")
     (synopsis "Move floats to the end, leaving markers where they belong")
-    (description "Place all floats on pages by themselves at the end of
-the document, optionally leaving markers like “[Figure 3 about here]”
-in the text near to where the figure (or table) would normally have
-occurred.  Float types figure and table are recognised by the package,
-unmodified.  Since several packages define other types of float, it is
-possible to register these float types with endfloat.")
-    (license license:gpl2+)))
+    (description
+     "The @code{endfloat} package places all floats on pages by themselves at
+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-was
   (package
-- 
cgit 1.4.1


From a5dba2ee3afb89c18c5e7073f5b9da553cf9a2d1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 12:48:17 +0200
Subject: gnu: texlive-apacite: Refresh package definition.

* gnu/packages/tex.scm (texlive-apacite): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c7ff1a5e99..13804ab139 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12140,25 +12140,27 @@ maintained).")
 
 (define-public texlive-apacite
   (package
-    (inherit (simple-texlive-package
-              "texlive-apacite"
-              (list "tex/latex/apacite/")
-              (base32
-               "0bcfpcmflhvxwzmdj8dgf43mzaywx2asahp52nqn3wwvq64bqym6")
-              #:trivial? #t))
-    (propagated-inputs (list texlive-natbib
-                             texlive-tools))
-    (home-page "https://www.ctan.org/pkg/apacite")
+    (name "texlive-apacite")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/apacite/" "doc/bibtex/apacite/"
+                   "source/bibtex/apacite/" "tex/latex/apacite/")
+             (base32
+              "0nc86zngk71xpbinrfm8p0413xphc0v86ddhcw94gi2sl00hsmzq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-natbib
+           texlive-tools))
+    (home-page "https://ctan.org/pkg/apacite")
     (synopsis "Citation style following the rules of the APA")
-    (description "Apacite provides a BibTeX style and a LaTeX package which
-are designed to match the requirements of the American Psychological
-Association’s style for citations.  The package follows the 6th edition
-of the APA manual, and is designed to work with the apa6 class.  A test
-document is provided.  The package is compatible with chapterbib and
-(to some extent) with hyperref (for limits of compatibility, see the
-documentation).  The package also includes a means of generating an author
-index for a document.")
-    (license license:lppl1.3+)))
+    (description
+     "Apacite provides a BibTeX style and a LaTeX package which are designed
+to match the requirements of the American Psychological Association's style
+for citations.  The package follows the 6th edition of the APA manual, and is
+designed to work with the @code{apa6} class.")
+    (license license:lppl)))
 
 (define-public texlive-endfloat
   (package
-- 
cgit 1.4.1


From 00a789c4f69acd0e43b7080b3ec30664b3f63615 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 13:09:35 +0200
Subject: gnu: texlive-apa6: Refresh package definition.

* gnu/packages/tex.scm (texlive-apa6): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-BIBLATEX, TEXLIVE-GEOMETRY, TEXLIVE-THREEPARTTABLE.
---
 gnu/packages/tex.scm | 76 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 44 insertions(+), 32 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 13804ab139..ee3fc532a6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12103,39 +12103,51 @@ and selecting references used in a publication.")
 
 (define-public texlive-apa6
   (package
-    (inherit (simple-texlive-package
-              "texlive-apa6"
-              (list "doc/latex/apa6/"
-                    "source/latex/apa6/"
-                    "tex/latex/apa6/")
-              (base32
-               "08jn8piyaad4zln33c0gikyhdkcsk2s3ms9l992riq2hbpbm9lcf")
-              #:trivial? #t))
-    (propagated-inputs (list texlive-apacite
-                             texlive-babel
-                             texlive-booktabs
-                             texlive-draftwatermark
-                             texlive-endnotes
-                             texlive-etoolbox
-                             texlive-fancyhdr
-                             texlive-xstring
-                             texlive-graphics
-                             texlive-float
-                             texlive-lm
-                             texlive-substr
-                             texlive-times
-                             texlive-tools))
-    (home-page "https://www.ctan.org/pkg/apa6")
+    (name "texlive-apa6")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/apa6/" "source/latex/apa6/"
+                   "tex/latex/apa6/")
+             (base32
+              "08jn8piyaad4zln33c0gikyhdkcsk2s3ms9l992riq2hbpbm9lcf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-build
+            ;; Build process wants to generate files in the wrong directory.
+            (lambda _
+              (substitute* "source/latex/apa6/apa6.ins"
+                (("file\\{\\./.*?/") "file{")))))))
+    (propagated-inputs
+     (list texlive-apacite
+           texlive-babel
+           texlive-biblatex
+           texlive-booktabs
+           texlive-caption
+           texlive-draftwatermark
+           texlive-endnotes
+           texlive-etoolbox
+           texlive-fancyhdr
+           texlive-float
+           texlive-geometry
+           texlive-graphics
+           texlive-lm
+           texlive-substr
+           texlive-threeparttable
+           texlive-times
+           texlive-tools
+           texlive-xstring))
+    (home-page "https://ctan.org/pkg/apa6")
     (synopsis "Format documents in APA style (6th edition)")
-    (description "The class formats documents in APA style (6th
-Edition).  It provides a full set of facilities in three different
-output modes (journal-like appearance, double-spaced manuscript,
-LaTeX-like document), in contrast to the earlier apa6e, which only formats
-double-spaced manuscripts in APA style.  The class can mask author identity
-for copies for use in masked peer review.
-
-The class is a development of the apa class (which is no longer
-maintained).")
+    (description
+     "The class formats documents in APA style (6th Edition).  It provides
+a full set of facilities in three different output modes (journal-like
+appearance, double-spaced manuscript, LaTeX-like document).  The class can
+mask author identity for copies for use in masked peer review.")
     (license license:lppl1.3c+)))
 
 (define-public texlive-apacite
-- 
cgit 1.4.1


From 7b43326b8ad5435aa19f6568ad467cc140e24e8b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 13:12:11 +0200
Subject: gnu: texlive-floatflt: Refresh package definition.

* gnu/packages/tex.scm (texlive-floatflt): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ee3fc532a6..917ba35271 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12033,20 +12033,24 @@ their associated files.  These were created using autoinst.")
 
 (define-public texlive-floatflt
   (package
-    (inherit (simple-texlive-package
-              "texlive-floatflt"
-              (list "doc/latex/floatflt/"
-                    "source/latex/floatflt/"
-                    "tex/latex/floatflt/")
-              (base32
-               "1piy8ajbbcadsjwp0mhlgxm2ggggnb5sn75arfs5fxiaqrwd572j")
-              #:trivial? #t))
-    (home-page "https://ctan.org/macros/latex/contrib/floatflt")
+    (name "texlive-floatflt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/floatflt/" "source/latex/floatflt/"
+                   "tex/latex/floatflt/")
+             (base32
+              "1piy8ajbbcadsjwp0mhlgxm2ggggnb5sn75arfs5fxiaqrwd572j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:tex-format "latex"))
+    (home-page "https://ctan.org/pkg/floatflt")
     (synopsis "Wrap text around floats")
     (description
-     "The package can float text around figures and tables which do not
-span the full width of a page; it improves upon floatfig, and allows
-tables and figures to be set left/right or alternating on even/odd pages.")
+     "The package can float text around figures and tables which do not span
+the full width of a page; it improves upon floatfig, and allows tables/figures
+to be set left/right or alternating on even/odd pages.")
     (license license:lppl1.3+)))
 
 (define-public texlive-fvextra
-- 
cgit 1.4.1


From 1595b82f197d7169bb85aabf44dbbf8451a60b2c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 13:15:13 +0200
Subject: gnu: texlive-inriafonts: Refresh package definition.

* gnu/packages/tex.scm (texlive-inriafonts): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-FONTAXES, TEXLIVE-MWEIGHTS, TEXLIVE-XKEYVAL.
---
 gnu/packages/tex.scm | 54 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 917ba35271..8e16167249 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12003,32 +12003,38 @@ now distributed separately.")
 
 (define-public texlive-inriafonts
   (package
-    (inherit (simple-texlive-package
-              "texlive-inriafonts"
-              (list "doc/fonts/inriafonts/"
-                    "fonts/enc/dvips/inriafonts/"
-                    "fonts/map/dvips/inriafonts/"
-                    "fonts/opentype/public/inriafonts/"
-                    "fonts/tfm/public/inriafonts/"
-                    "fonts/truetype/public/inriafonts/"
-                    "fonts/type1/public/inriafonts/"
-                    "fonts/vf/public/inriafonts/"
-                    "tex/latex/inriafonts/")
-              (base32
-               "0ngbpr4pl7r82jmdhiksp32qvbvggf2nawwqq0pkb7cffp95ya49")
-              #:trivial? #t))
-    (propagated-inputs (list texlive-ly1))        ;requires LY1 font encoding
-    (home-page "https://ctan.org/fonts/inriafonts")
+    (name "texlive-inriafonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/inriafonts/"
+                   "fonts/enc/dvips/inriafonts/"
+                   "fonts/map/dvips/inriafonts/"
+                   "fonts/opentype/public/inriafonts/"
+                   "fonts/tfm/public/inriafonts/"
+                   "fonts/truetype/public/inriafonts/"
+                   "fonts/type1/public/inriafonts/"
+                   "fonts/vf/public/inriafonts/"
+                   "tex/latex/inriafonts/")
+             (base32
+              "0ngbpr4pl7r82jmdhiksp32qvbvggf2nawwqq0pkb7cffp95ya49")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-fontaxes
+           texlive-ly1                  ;requires LY1 font encoding
+           texlive-mweights
+           texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/inriafonts")
     (synopsis "Inria fonts with LaTeX support")
     (description
-     "Inria is a free font designed by Black[Foundry] for Inria, a French research
-institute.  It comes as Serif and Sans Serif, each with three weights and
-matching italics.  Using these fonts with XeLaTeX and LuaLaTeX is easy using
-the fontspec package; we refer to the documentation of fontspec for more
-information.  The present package provides a way of using them with LaTeX and
-pdfLaTeX: it provides two style files, @file{InriaSerif.sty} and
-@file{InriaSans.sty}, together with the PostScript version of the fonts and
-their associated files.  These were created using autoinst.")
+     "Inria is a free font designed by Black[Foundry] for Inria, a French
+research institute.  It comes as Serif and Sans Serif, each with three weights
+and matching italics.  Using these fonts with XeLaTeX and LuaLaTeX is easy
+using the @code{fontspec} package.  The present package provides a way of
+using them with LaTeX and pdfLaTeX: it provides two style files,
+@file{InriaSerif.sty} and @file{InriaSans.sty}, together with the PostScript
+version of the fonts and their associated files.")
     (license (list license:lppl license:silofl1.1))))
 
 (define-public texlive-floatflt
-- 
cgit 1.4.1


From ca2b893d88cc92e2441ce6eaee9b10d22b128888 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 13:18:25 +0200
Subject: gnu: texlive-fmtcount: Refresh package definition.

* gnu/packages/tex.scm (texlive-fmtcount): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-AMSMATH, TEXLIVE-ETOOLBOX, TEXLIVE-GRAPHICS,
TEXLIVE-XKEYVAL.
---
 gnu/packages/tex.scm | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8e16167249..fc4da051f2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11980,25 +11980,29 @@ making a list of theorems, analagous to @code{\\listoffigures}.")
 
 (define-public texlive-fmtcount
   (package
-    (inherit (simple-texlive-package
-              "texlive-fmtcount"
-              (list "doc/latex/fmtcount/"
-                    "scripts/fmtcount/"
-                    "source/latex/fmtcount/"
-                    "tex/latex/fmtcount/")
-              (base32
-               "1biw0g6s2arq6kq52c1yfkl0vzafja2az65c3d0syq0vgjzj9763")
-              #:trivial? #t))
-    (home-page "https://ctan.org/macros/latex/contrib/fmtcount")
+    (name "texlive-fmtcount")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fmtcount/" "scripts/fmtcount/"
+                   "source/latex/fmtcount/" "tex/latex/fmtcount/")
+             (base32
+              "1biw0g6s2arq6kq52c1yfkl0vzafja2az65c3d0syq0vgjzj9763")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-amsmath
+           texlive-etoolbox
+           texlive-graphics
+           texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/fmtcount")
     (synopsis "Display the value of a LaTeX counter in a variety of formats")
     (description
-     "The package provides commands that display the value of a LaTeX counter in a
-variety of formats (ordinal, text, hexadecimal, decimal, octal, binary etc).
-The package offers some multilingual support; configurations for use in English
-(both British and American usage), French (including Belgian and Swiss
-variants), German, Italian, Portuguese and Spanish documents are provided.  This
-package was originally provided as part of the author's datetime package, but is
-now distributed separately.")
+     "The package provides commands that display the value of a LaTeX counter
+in a variety of formats (ordinal, text, hexadecimal, decimal, octal, binary
+etc).  The package offers some multilingual support; configurations for use in
+English (both British and American usage), French (including Belgian and Swiss
+variants), German, Italian, Portuguese and Spanish documents are provided.")
     (license license:lppl1.3+)))
 
 (define-public texlive-inriafonts
-- 
cgit 1.4.1


From bc9094beb72b132e906b66b3217db7006dd405b5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 13:19:50 +0200
Subject: gnu: texlive-nth: Refresh package definition.

* gnu/packages/tex.scm (texlive-nth): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fc4da051f2..5be52629e6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11938,13 +11938,15 @@ terms and in terms of the collating order of the text being processed.")
 
 (define-public texlive-nth
   (package
-    (inherit (simple-texlive-package
-              "texlive-nth"
-              (list "tex/generic/nth/")
-              (base32
-               "0716sd99xjdkplm7jdmg4lx8lpfnnx6mxjp1l1sp2bfqcg73p4hm")
-              #:trivial? #t))
-    (home-page "https://ctan.org/macros/generic/misc/nth.sty")
+    (name "texlive-nth")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/generic/nth/")
+             (base32
+              "0716sd99xjdkplm7jdmg4lx8lpfnnx6mxjp1l1sp2bfqcg73p4hm")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nth")
     (synopsis "Generate English ordinal numbers")
     (description
      "The command @code{\\nth{<number>}} generates English ordinal numbers of
-- 
cgit 1.4.1


From 7d20f2f976cd8037aa5f7dbe62795b786888007b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 13:22:25 +0200
Subject: gnu: texlive-xifthen: Refresh package definition.

* gnu/packages/tex.scm (texlive-xifthen): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-IFMTARG, TEXLIVE-TOOLS.
---
 gnu/packages/tex.scm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5be52629e6..cc8a5ac40b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11869,14 +11869,18 @@ by the following fonts:
 
 (define-public texlive-xifthen
   (package
-    (inherit (simple-texlive-package
-              "texlive-xifthen"
-              (list "doc/latex/xifthen/"
-                    "tex/latex/xifthen/")
-              (base32
-               "0b33mlmnxsj5mi06v2w2zgamk51mgv1lxdr1cax8nkpn9g7n9axw")
-              #:trivial? #t))
+    (name "texlive-xifthen")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xifthen/" "tex/latex/xifthen/")
+             (base32
+              "0b33mlmnxsj5mi06v2w2zgamk51mgv1lxdr1cax8nkpn9g7n9axw")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-ifmtarg
+           texlive-tools))
     (home-page "https://ctan.org/pkg/xifthen")
     (synopsis "Extended conditional commands")
     (description
-- 
cgit 1.4.1


From 467f367920f81dfc783a75a66f8e0984dca55ff9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 13:24:37 +0200
Subject: gnu: texlive-translator: Refresh package definition.

* gnu/packages/tex.scm (texlive-translator): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-GRAPHICS.
---
 gnu/packages/tex.scm | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cc8a5ac40b..d2051e6af4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11774,23 +11774,27 @@ document.")
 
 (define-public texlive-translator
   (package
-    (inherit (simple-texlive-package
-              "texlive-translator"
-              (list "doc/latex/translator/"
-                    "tex/latex/translator/")
-              (base32 "13rxdqhvgwc5lz2wsw4jwsb92614wlxsa90rmzxyrc6xjz1jypnk")
-              #:trivial? #t))
+    (name "texlive-translator")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/translator/"
+                   "tex/latex/translator/")
+             (base32
+              "13rxdqhvgwc5lz2wsw4jwsb92614wlxsa90rmzxyrc6xjz1jypnk")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (home-page "https://ctan.org/macros/latex/contrib/translator")
+    (propagated-inputs
+     (list texlive-graphics))
+    (home-page "https://ctan.org/pkg/translator")
     (synopsis "Easy translation of strings in LaTeX")
     (description
      "This LaTeX package provides a flexible mechanism for translating
-individual words into different languages.  For example, it can be used to
-translate a word like \"figure\" into, say, the German word \"Abbildung\".
-Such a translation mechanism is useful when the author of some package would
-like to localize the package such that texts are correctly translated into the
-language preferred by the user.  This package is not intended to be used to
-automatically translate more than a few words.")
+individual words into different languages.  Such a translation mechanism is
+useful when the author of some package would like to localize the package such
+that texts are correctly translated into the language preferred by the user.
+This package is not intended to be used to automatically translate more than
+a few words.")
     (license (list license:lppl license:gpl1+))))
 
 (define-public texlive-textpos
-- 
cgit 1.4.1


From 0918ae8668613ab071330abe298cdb25fc92e43b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 13:28:55 +0200
Subject: gnu: texlive-eurosym: Refresh package definition.

* gnu/packages/tex.scm (texlive-eurosym): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[arguments]<#:phases>: Build font metrics.
---
 gnu/packages/tex.scm | 89 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 68 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d2051e6af4..daa391f6c2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11696,27 +11696,74 @@ OpenType fonts.")
     (license license:lppl1.3+)))
 
 (define-public texlive-eurosym
-  (let ((template (simple-texlive-package
-                   "texlive-eurosym"
-                   (list "/doc/fonts/eurosym/"
-                         "/fonts/map/dvips/eurosym/"
-                         "/fonts/source/public/eurosym/"
-                         "/fonts/tfm/public/eurosym/"
-                         "/fonts/type1/public/eurosym/"
-                         "/tex/latex/eurosym/eurosym.sty")
-                   (base32
-                    "0ml24rxbl1yir4s3fjjxm0z7axklc3p33syg41b76zc7hck9mk8s")
-                   #:trivial? #true)))
-    (package
-      (inherit template)
-      (home-page "https://www.ctan.org/pkg/eurosym")
-      (synopsis "METAFONT and macros for Euro sign")
-      (description "This package provides the European currency symbol for the
-Euro implemented in METAFONT, using the official European Commission
-dimensions, and providing several shapes (normal, slanted, bold, outline).
-The package also includes a LaTeX package which defines the macro,
-pre-compiled font files, and documentation.")
-      (license (license:non-copyleft "file:///doc/fonts/eurosym/COPYING")))))
+  (package
+    (name "texlive-eurosym")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/eurosym/"
+                   "fonts/map/dvips/eurosym/"
+                   "fonts/source/public/eurosym/"
+                   "fonts/tfm/public/eurosym/"
+                   "fonts/type1/public/eurosym/"
+                   "tex/latex/eurosym/")
+             (base32
+              "0ml24rxbl1yir4s3fjjxm0z7axklc3p33syg41b76zc7hck9mk8s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:modules
+      '((guix build texlive-build-system)
+        (guix build utils)
+        (srfi srfi-1)
+        (srfi srfi-26))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 're-generate-fonts-metrics
+            (lambda _
+              (let ((mf #$(this-package-native-input "texlive-metafont"))
+                    (cm #$(this-package-native-input "texlive-cm"))
+                    (root (getcwd)))
+                (mkdir-p "build")
+                (with-directory-excursion "fonts/source/public/eurosym"
+                  ;; Tell mf where to find mf.base.
+                  (setenv "MFBASES"
+                          (string-append mf "/share/texmf-dist/web2c"))
+                  ;; Tell mf where to look for source files.
+                  (setenv "MFINPUTS"
+                          (string-append
+                           (getcwd) ":"
+                           mf "/share/texmf-dist/metafont/base:"
+                           cm "/share/texmf-dist/fonts/source/public/cm"))
+                  ;; Build font metrics (tfm).
+                  (for-each (lambda (font)
+                              (format #t "building font ~a\n" font)
+                              (invoke "mf" "-progname=mf"
+                                      (string-append "-output-directory="
+                                                     root "/build")
+                                      (string-append "\\"
+                                                     "mode:=ljfour; "
+                                                     "mag:=1; "
+                                                     "batchmode; "
+                                                     "input "
+                                                     (basename font ".mf"))))
+                            (find-files "." "[0-9]+\\.mf$")))
+                ;; Install font metrics at the appropriate location.
+                (for-each
+                 (cut install-file <> "fonts/tfm/public/eurosym")
+                 (find-files "build/" "\\.tfm$"))))))))
+    (native-inputs
+     (list texlive-bin texlive-cm texlive-metafont))
+    (home-page "https://ctan.org/pkg/eurosym")
+    (synopsis "METAFONT and macros for Euro sign")
+    (description
+     "The European currency symbol for the Euro implemented in METAFONT, using
+the official European Commission dimensions, and providing several
+shapes (normal, slanted, bold, outline).  The package also includes a LaTeX
+package which defines the macro, pre-compiled @file{tfm} files, and
+documentation.")
+    (license (license:non-copyleft "file:///doc/fonts/eurosym/COPYING"))))
 
 (define-public texlive-kastrup
   (package
-- 
cgit 1.4.1


From a088bebe7c92877d3a2a9ec4927b4c5b0a37c7f4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 13:41:42 +0200
Subject: gnu: Add texlive-incgraph.

* gnu/packages/tex.scm (texlive-incgraph): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index daa391f6c2..ae286e3668 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7315,6 +7315,32 @@ fonts.  Note that direct substitutes for the bitmapped EC fonts are available,
 via the CM-super, Latin Modern and (in a restricted way) CM-LGC font sets.")
     (license license:lppl1.3+)))
 
+(define-public texlive-incgraph
+  (package
+    (name "texlive-incgraph")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/incgraph/" "tex/latex/incgraph/")
+             (base32
+              "1j5pzhzfbgzd21bq3dh7932pv0052g5l8r0qyx68n3cbsg46lcdk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-bookmark
+           texlive-graphics
+           texlive-pgf))
+    (home-page "https://ctan.org/pkg/incgraph")
+    (synopsis "Sophisticated graphics inclusion in a PDF document")
+    (description
+     "The package provides tools for including graphics at the full size of
+the output medium, or for creating pages whose size is that of the graphic
+they contain.  A principal use case is documents that require inclusion
+of (potentially many) scans or photographs.  Bookmarking is especially
+supported.  The tool box has basic macros and a convenience user interface
+that wraps @code{\\includegraphics}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-inconsolata
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 94c1684024263bb4d6a10a0e0d4ffc2bf07428ca Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 13:49:13 +0200
Subject: gnu: Add texlive-listngsutf8.

* gnu/packages/tex.scm (texlive-listngsutf8): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ae286e3668..358484726a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7154,6 +7154,33 @@ is needed.  Keywords, comments and strings can be typeset using different
 styles.  Support for @code{hyperref} is provided.")
       (license license:lppl1.3+))))
 
+(define-public texlive-listingsutf8
+  (package
+    (name "texlive-listingsutf8")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/listingsutf8/"
+                   "source/latex/listingsutf8/"
+                   "tex/latex/listingsutf8/")
+             (base32
+              "152gzkzm7sl3bvggmmfcj1pw74vc40s2kpkbp01fd9i0d0v60wma")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-listings
+           texlive-pdftexcmds
+           texlive-stringenc))
+    (home-page "https://ctan.org/pkg/listingsutf8")
+    (synopsis "Allow UTF-8 in listings input")
+    (description
+     "Package @code{listings} does not support files with multi-byte encodings
+such as UTF-8.  In the case of @code{\\lstinputlisting}, a simple workaround
+is possible if a one-byte encoding exists that the file can be converted to.
+The package requires the e-TeX extensions under pdfTeX (in either PDF or DVI
+output mode).")
+    (license license:lppl1.3+)))
+
 (define-deprecated-package texlive-latex-listings texlive-listings)
 
 (define-public texlive-jknapltx
-- 
cgit 1.4.1


From 5848b9ddb34b9ba7c7486fcdb6605ae0f130f169 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 13:35:43 +0200
Subject: gnu: texlive-tcolorbox: Refresh package definition.

* gnu/packages/tex.scm (texlive-tcolorbox): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-AMSMATH, TEXLIVE-ENVIRON, TEXLIVE-ETOOLBOX,
TEXLIVE-HYPERREF, TEXLIVE-INCGRAPH, TEXLIVE-IFTEX, TEXLIVE-L3PACKAGES,
TEXLIVE-MARVOSYM, TEXLIVE-MINTED, TEXLIVE-OBERDIEK, TEXLIVE-PDFTEXCMDS,
TEXLIVE-PSNFSS, TEXLIVE-PGF, TEXLIVE-REFCOUNT, TEXLIVE-TOOLS.
---
 gnu/packages/tex.scm | 59 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 358484726a..14fb322865 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11650,27 +11650,44 @@ levels.  All functionality is provided by the single @code{\\qrcode} command.")
     (license license:lppl1.3c+)))
 
 (define-public texlive-tcolorbox
-  (let ((template (simple-texlive-package
-                   "texlive-tcolorbox"
-                   (list "/doc/latex/tcolorbox/"
-                         "/tex/latex/tcolorbox/")
-                   (base32
-                    "1qnsbblkadzdn1fx2k21xnlwcb35pg9xya24chkm66jmidi22qp0")
-                   #:trivial? #true)))
-    (package
-      (inherit template)
-      (propagated-inputs
-       (list texlive-etoolbox texlive-environ texlive-pgf texlive-tools))
-      (home-page "https://www.ctan.org/pkg/tcolorbox")
-      (synopsis "Colored boxes, for LaTeX examples and theorems, etc")
-      (description "This package provides an environment for colored and
-framed text boxes with a heading line.  Optionally, such a box may be split in
-an upper and a lower part; thus the package may be used for the setting of
-LaTeX examples where one part of the box displays the source code and the
-other part shows the output.  Another common use case is the setting of
-theorems.  The package supports saving and reuse of source code and text
-parts.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-tcolorbox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tcolorbox/" "tex/latex/tcolorbox/")
+             (base32
+              "1qnsbblkadzdn1fx2k21xnlwcb35pg9xya24chkm66jmidi22qp0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-amsmath
+           texlive-environ
+           texlive-etoolbox
+           texlive-hyperref
+           texlive-incgraph
+           texlive-iftex
+           texlive-l3packages
+           texlive-listings
+           texlive-listingsutf8
+           texlive-marvosym
+           texlive-minted
+           texlive-oberdiek             ;for pdfcol
+           texlive-pdftexcmds
+           texlive-pgf
+           texlive-psnfss
+           texlive-refcount
+           texlive-tools))
+    (home-page "https://ctan.org/pkg/tcolorbox")
+    (synopsis "Coloured boxes, for LaTeX examples and theorems, etc")
+    (description
+     "This package provides an environment for coloured and framed text boxes
+with a heading line.  Optionally, such a box may be split in an upper and
+a lower part; thus the package may be used for the setting of LaTeX examples
+where one part of the box displays the source code and the other part shows
+the output.  Another common use case is the setting of theorems.  The package
+supports saving and reuse of source code and text parts.")
+    (license license:lppl1.3c+)))
 
 (define-public texlive-ebproof
   (package
-- 
cgit 1.4.1


From 9272f0576adc7b2508e6cfb12c5b370853dcc2ee Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 17:11:39 +0200
Subject: gnu: texlive-ly1: Refresh package definition.

* gnu/packages/tex.scm (texlive-ly1): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 14fb322865..5c7e9bd976 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11333,24 +11333,28 @@ Type 1 and OTF formats, with supporting files as necessary.")
 
 (define-public texlive-ly1
   (package
-    (inherit (simple-texlive-package
-              "texlive-ly1"
-              (list "/doc/fonts/ly1/"
-                    "/fonts/enc/dvips/ly1/"
-                    "/fonts/map/dvips/ly1/"
-                    "/fonts/tfm/adobe/ly1/"
-                    "/fonts/vf/adobe/ly1/"
-                    "/tex/latex/ly1/")
-              (base32
-               "0wjyw0risgvrq97zfciglwy1f4msvfslln6pz0q8yzzx8wsv3zgq")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/ly1")
+    (name "texlive-ly1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ly1/"
+                   "fonts/enc/dvips/ly1/"
+                   "fonts/map/dvips/ly1/"
+                   "fonts/tfm/adobe/ly1/"
+                   "fonts/vf/adobe/ly1/"
+                   "tex/latex/ly1/"
+                   "tex/plain/ly1/")
+             (base32
+              "1lks902rr94m3n3r4rc2lm4vvqhqv9prgrpni5ww64rqrv56h8yy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ly1")
     (synopsis "Support for LY1 LaTeX encoding")
-    (description "The legacy @emph{texnansi} (TeX and ANSI) encoding
-is known in the LaTeX scheme of things as @emph{LY1} encoding.  The
-@code{ly1} bundle includes metrics and LaTeX macros to use the three
-basic Adobe Type 1 fonts (Times, Helvetica and Courier) in LaTeX using
-LY1 encoding.")
+    (description
+     "The legacy @code{texnansi} (TeX and ANSI) encoding is known in the LaTeX
+scheme of things as @emph{LY1} encoding.  The @code{ly1} bundle includes
+metrics and LaTeX macros to use the three basic Adobe Type 1 fonts (Times,
+Helvetica and Courier) in LaTeX using LY1 encoding.")
     (license license:lppl1.0+)))
 
 (define-public texlive-sectsty
-- 
cgit 1.4.1


From 06b17a52b79e6c3955b7ef1524aa4399eb33c9c9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 17:15:13 +0200
Subject: gnu: texlive-xcharter: Refresh package definition.

* gnu/packages/tex.scm (texlive-xcharter): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-CARLISLE, TEXLIVE-ETOOLBOX, TEXLIVE-FONTAXES,
TEXLIVE-XSTRING, TEXLIVE-XKEYVAL.
---
 gnu/packages/tex.scm | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5c7e9bd976..9dad5030bd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11306,22 +11306,31 @@ mathematics package that matches Libertine text quite well.")
 
 (define-public texlive-xcharter
   (package
-    (inherit (simple-texlive-package
-              "texlive-xcharter"
-              (list "/doc/fonts/xcharter/"
-                    "/fonts/afm/public/xcharter/"
-                    "/fonts/enc/dvips/xcharter/"
-                    "/fonts/map/dvips/xcharter/"
-                    "/fonts/opentype/public/xcharter/"
-                    "/fonts/tfm/public/xcharter/"
-                    "/fonts/type1/public/xcharter/"
-                    "/fonts/vf/public/xcharter/"
-                    "/tex/latex/xcharter/")
-              (base32
-               "0d8rvcmvxrlxqqxpirxqbhmiijpsz5y4vvldh1jnc018aannjlhm")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/xcharter")
-    (synopsis "Extension of the Bitstream Charter fonts")
+    (name "texlive-xcharter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/xcharter/"
+                   "fonts/afm/public/xcharter/"
+                   "fonts/enc/dvips/xcharter/"
+                   "fonts/map/dvips/xcharter/"
+                   "fonts/opentype/public/xcharter/"
+                   "fonts/tfm/public/xcharter/"
+                   "fonts/type1/public/xcharter/"
+                   "fonts/vf/public/xcharter/"
+                   "tex/latex/xcharter/")
+             (base32
+              "0d8rvcmvxrlxqqxpirxqbhmiijpsz5y4vvldh1jnc018aannjlhm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-carlisle
+           texlive-etoolbox
+           texlive-fontaxes
+           texlive-xstring
+           texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/xcharter")
+    (synopsis "Extension of Bitstream Charter fonts")
     (description "@code{xcharter} repackages Bitstream Charter with an
 extended set of features.  The extension provides small caps, oldstyle
 figures and superior figures in all four styles, accompanied by LaTeX
-- 
cgit 1.4.1


From e9f165ee9ca5ed1715d038af838b6aecdf12003c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 18:48:12 +0200
Subject: gnu: Add texlive-etextools.

* gnu/packages/tex.scm (texlive-etextools): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9dad5030bd..1f661dc6fc 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9764,6 +9764,33 @@ adding a prefix to e-TeX’s commands.  For example, ε-TeX’s
 
 (define-deprecated-package texlive-generic-etexcmds texlive-etexcmds)
 
+(define-public texlive-etextools
+  (package
+    (name "texlive-etextools")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/etextools/"
+                   "source/latex/etextools/"
+                   "tex/latex/etextools/")
+             (base32
+              "0bfcc8g8q5v1nyqmrg8n17hv4k8yvhsplansvriccpmvyx0w9y9d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etex
+           texlive-etoolbox
+           texlive-letltxmacro))
+    (home-page "https://ctan.org/pkg/etextools")
+    (synopsis "e-TeX tools for LaTeX users and package writers")
+    (description
+     "The package provides many (purely expandable) tools for LaTeX: extensive
+list management; purely expandable loops; conversion; addition/deletion;
+expansion and group control; tests on tokens, characters and control
+sequences; tests on strings; purely expandable macros with options or
+modifiers; some purely expandable numerics.")
+    (license license:lppl)))
+
 (define-public texlive-gettitlestring
   (let ((template (simple-texlive-package
                    "texlive-gettitlestring"
-- 
cgit 1.4.1


From e31cfb0981778cd7aeb67fac35ada6bc0666636f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 18:43:26 +0200
Subject: gnu: texlive-newtx: Refresh package definition.

* gnu/packages/tex.scm (texlive-newtx): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-AMSMATH, TEXLIVE-CARLISLE, TEXLIVE-ETEXTOOLS,
TEXLIVE-ETOOLBOX, TEXLIVE-FONTAXES, TEXLIVE-IFTEX, TEXLIVE-OBERDIEK,
TEXLIVE-TRIMSPACES, TEXLIVE-XSTRING, TEXLIVE-XKEYVAL.
---
 gnu/packages/tex.scm | 58 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1f661dc6fc..0d70b8f666 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11305,30 +11305,44 @@ use with [pdf]LaTeX.")
 
 (define-public texlive-newtx
   (package
-    (inherit (simple-texlive-package
-              "texlive-newtx"
-              (list "/doc/fonts/newtx/"
-                    "/fonts/afm/public/newtx/"
-                    "/fonts/enc/dvips/newtx/"
-                    "/fonts/map/dvips/newtx/"
-                    "/fonts/opentype/public/newtx/"
-                    "/fonts/tfm/public/newtx/"
-                    "/fonts/type1/public/newtx/"
-                    "/fonts/vf/public/newtx/"
-                    "/tex/latex/newtx/")
-              (base32
-               "0h0wm3cd0wxag5x7vy3vgr42jd8m6ffkl90pnkvqdxzbnfdjv3l6")
-              #:trivial? #t))
+    (name "texlive-newtx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "/doc/fonts/newtx/"
+                   "/fonts/afm/public/newtx/"
+                   "/fonts/enc/dvips/newtx/"
+                   "/fonts/map/dvips/newtx/"
+                   "/fonts/opentype/public/newtx/"
+                   "/fonts/tfm/public/newtx/"
+                   "/fonts/type1/public/newtx/"
+                   "/fonts/vf/public/newtx/"
+                   "/tex/latex/newtx/")
+             (base32
+              "0h0wm3cd0wxag5x7vy3vgr42jd8m6ffkl90pnkvqdxzbnfdjv3l6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-amsmath
+           texlive-carlisle
+           texlive-etextools
+           texlive-etoolbox
+           texlive-fontaxes
+           texlive-iftex
+           texlive-oberdiek
+           texlive-trimspaces
+           texlive-xkeyval
+           texlive-xstring))
     (home-page "https://www.ctan.org/pkg/newtx")
     (synopsis "Repackaging of the TX fonts with improved metrics")
-    (description "The @code{newtx} bundle splits
-@code{txfonts.sty} (from the TX fonts distribution) into two
-independent packages, @code{newtxtext.sty} and @code{newtxmath.sty},
-each with fixes and enhancements.  @code{newtxmath}'s metrics have
-been re-evaluated to provide a less tight appearance and to provide a
-@code{libertine} option that substitutes Libertine italic and Greek
-letters for the existing math italic and Greek glyphs, making a
-mathematics package that matches Libertine text quite well.")
+    (description
+     "The @code{newtx} bundle splits @file{txfonts.sty} (from the TX fonts
+distribution) into two independent packages, @code{newtxtext.sty} and
+@code{newtxmath.sty}, each with fixes and enhancements.  @code{newtxmath}'s
+metrics have been re-evaluated to provide a less tight appearance and to
+provide a @code{libertine} option that substitutes Libertine italic and Greek
+letters for the existing math italic and Greek glyphs, making a mathematics
+package that matches Libertine text quite well.")
     (license license:lppl1.3)))
 
 (define-public texlive-xcharter
-- 
cgit 1.4.1


From 51a3fc45a69c58b43a791020f745705f72a51d1e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 18:52:03 +0200
Subject: gnu: texlive-cabin: Refresh package definition.

* gnu/packages/tex.scm (texlive-cabin): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-IFTEX, TEXLIVE-FONTAXES, TEXLIVE-FONTSPEC, TEXLIVE-MWEIGHTS, TEXLIVE-XKEYVAL.
---
 gnu/packages/tex.scm | 60 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0d70b8f666..f231bb8a18 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11275,33 +11275,41 @@ or if it differs from the weight desired for another font family.  The
 
 (define-public texlive-cabin
   (package
-    (inherit (simple-texlive-package
-              "texlive-cabin"
-              (list "/doc/fonts/cabin/"
-                    "/fonts/enc/dvips/cabin/"
-                    "/fonts/map/dvips/cabin/"
-                    "/fonts/opentype/impallari/cabin/"
-                    "/fonts/tfm/impallari/cabin/"
-                    "/fonts/type1/impallari/cabin/"
-                    "/fonts/vf/impallari/cabin/"
-                    "/tex/latex/cabin/")
-              (base32
-               "1gqqqbj7i18fs1ss5n3axd821hzq5kbv1dl7dqxp4gba619f1rli")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/cabin")
+    (name "texlive-cabin")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cabin/"
+                   "fonts/enc/dvips/cabin/"
+                   "fonts/map/dvips/cabin/"
+                   "fonts/opentype/impallari/cabin/"
+                   "fonts/tfm/impallari/cabin/"
+                   "fonts/type1/impallari/cabin/"
+                   "fonts/vf/impallari/cabin/"
+                   "tex/latex/cabin/")
+             (base32
+              "1gqqqbj7i18fs1ss5n3axd821hzq5kbv1dl7dqxp4gba619f1rli")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-fontaxes
+           texlive-fontspec
+           texlive-iftex
+           texlive-mweights
+           texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/cabin")
     (synopsis "Humanist Sans Serif font with LaTeX support")
-    (description "Cabin is a humanist sans with four weights, true
-italics and small capitals.  According to its designer, Pablo
-Impallari, Cabin was inspired by the typefaces of Edward Johnston and
-Eric Gill.  Cabin incorporates modern proportions, optical adjustments
-and some elements of the geometric sans.  @code{cabin.sty} supports
-use of the font under LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX.  It uses
-the @code{mweights} package to manage the user's view of all those
-font weights.  An @code{sfdefault} option is provided to enable Cabin
-as the default text font.  The @code{fontaxes} package is required for
-use with [pdf]LaTeX.")
-    (license (list license:silofl1.1 ;for Cabin
-                   license:lppl))))  ;for support files
+    (description
+     "Cabin is a humanist sans with four weights and true italics and small
+capitals.  According to the designer, Pablo Impallari, Cabin was inspired by
+Edward Johnston's and Eric Gill's typefaces, with a touch of modernism.  Cabin
+incorporates modern proportions, optical adjustments, and some elements of the
+geometric sans.  @file{cabin.sty} supports use of the font under LaTeX,
+pdfLaTeX, XeLaTeX and LuaLaTeX; it uses the @code{mweights}, to manage the
+user's view of all those font weights.  An option is provided to enable Cabin
+as the default text font.")
+    (license (list license:silofl1.1    ;for Cabin
+                   license:lppl))))     ;for support files
 
 (define-public texlive-newtx
   (package
-- 
cgit 1.4.1


From 92ea6d7d6b5cf87f174b2fc32dd6ed68a9e5b96b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 18:54:35 +0200
Subject: gnu: texlive-mweights: Refresh package definition.

* gnu/packages/tex.scm (texlive-mweights): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f231bb8a18..6d1c3d05c4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11255,22 +11255,25 @@ footnote style author/affiliation input in the @command{\\author} command,
 
 (define-public texlive-mweights
   (package
-    (inherit (simple-texlive-package
-              "texlive-mweights"
-              (list "/doc/latex/mweights/"
-                    "/tex/latex/mweights/")
-              (base32
-               "12493g3yz06mhiybnphqbp49fjzy36clzw63b74mkfhsg1pq7h1b")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/mweights")
+    (name "texlive-mweights")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mweights/" "tex/latex/mweights/")
+             (base32
+              "12493g3yz06mhiybnphqbp49fjzy36clzw63b74mkfhsg1pq7h1b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mweights")
     (synopsis "Support for multiple-weight font packages")
-    (description "Many font families available for use with LaTeX are
-available at multiple weights.  Many Type 1-oriented support packages
-for such fonts re-define the standard @code{\\mddefault} or
-@code{\\bfdefault} macros.  This can create difficulties if the weight
-desired for one font family is not available for another font family,
-or if it differs from the weight desired for another font family.  The
-@code{mweights} package provides a solution to these difficulties.")
+    (description
+     "Many font families available for use with LaTeX are available at
+multiple weights.  Many Type 1-oriented support packages for such fonts
+re-define the standard @code{\\mddefault} or @code{\\bfdefault} macros.  This
+can create difficulties if the weight desired for one font family isn't
+available for another font family, or if it differs from the weight desired
+for another font family.  The package provides a solution to these
+difficulties.")
     (license license:lppl)))
 
 (define-public texlive-cabin
-- 
cgit 1.4.1


From b4cd894d36001ea4ecfaee25f06116a5036b66db Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 18:58:38 +0200
Subject: gnu: texlive-utopia: Refresh package definition.

* gnu/packages/tex.scm (texlive-utopia): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6d1c3d05c4..b8ca68c149 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11190,23 +11190,25 @@ trademark of Adobe Systems Incorporated.")
 
 (define-public texlive-utopia
   (package
-    (inherit (simple-texlive-package
-              "texlive-utopia"
-              (list "/doc/fonts/utopia/"
-                    "/fonts/afm/adobe/utopia/"
-                    "/fonts/tfm/adobe/utopia/"
-                    "/fonts/type1/adobe/utopia/"
-                    "/fonts/vf/adobe/utopia/")
-              (base32
-               "113wgkfz4z0ls2grxxfj17l42a1yv9r5ipcd0156xnfsrqvqzxfc")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/utopia")
+    (name "texlive-utopia")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/utopia/" "fonts/afm/adobe/utopia/"
+                   "fonts/tfm/adobe/utopia/"
+                   "fonts/type1/adobe/utopia/"
+                   "fonts/vf/adobe/utopia/")
+             (base32
+              "113wgkfz4z0ls2grxxfj17l42a1yv9r5ipcd0156xnfsrqvqzxfc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/utopia")
     (synopsis "Adobe Utopia fonts")
-    (description "The Adobe Standard Encoding set of the Utopia font
-family, as contributed to the X Consortium.  The set comprises upright
-and italic shapes in medium and bold weights.  Macro support and
-matching maths fonts are provided by the @code{fourier} and
-@code{mathdesign} font packages.")
+    (description
+     "The Adobe Standard Encoding set of the Utopia font family, as
+contributed by the X Consortium.  The set comprises upright and italic shapes
+in medium and bold weights.  Macro support and matching maths fonts are
+provided by the @code{fourier} and the @code{mathdesign} font packages.")
     (license (license:fsf-free
               "http://mirrors.ctan.org/fonts/utopia/README"))))
 
-- 
cgit 1.4.1


From 00dec6039b1f7deffca6ba409b8b639fdc43144b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:01:31 +0200
Subject: gnu: texlive-fourier: Refresh package definition.

* gnu/packages/tex.scm (texlive-fourier): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 49 ++++++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b8ca68c149..fd9d58486f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11165,27 +11165,34 @@ a repackaging, for use with TeX, of the Bitstream Vera family.")
 
 (define-public texlive-fourier
   (package
-    (inherit (simple-texlive-package
-              "texlive-fourier"
-              (list "/doc/fonts/fourier/"
-                    "/fonts/afm/public/fourier/"
-                    "/fonts/map/dvips/fourier/"
-                    "/fonts/tfm/public/fourier/"
-                    "/fonts/type1/public/fourier/"
-                    "/fonts/vf/public/fourier/"
-                    "/tex/latex/fourier/")
-              (base32
-               "04d575nd4yvl58g9dfab9mrjxiv4792bdkz4bjvlkx6x257vlfzn")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/fourier")
-    (synopsis "Utopia fonts for LaTeX documents")
-    (description "Fourier-GUTenberg is a LaTeX typesetting system
-which uses Adobe Utopia as its standard base font.  Fourier-GUTenberg
-provides all complementary typefaces needed to allow Utopia based TeX
-typesetting including an extensive mathematics set and several other
-symbols.  The system is absolutely stand-alone; apart from Utopia and
-Fourier no other typefaces are required.  Utopia is a registered
-trademark of Adobe Systems Incorporated.")
+    (name "texlive-fourier")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fourier/"
+                   "fonts/afm/public/fourier/"
+                   "fonts/map/dvips/fourier/"
+                   "fonts/opentype/public/fourier/"
+                   "fonts/tfm/public/fourier/"
+                   "fonts/type1/public/fourier/"
+                   "fonts/vf/public/fourier/"
+                   "tex/latex/fourier/")
+             (base32
+              "038h02n02fii0kv021d5z8ic2p0mqnjzwxdbvcfym4gkcw345fxk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-fontspec
+           texlive-iftex))
+    (home-page "https://ctan.org/pkg/fourier")
+    (synopsis "Using Utopia fonts for LaTeX documents")
+    (description
+     "Fourier-GUTenberg is a LaTeX typesetting system which uses Adobe Utopia
+as its standard base font.  Fourier-GUTenberg provides all complementary
+typefaces needed to allow Utopia based TeX typesetting, including an extensive
+mathematics set and several other symbols.  The system is absolutely
+stand-alone: apart from Utopia and Fourier, no other typefaces are required.
+Utopia is a registered trademark of Adobe Systems Incorporated")
     (license license:lppl)))
 
 (define-public texlive-utopia
-- 
cgit 1.4.1


From 363cd9b71990ffedee32630afaea5970ddcde8ee Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:03:30 +0200
Subject: gnu: texlive-bera: Refresh package definition.

* gnu/packages/tex.scm (texlive-bera): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-GRAPHICS.
---
 gnu/packages/tex.scm | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fd9d58486f..98ddbcd9b3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11142,25 +11142,30 @@ created by the Greek Font Society).")
 
 (define-public texlive-bera
   (package
-    (inherit (simple-texlive-package
-              "texlive-bera"
-              (list "/doc/fonts/bera/"
-                    "/fonts/afm/public/bera/"
-                    "/fonts/map/dvips/bera/"
-                    "/fonts/tfm/public/bera/"
-                    "/fonts/type1/public/bera/"
-                    "/fonts/vf/public/bera/"
-                    "/tex/latex/bera/")
-              (base32
-               "1pkmhhr6ah44xhipjr7nianv03hr4w4bn45xcvp264yw6ymqzqwr")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/bera")
+    (name "texlive-bera")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/bera/"
+                   "fonts/afm/public/bera/"
+                   "fonts/map/dvips/bera/"
+                   "fonts/tfm/public/bera/"
+                   "fonts/type1/public/bera/"
+                   "fonts/vf/public/bera/"
+                   "tex/latex/bera/")
+             (base32
+              "1pkmhhr6ah44xhipjr7nianv03hr4w4bn45xcvp264yw6ymqzqwr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics))
+    (home-page "https://ctan.org/pkg/bera")
     (synopsis "Bera fonts")
-    (description "The @code{bera} package contains the Bera Type 1
-fonts and files to use the fonts with LaTeX.  Bera is a set of three
-font families: Bera Serif (a slab-serif Roman), Bera Sans (a Frutiger
-descendant) and Bera Mono (monospaced/typewriter).  The Bera family is
-a repackaging, for use with TeX, of the Bitstream Vera family.")
+    (description "The @code{bera} package contains the Bera Type 1 fonts and
+files to use the fonts with LaTeX.  Bera is a set of three font families: Bera
+Serif (a slab-serif Roman), Bera Sans (a Frutiger descendant) and Bera
+Mono (monospaced/typewriter).  The Bera family is a repackaging, for use with
+TeX, of the Bitstream Vera family.")
     (license license:silofl1.1)))
 
 (define-public texlive-fourier
-- 
cgit 1.4.1


From 3eb88e656b79b08a2e2e6024ea41e7f1e0da6a27 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:05:24 +0200
Subject: gnu: texlive-mathdesign: Refresh package definition.

* gnu/packages/tex.scm (texlive-mathdesign): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-GRAPHICS, texlive-XKEYVAL.
[license]: Set to GPL3+.
---
 gnu/packages/tex.scm | 67 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 98ddbcd9b3..a2db444b37 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11116,29 +11116,52 @@ support packages.  Others are cmbright, hvmath and kerkis.")
 
 (define-public texlive-mathdesign
   (package
-    (inherit (simple-texlive-package
-              "texlive-mathdesign"
-              (list "/doc/fonts/mathdesign/"
-                    "/dvips/mathdesign/"
-                    "/fonts/enc/dvips/mathdesign/"
-                    "/fonts/map/dvips/mathdesign/"
-                    "/fonts/tfm/public/mathdesign/"
-                    "/fonts/type1/public/mathdesign/"
-                    "/fonts/vf/public/mathdesign/"
-                    "/tex/latex/mathdesign/")
-              (base32
-               "0jcby2sd0l3ank2drxc0qcf5d1cwa8idzh4g91h4nxk8zrzxj8nr")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/mathdesign")
+    (name "texlive-mathdesign")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/mathdesign/"
+                   "dvips/mathdesign/"
+                   "fonts/enc/dvips/mathdesign/"
+                   "fonts/map/dvips/mathdesign/"
+                   "fonts/tfm/public/mathdesign/mdbch/"
+                   "fonts/tfm/public/mathdesign/mdgreek/"
+                   "fonts/tfm/public/mathdesign/mdici/"
+                   "fonts/tfm/public/mathdesign/mdpgd/"
+                   "fonts/tfm/public/mathdesign/mdpus/"
+                   "fonts/tfm/public/mathdesign/mdput/"
+                   "fonts/tfm/public/mathdesign/mdugm/"
+                   "fonts/type1/public/mathdesign/mdbch/"
+                   "fonts/type1/public/mathdesign/mdici/"
+                   "fonts/type1/public/mathdesign/mdpgd/"
+                   "fonts/type1/public/mathdesign/mdpus/"
+                   "fonts/type1/public/mathdesign/mdput/"
+                   "fonts/type1/public/mathdesign/mdugm/"
+                   "fonts/vf/public/mathdesign/mdbch/"
+                   "fonts/vf/public/mathdesign/mdgreek/"
+                   "fonts/vf/public/mathdesign/mdici/"
+                   "fonts/vf/public/mathdesign/mdpgd/"
+                   "fonts/vf/public/mathdesign/mdpus/"
+                   "fonts/vf/public/mathdesign/mdput/"
+                   "fonts/vf/public/mathdesign/mdugm/"
+                   "tex/latex/mathdesign/")
+             (base32
+              "0jcby2sd0l3ank2drxc0qcf5d1cwa8idzh4g91h4nxk8zrzxj8nr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics
+           texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/mathdesign")
     (synopsis "Mathematical fonts to fit with particular text fonts")
-    (description "The Math Design project offers free mathematical
-fonts that match with existing text fonts.  To date, three free font
-families are available: Adobe Utopia, URW Garamond and Bitstream
-Charter.  Mathdesign covers the whole LaTeX glyph set including AMS
-symbols.  Both roman and bold versions of these symbols can be used.
-Moreover, there is a choice between three greek fonts (two of them
-created by the Greek Font Society).")
-    (license license:gpl2+)))
+    (description
+     "The Math Design project offers mathematical fonts that match with
+existing text fonts.  To date, three free font families are available: Adobe
+Utopia, URW Garamond and Bitstream Charter.  Mathdesign covers the whole LaTeX
+glyph set including AMS symbols.  Both roman and bold versions of these
+symbols can be used.  Moreover, there is a choice between three greek
+fonts (two of them created by the Greek Font Society).")
+    (license license:gpl3+)))
 
 (define-public texlive-bera
   (package
-- 
cgit 1.4.1


From 12a1332fb6795ff2e48d0402567a995836fa5f26 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:11:20 +0200
Subject: gnu: texlive-arev: Refresh package definition.

* gnu/packages/tex.scm (texlive-arev): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-AMSFONTS, TEXLIVE-BERA.
---
 gnu/packages/tex.scm | 61 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a2db444b37..8645b767bf 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11085,34 +11085,41 @@ the @code{psnfss} distribution.")
 
 (define-public texlive-arev
   (package
-    (inherit (simple-texlive-package
-              "texlive-arev"
-              (list "/doc/fonts/arev/"
-                    "/fonts/afm/public/arev/"
-                    "/fonts/enc/dvips/arev/"
-                    "/fonts/map/dvips/arev/"
-                    "/fonts/tfm/public/arev/"
-                    "/fonts/type1/public/arev/"
-                    "/fonts/vf/public/arev/"
-                    "/tex/latex/arev/")
-              (base32
-               "15wkgc48r52mjpymv6l7j9bl99kwxbvg3g1mi3qyq7nfm799dkxy")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/arev")
+    (name "texlive-arev")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/arev/"
+                   "fonts/afm/public/arev/"
+                   "fonts/enc/dvips/arev/"
+                   "fonts/map/dvips/arev/"
+                   "fonts/tfm/public/arev/"
+                   "fonts/type1/public/arev/"
+                   "fonts/vf/public/arev/"
+                   "source/fonts/arev/"
+                   "tex/latex/arev/")
+             (base32
+              "1a0zw9vc6z0shxvb4kdhfqdhwpzph5hm9v7klpchlisabvk421y1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-amsfonts
+           texlive-bera))
+    (home-page "https://ctan.org/pkg/arev")
     (synopsis "Fonts and LaTeX support files for Arev Sans")
-    (description "The @code{arev} package provides type 1 fonts,
-virtual fonts and LaTeX packages for using Arev Sans in both text and
-mathematics.  Arev Sans is a derivative of Bitstream Vera Sans, adding
-support for Greek and Cyrillic characters and a few variant letters
-appropriate for mathematics.  The font is primarily used in LaTeX for
-presentations, particularly when using a computer projector.  Arev
-Sans has large x-height, \"open letters\", wide spacing and thick
-stems.  The style is very similar to the SliTeX font lcmss but
-heavier.  Arev is one of a very small number of sans-font mathematics
-support packages.  Others are cmbright, hvmath and kerkis.")
-    (license (list license:silofl1.1 ;for Arev Sans
-                   license:lppl1.3a  ;for TeX support files
-                   license:gpl2))))  ;for ams-mdbch.sty
+    (description
+     "The @code{arev} package provides type 1 fonts, virtual fonts and LaTeX
+packages for using Arev Sans in both text and mathematics.  Arev Sans is
+a derivative of Bitstream Vera Sans, adding support for Greek and Cyrillic
+characters and a few variant letters appropriate for mathematics.  The font is
+primarily used in LaTeX for presentations, particularly when using a computer
+projector.  Arev Sans has large x-height, open letters, wide spacing and thick
+stems.  The style is very similar to the SliTeX font @code{lcmss} but heavier.
+Arev is one of a very small number of sans-font mathematics support
+packages.")
+    (license (list license:silofl1.1    ;for Arev Sans
+                   license:lppl1.3a     ;for TeX support files
+                   license:gpl2))))     ;for ams-mdbch.sty
 
 (define-public texlive-mathdesign
   (package
-- 
cgit 1.4.1


From 9ac2e325dd6fd2edb81eaad9f70d84c77de3bf98 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:13:04 +0200
Subject: gnu: texlive-fpl: Refresh package definition.

* gnu/packages/tex.scm (texlive-fpl): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8645b767bf..86f5a5f3bb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11065,16 +11065,17 @@ for fixed point real numbers of high precision.")
 
 (define-public texlive-fpl
   (package
-    (inherit (simple-texlive-package
-              "texlive-fpl"
-              (list "/doc/fonts/fpl/"
-                    "/source/fonts/fpl/"
-                    "/fonts/afm/public/fpl/"
-                    "/fonts/type1/public/fpl/")
-              (base32
-               "02gkl516z9kn8xqs269pdkqn37sxm8ib0pcs43s4rs2rhyyl5z68")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/fpl")
+    (name "texlive-fpl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fpl/" "fonts/afm/public/fpl/"
+                   "fonts/type1/public/fpl/" "source/fonts/fpl/")
+             (base32
+              "02gkl516z9kn8xqs269pdkqn37sxm8ib0pcs43s4rs2rhyyl5z68")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fpl")
     (synopsis "SC and OsF fonts for URW Palladio L")
     (description "The FPL Fonts provide a set of SC/OsF fonts for URW
 Palladio L which are compatible with the Palatino SC/OsF fonts from
-- 
cgit 1.4.1


From 9aa2f5228dc0dcd89bbcb9f7315add7281c18c33 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:14:06 +0200
Subject: gnu: texlive-fp: Refresh package definition.

* gnu/packages/tex.scm (texlive-fp): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 86f5a5f3bb..0981fecbe4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11050,13 +11050,17 @@ LaTeX macro support is provided in package @code{psnfss}.")
 
 (define-public texlive-fp
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-fp"
-      (list "doc/latex/fp/" "tex/latex/fp/" "tex/plain/fp/")
-      (base32 "1q555fx71cf88sn3npzb0j2i10ak920k0qc9ccdygz99vqg10dad")
-      #:trivial? #t))
-    (home-page "https://ctan.org/macros/latex/contrib/fp")
+    (name "texlive-fp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fp/" "tex/latex/fp/"
+                   "tex/plain/fp/")
+             (base32
+              "1q555fx71cf88sn3npzb0j2i10ak920k0qc9ccdygz99vqg10dad")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fp")
     (synopsis "Fixed point arithmetic")
     (description
      "This package provides an extensive collection of arithmetic operations
-- 
cgit 1.4.1


From 76efb0fbd26033d56bab4dc562a93dc5f15d3a81 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:26:59 +0200
Subject: gnu: texlive-mathpazo: Refresh package definition.

* gnu/packages/tex.scm (texlive-mathpazo): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0981fecbe4..8bd58a1188 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11024,28 +11024,32 @@ Symbol font from Adobe's basic set.")
 
 (define-public texlive-mathpazo
   (package
-    (inherit (simple-texlive-package
-              "texlive-mathpazo"
-              (list "/doc/latex/mathpazo/"
-                    "/fonts/afm/public/mathpazo/"
-                    "/fonts/tfm/public/mathpazo/"
-                    "/fonts/type1/public/mathpazo/"
-                    "/fonts/vf/public/mathpazo/")
-              (base32
-               "02in6hdnbnkz216mpy8g6fk3wmlls8nh5982vmg37vhbj77lk0rh")
-              #:trivial? #t))
-    (home-page "http://www.ctan.org/pkg/mathpazo")
+    (name "texlive-mathpazo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mathpazo/"
+                   "fonts/afm/public/mathpazo/"
+                   "fonts/tfm/public/mathpazo/"
+                   "fonts/type1/public/mathpazo/"
+                   "fonts/vf/public/mathpazo/"
+                   "source/latex/mathpazo/")
+             (base32
+              "0g10rjgg1kb78lgyxmwjrkgpy24yq3v0m47h6zhbc68rrmmawvwp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-fpl texlive-palatino))
+    (home-page "https://ctan.org/pkg/mathpazo")
     (synopsis "Fonts to typeset mathematics to match Palatino")
     (description "The Pazo Math fonts are a family of PostScript fonts
-suitable for typesetting mathematics in combination with the Palatino
-family of text fonts.  The Pazo Math family is made up of five fonts
-provided in Adobe Type 1 format.  These contain glyphs that are
-usually not available in Palatino and for which Computer Modern looks
-odd when combined with Palatino.  These glyphs include the uppercase
-Greek alphabet in upright and slanted shapes, the lowercase Greek
-alphabet in slanted shape, several mathematical glyphs and the
-uppercase letters commonly used to represent various number sets.
-LaTeX macro support is provided in package @code{psnfss}.")
+suitable for typesetting mathematics in combination with the Palatino family
+of text fonts.  The Pazo Math family is made up of five fonts provided in
+Adobe Type 1 format.  These contain glyphs that are usually not available in
+Palatino and for which Computer Modern looks odd when combined with Palatino.
+These glyphs include the uppercase Greek alphabet in upright and slanted
+shapes, the lowercase Greek alphabet in slanted shape, several mathematical
+glyphs and the uppercase letters commonly used to represent various number
+sets.  LaTeX macro support is provided in package @code{psnfss}.")
     (license license:gpl3+)))
 
 (define-public texlive-fp
-- 
cgit 1.4.1


From 6886a807b6c00fa7b0a1727233241007d6f06f7b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:28:58 +0200
Subject: gnu: texlive-symbol: Refresh package definition.

* gnu/packages/tex.scm (texlive-symbol): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8bd58a1188..a73a530f15 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11003,24 +11003,35 @@ included in the bundle.")
 
 (define-public texlive-symbol
   (package
-    (inherit (simple-texlive-package
-              "texlive-symbol"
-              (list "/dvips/symbol/"
-                    "/fonts/afm/adobe/symbol/"
-                    "/fonts/afm/urw/symbol/"
-                    "/fonts/tfm/adobe/symbol/"
-                    "/fonts/tfm/urw35vf/symbol/"
-                    "/fonts/type1/urw/symbol/"
-                    "/fonts/map/dvips/symbol/"
-                    "/tex/latex/symbol/")
-              (base32
-               "01xiygb88xwi7rfvh1zrlxzi5pqb5fvylws5zzszg379iz4pyzwj")
-              #:trivial? #t))
+    (name "texlive-symbol")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/symbol/"
+                   "fonts/afm/adobe/symbol/"
+                   "fonts/afm/urw/symbol/"
+                   "fonts/map/dvips/symbol/"
+                   "fonts/tfm/adobe/symbol/"
+                   "fonts/tfm/monotype/symbol/"
+                   "fonts/tfm/urw35vf/symbol/"
+                   "fonts/type1/urw/symbol/"
+                   "tex/latex/symbol/")
+             (base32
+              "1pdkpr86bhia5hcmf7q3nhvklnsga4mqqrrirgl8a7al7x6q3ivs")))
+    (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/urw-base35")
     (synopsis "URW Base 35 font pack for LaTeX")
-    (description "This package provides a drop-in replacement for the
-Symbol font from Adobe's basic set.")
-    (license license:gpl2)))
+    (description
+     "This package provides a set of fonts for use as drop-in replacements for
+Adobe's basic set, comprising: Century Schoolbook (substituting for Adobe's
+New Century Schoolbook); Dingbats (substituting for Adobe's Zapf Dingbats);
+Nimbus Mono L (substituting for Abobe's Courier); Nimbus Roman No9
+L (substituting for Adobe's Times); Nimbus Sans L (substituting for Adobe's
+Helvetica); Standard Symbols L (substituting for Adobe's Symbol); URW Bookman;
+URW Chancery L Medium Italic (substituting for Adobe's Zapf Chancery); URW
+Gothic L Book (substituting for Adobe's Avant Garde); and URW Palladio
+L (substituting for Adobe's Palatino).")
+    (license license:gpl3+)))
 
 (define-public texlive-mathpazo
   (package
-- 
cgit 1.4.1


From cf6baca1f4685c4cd47f4c85a47337fd00a640a5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:30:39 +0200
Subject: gnu: texlive-caption: Refresh package definition.

* gnu/packages/tex.scm (texlive-caption): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-GRAPHICS.
---
 gnu/packages/tex.scm | 46 ++++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a73a530f15..98f6022e2f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10978,28 +10978,30 @@ customize the highlighted source code output using fancyvrb and fvextra.")
       (license license:lppl1.3+))))
 
 (define-public texlive-caption
-  (let ((template (simple-texlive-package
-                   "texlive-caption"
-                   (list "/doc/latex/caption/"
-                         "/tex/latex/caption/")
-                   (base32
-                    "1isnn375d14xsx398j3m8rbb0pdk12kijw4xcgl82xici170klwq")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (home-page "http://www.ctan.org/pkg/caption")
-      (synopsis "Customising captions in floating environments")
-      (description "The @code{caption} package provides many ways to
-customise the captions in floating environments like figure and table.
-Facilities include rotating captions, sideways captions and continued
-captions (for tables or figures that come in several parts).  A list
-of compatibility notes, for other packages, is provided in the
-documentation.  The package also provides the \"caption outside
-float\" facility, in the same way that simpler packages like
-@code{capt-ofcapt-of} do.  The package supersedes @code{caption2}.
-Packages @code{bicaption}, @code{ltcaption} and @code{subcaption} are
-included in the bundle.")
-      (license license:lppl1.3+))))
+  (package
+    (name "texlive-caption")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/caption/" "source/latex/caption/"
+                   "tex/latex/caption/")
+             (base32
+              "1fg3zfgi54zqx911wbqfb1y24d9ihm6wg59npng4clnqz45lla2i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics))
+    (home-page "https://ctan.org/pkg/caption")
+    (synopsis "Customising captions in floating environments")
+    (description
+     "The @code{caption} package provides many ways to customise the captions
+in floating environments like figure and table, and cooperates with many other
+packages.  Facilities include rotating captions, sideways captions, continued
+captions (for tables or figures that come in several parts).  A list of
+compatibility notes, for other packages, is provided in the documentation.
+The package also provides the caption outside float facility, in the same way
+that simpler packages like capt-of do.")
+    (license license:lppl1.3+)))
 
 (define-public texlive-symbol
   (package
-- 
cgit 1.4.1


From a06ebba8168f1e85a973dcd5b6a1fefe4281cf46 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:33:32 +0200
Subject: gnu: texlive-minted: Refresh package definition.

* gnu/packages/tex.scm (texlive-minted): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-GRAPHICS, TEXLIVE-KVOPTIONS,
TEXLIVE-PDFTEXCMDS, TEXLIVE-TOOLS.
---
 gnu/packages/tex.scm | 62 ++++++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 98f6022e2f..d6d541c507 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10947,35 +10947,39 @@ configuration of its own fixed names, using @file{.mld} files.")
     (license license:lppl1.3+)))
 
 (define-public texlive-minted
-  (let ((template (simple-texlive-package
-                   "texlive-minted"
-                   (list "/doc/latex/minted/"
-                         "/source/latex/minted/"
-                         "/tex/latex/minted/")
-                   (base32
-                    "13cjsjb3b04n9arwp46ayk8fcicylxq5g1864cpxl1lxjxh1yi0l"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "latex/minted")))
-      (propagated-inputs (list python-pygments
-                               texlive-etoolbox
-                               texlive-fancyvrb
-                               texlive-float
-                               texlive-framed
-                               texlive-fvextra
-                               texlive-ifplatform
-                               texlive-lineno
-                               texlive-newfloat
-                               texlive-xstring))
-      (home-page "https://ctan.org/pkg/minted")
-      (synopsis "Highlight source code in LaTeX documents")
-      (description "This package facilitates expressive syntax highlighting in
-LaTeX using the Pygments library.  This package also provides options to
-customize the highlighted source code output using fancyvrb and fvextra.")
-      (license license:lppl1.3+))))
+  (package
+    (name "texlive-minted")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/minted/" "source/latex/minted/"
+                   "tex/latex/minted/")
+             (base32
+              "13cjsjb3b04n9arwp46ayk8fcicylxq5g1864cpxl1lxjxh1yi0l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list python-pygments
+           texlive-etoolbox
+           texlive-fancyvrb
+           texlive-float
+           texlive-framed
+           texlive-fvextra
+           texlive-graphics
+           texlive-ifplatform
+           texlive-kvoptions
+           texlive-lineno
+           texlive-newfloat
+           texlive-pdftexcmds
+           texlive-tools
+           texlive-xstring))
+    (home-page "https://ctan.org/pkg/minted")
+    (synopsis "Highlighted source code for LaTeX")
+    (description
+     "The package that facilitates expressive syntax highlighting in LaTeX
+using the powerful Pygments library.  The package also provides options to
+customize the highlighted source code output using @code{fancyvrb}.")
+    (license license:lppl1.3+)))
 
 (define-public texlive-caption
   (package
-- 
cgit 1.4.1


From fd198a23f358bf329c0fe1f9f3755a2bcc95c06b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:39:39 +0200
Subject: gnu: texlive-microtype: Refresh package definition.

* gnu/packages/tex.scm (texlive-microtype): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-GRAPHICS.
---
 gnu/packages/tex.scm | 51 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d6d541c507..0291109c7c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10898,29 +10898,34 @@ included in the @code{units} bundle.")
       (license license:gpl3+))))
 
 (define-public texlive-microtype
-  (let ((template (simple-texlive-package
-                   "texlive-microtype"
-                   (list "/doc/latex/microtype/"
-                         "/tex/latex/microtype/")
-                   (base32
-                    "07861ixrjzxm0l24z82ivhaj4v6xm4ijbaabp66jxsf8s8h7dq9n")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (home-page "http://www.ctan.org/pkg/microtype")
-      (synopsis "Subliminal refinements towards typographical perfection")
-      (description "@code{microtype} provides a LaTeX interface to the
-micro-typographic extensions that were introduced by pdfTeX and have
-since propagated to XeTeX and LuaTeX: most prominently character
-protrusion and font expansion, the adjustment of kerning and interword
-spacing, hyphenatable letterspacing and the possibility to disable all
-or selected ligatures.  These features may be applied to customisable
-sets of fonts.  All micro-typographic aspects of the fonts can be
-configured in a straight-forward and flexible way.  Settings for
-various fonts are provided.  An alternative package
-@code{letterspace}, which also works with plain TeX, is included in
-the bundle.")
-      (license license:lppl1.3c))))
+  (package
+    (name "texlive-microtype")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/microtype/"
+                   "source/latex/microtype/"
+                   "tex/latex/microtype/")
+             (base32
+              "1r9w6za8g263n16pz0r5adrx5sazhfa78rdhjj9idnif12bgvpq2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics))
+    (home-page "https://ctan.org/pkg/microtype")
+    (synopsis "Subliminal refinements towards typographical perfection")
+    (description
+     "The package provides a LaTeX interface to the micro-typographic
+extensions that were introduced by pdfTeX and have since also propagated to
+XeTeX and LuaTeX: most prominently, character protrusion and font expansion,
+furthermore the adjustment of interword spacing and additional kerning, as
+well as hyphenatable letterspacing (tracking) and the possibility to disable
+all or selected ligatures.  These features may be applied to customisable sets
+of fonts, and all micro-typographic aspects of the fonts can be configured in
+a straight-forward and flexible way.  An alternative package
+@code{letterspace}, which also works with plain TeX, is included in the
+bundle.")
+    (license license:lppl1.3c)))
 
 (define-public texlive-minitoc
   (package
-- 
cgit 1.4.1


From fe3f7a1b92e842dfbf712e06c20129ecb985f523 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:40:35 +0200
Subject: gnu: texlive-units: Refresh package definition.

* gnu/packages/tex.scm (texlive-units): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0291109c7c..723f10373e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10880,22 +10880,24 @@ of the visual appearance.")
       (license license:lppl1.3+))))
 
 (define-public texlive-units
-  (let ((template (simple-texlive-package
-                   "texlive-units"
-                   (list "/doc/latex/units/"
-                         "/tex/latex/units/")
-                   (base32
-                    "1ia1vzy8dp7pdvmawwnmh9lmkajmpnnh62dixrjpb6mnxq118bfd")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (home-page "http://www.ctan.org/pkg/units")
-      (synopsis "Typeset physical units and fractions")
-      (description "@code{units} is a package for typesetting physical
-units in a standard-looking way.  The package is based upon
-@code{nicefrac}, a package for typing fractions.  @code{nicefrac} is
-included in the @code{units} bundle.")
-      (license license:gpl3+))))
+  (package
+    (name "texlive-units")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/units/" "source/latex/units/"
+                   "tex/latex/units/")
+             (base32
+              "1mrdsg55f40cvarrx84gbhrnsk8mlv915nll17lnfzfapgmvjsbl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/units")
+    (synopsis "Typeset physical units and fractions")
+    (description "@code{units} is a package for typesetting physical units in
+a standard-looking way.  The package is based upon @code{nicefrac}, a package
+for typing fractions.  @code{nicefrac} is included in the @code{units}
+bundle.")
+    (license license:gpl3+)))
 
 (define-public texlive-microtype
   (package
-- 
cgit 1.4.1


From 34e2e55a1a19252d9b1e872d49e2f34a8c371631 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:43:45 +0200
Subject: gnu: texlive-todonotes: Refresh package definition.

* gnu/packages/tex.scm (texlive-todonotes): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: TEXLIVE-TOOLS, TEXLIVE-XCOLOR.
---
 gnu/packages/tex.scm | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 723f10373e..d89a396c60 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10860,24 +10860,30 @@ citations and references.")
     (license license:lppl1.3c)))
 
 (define-public texlive-todonotes
-  (let ((template (simple-texlive-package
-                   "texlive-todonotes"
-                   (list "/doc/latex/todonotes/"
-                         "/tex/latex/todonotes/")
-                   (base32
-                    "1jqw8jy73488bdr971w0dnlggsvicagpnpx8ddqkma920ba8rabp")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (propagated-inputs
-       (list texlive-pgf texlive-xkeyval))
-      (home-page "http://www.ctan.org/pkg/todonotes")
-      (synopsis "Marking things to do in a LaTeX document")
-      (description "The @code{todonotes} package lets the user mark
-things to do later, in a simple and visually appealing way.  The
-package takes several options to enable customization and finetuning
-of the visual appearance.")
-      (license license:lppl1.3+))))
+  (package
+    (name "texlive-todonotes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/todonotes/"
+                   "source/latex/todonotes/"
+                   "tex/latex/todonotes/")
+             (base32
+              "0lhqzrvf216j3rzg7lmc1mvnr2mzr0a6c2kqrfwzw6qbpm9v29nk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-pgf
+           texlive-tools
+           texlive-xcolor
+           texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/todonotes")
+    (synopsis "Marking things to do in a LaTeX document")
+    (description
+     "The @code{todonotes} package lets the user mark things to do later, in
+a simple and visually appealing way.  The package takes several options to
+enable customization and finetuning of the visual appearance.")
+    (license license:lppl1.3+)))
 
 (define-public texlive-units
   (package
-- 
cgit 1.4.1


From efde0718f86c17ad6a136adf5b2df16b998b2dc7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:45:29 +0200
Subject: gnu: texlive-biblatex-apa: Refresh package definition.

* gnu/packages/tex.scm (texlive-biblatex-apa): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d89a396c60..ef51938951 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10839,23 +10839,22 @@ section.
 
 (define-public texlive-biblatex-apa
   (package
-    ;; Version 9.16 2022-06-22
-    (inherit (simple-texlive-package
-              "texlive-biblatex-apa"
-              (list "doc/latex/biblatex-apa/"
-                    "tex/latex/biblatex-apa/")
-              (base32
-               "0ivf7xbzj4xd57sqfbi87hbr73rraqifkzvx06yxgq0gmzz0x6wl")
-              #:trivial? #t))
-    (propagated-inputs
-     (list texlive-biblatex biber texlive-csquotes))
-    (home-page
-     "https://www.ctan.org/pkg/biblatex-apa")
+    (name "texlive-biblatex-apa")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-apa/"
+                   "tex/latex/biblatex-apa/")
+             (base32
+              "0ivf7xbzj4xd57sqfbi87hbr73rraqifkzvx06yxgq0gmzz0x6wl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-apa")
     (synopsis "BibLaTeX citation and reference style for APA")
     (description
      "This is a fairly complete BibLaTeX style (citations and references) for
-@acronym{APA, American Psychological Association} publications.  It implements
-and automates most of the guidelines in the APA 7th edition style guide for
+APA (American Psychological Association) publications.  It implements and
+automates most of the guidelines in the APA 7th edition style guide for
 citations and references.")
     (license license:lppl1.3c)))
 
-- 
cgit 1.4.1


From dbe43a3fbf820ebb4f872b1fd421168863bee65a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 19:50:18 +0200
Subject: gnu: texlive-biblatex: Refresh package definition.

* gnu/packages/tex.scm (texlive-biblatex): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-ETOOLBOX, TEXLIVE-KVOPTIONS, TEXLIVE-PDFTEXCMDS.
---
 gnu/packages/tex.scm | 70 +++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ef51938951..0af4aba79a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10800,42 +10800,40 @@ XML file.
       (license license:lppl1.3c))))
 
 (define-public texlive-biblatex
-  (let ((template (simple-texlive-package
-                   "texlive-biblatex"
-                   (list "/doc/latex/biblatex/"
-                         "/tex/latex/biblatex/")
-                   (base32
-                    "091cz2vrq22d1fr05wljd8vbllsz95q2hn2p8hhrwb2l2xrmxwn8")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (propagated-inputs
-       (list texlive-logreq texlive-url))
-      (home-page "https://www.ctan.org/pkg/biblatex")
-      (synopsis "Sophisticated bibliographies in LaTeX")
-      (description "BibLaTeX is a complete reimplementation of the
-bibliographic facilities provided by LaTeX.  Formatting of the
-bibliography is entirely controlled by LaTeX macros, facilitating the
-design of new bibliography and citation styles.  BibLaTeX uses its own
-data backend program \"biber\" to read and process the bibliographic
-data.  With biber, the range of features provided by biblatex
-includes:
-
-@enumerate
-@item
-full unicode support,
-
-@item
-customisable bibliography labels,
-
-@item
-multiple bibliographies in the same document, and
-
-@item
-subdivided bibliographies, such as bibliographies per chapter or
-section.
-@end enumerate\n")
-      (license license:lppl1.3c))))
+  (package
+    (name "texlive-biblatex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/biblatex/biblatex/"
+                   "bibtex/bst/biblatex/"
+                   "doc/latex/biblatex/"
+                   "tex/latex/biblatex/bbx/"
+                   "tex/latex/biblatex/cbx/"
+                   "tex/latex/biblatex/lbx/")
+             (base32
+              "1v3y2i7vng1qfs3p7ma2mf8lvvib422aagc3z6q2vwz6r3y4mr5k")))
+    (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")
+    (synopsis "Sophisticated Bibliographies in LaTeX")
+    (description
+     "BibLaTeX is a complete reimplementation of the bibliographic facilities
+provided by LaTeX.  Formatting of the bibliography is entirely controlled by
+LaTeX macros, and a working knowledge of LaTeX should be sufficient to design
+new bibliography and citation styles.  BibLaTeX uses its own data backend
+program called @code{biber} to read and process the bibliographic data.  With
+@code{biber}, the range of features provided by BibLaTeX includes full Unicode
+support, customisable bibliography labels, multiple bibliographies in the same
+document, and subdivided bibliographies, such as bibliographies per chapter or
+section.")
+    (license license:lppl1.3+)))
 
 (define-public texlive-biblatex-apa
   (package
-- 
cgit 1.4.1


From 26944757fbc8057c832380ed0c498b014d100bd2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 20:42:57 +0200
Subject: gnu: texlive-logreq: Refresh package definition.

* gnu/packages/tex.scm (texlive-logreq): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-ETOOLBOX, TEXLIVE-GRAPHICS.
---
 gnu/packages/tex.scm | 56 ++++++++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0af4aba79a..2f11f2df9b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10768,36 +10768,32 @@ styles as well as the optional active quotes are freely configurable.")
       (license license:lppl1.3c+))))
 
 (define-public texlive-logreq
-  (let ((template (simple-texlive-package
-                   "texlive-logreq"
-                   (list "/doc/latex/logreq/"
-                         "/tex/latex/logreq/")
-                   (base32
-                    "13difccs3cxlkqlnhw286yb0c7mifrxfd402a2x5wwxv0m1kgfqd")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (propagated-inputs
-       (list texlive-etoolbox))
-      (home-page "https://www.ctan.org/pkg/logreq")
-      (synopsis "Support for automation of the LaTeX workflow")
-      (description "The package helps to automate a typical LaTeX
-workflow that involves running LaTeX several times and running tools
-such as BibTeX or makeindex.  It will log requests like \"please rerun
-LaTeX\" or \"please run BibTeX on file X\" to an external file in a
-machine-readable format.  Compiler scripts and integrated LaTeX
-editing environments may parse this file to determine the next steps
-in the workflow.  In sum, the package will do two things:
-
-@enumerate
-@item
-enable package authors to use LaTeX commands to issue requests, and
-
-@item
-collect all requests from all packages and write them to an external
-XML file.
-@end enumerate\n")
-      (license license:lppl1.3c))))
+  (package
+    (name "texlive-logreq")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/logreq/" "tex/latex/logreq/")
+             (base32
+              "13difccs3cxlkqlnhw286yb0c7mifrxfd402a2x5wwxv0m1kgfqd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etoolbox
+           texlive-graphics))
+    (home-page "https://ctan.org/pkg/logreq")
+    (synopsis "Support for automation of the LaTeX workflow")
+    (description
+     "The package helps to automate a typical LaTeX workflow that involves
+running LaTeX several times, running tools such as BibTeX or makeindex, and so
+on.  It will log requests like ``please rerun LaTeX'' or ``please run BibTeX
+on file X'' to an external XML file which lists all open tasks in
+a machine-readable format.  Compiler scripts and integrated LaTeX editing
+environments may parse this file to determine the next steps in the
+workflow. In sum, the package will do two things: enable package authors to
+use LaTeX commands to issue requests, collect all requests from all packages
+and write them to an external XML file at the end of the document.")
+    (license license:lppl1.3+)))
 
 (define-public texlive-biblatex
   (package
-- 
cgit 1.4.1


From ab021b964a3dcca07e241542a0f4de780d4cb99d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 20:48:34 +0200
Subject: gnu: texlive-csquotes: Refresh package definition.

* gnu/packages/tex.scm (texlive-csquotes): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-ETOOLBOX, TEXLIVE-GRAPHICS, TEXLIVE-RELSIZE.
---
 gnu/packages/tex.scm | 53 ++++++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2f11f2df9b..73942d3de9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10742,30 +10742,35 @@ to what constitutes a good table in this context.  The package offers
     (license license:lppl1.3+)))
 
 (define-public texlive-csquotes
-  (let ((template (simple-texlive-package
-                   "texlive-csquotes"
-                   (list "/doc/latex/csquotes/"
-                         "/tex/latex/csquotes/")
-                   (base32
-                    "17y5mrmjmi7n0cgq4cnqr55f4bni6lx1pfdv5pzsmbrzha3mhbfg")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (propagated-inputs
-       (list texlive-etoolbox))
-      (home-page "https://www.ctan.org/pkg/csquotes")
-      (synopsis "Context sensitive quotation facilities")
-      (description "This package provides advanced facilities for inline and
-display quotations.  It is designed for a wide range of tasks ranging from the
-most simple applications to the more complex demands of formal quotations.
-The facilities include commands, environments, and user-definable 'smart
-quotes' which dynamically adjust to their context.  Quotation marks are
-switched automatically if quotations are nested and they can be adjusted to
-the current language if the babel package is available.  There are additional
-facilities designed to cope with the more specific demands of academic
-writing, especially in the humanities and the social sciences.  All quote
-styles as well as the optional active quotes are freely configurable.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-csquotes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/csquotes/"
+                   "tex/latex/csquotes/")
+             (base32
+              "17y5mrmjmi7n0cgq4cnqr55f4bni6lx1pfdv5pzsmbrzha3mhbfg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etoolbox
+           texlive-graphics
+           texlive-relsize))
+    (home-page "https://www.ctan.org/pkg/csquotes")
+    (synopsis "Context sensitive quotation facilities")
+    (description
+     "This package provides advanced facilities for inline and display
+quotations.  It is designed for a wide range of tasks ranging from the most
+simple applications to the more complex demands of formal quotations.  The
+facilities include commands, environments, and user-definable smart quotes
+which dynamically adjust to their context.  Quotation marks are switched
+automatically if quotations are nested and they can be adjusted to the current
+language if the babel package is available.  There are additional facilities
+designed to cope with the more specific demands of academic writing,
+especially in the humanities and the social sciences.  All quote styles as
+well as the optional active quotes are freely configurable.")
+    (license license:lppl1.3c+)))
 
 (define-public texlive-logreq
   (package
-- 
cgit 1.4.1


From 8418976b0f83765455603f17e55b55e9a47f6a4c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 20:53:11 +0200
Subject: gnu: texlive-iftex: Refresh package definition.

* gnu/packages/tex.scm (texlive-iftex): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 73942d3de9..91c0c11c5d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10535,24 +10535,27 @@ frames made with the @code{framed} package.")
       (license license:lppl1.3c+))))
 
 (define-public texlive-iftex
-  (let ((template (simple-texlive-package
-                   "texlive-iftex"
-                   (list "/doc/generic/iftex/"
-                         "/tex/generic/iftex/")
-                   (base32
-                    "147xa5kl4kjs05nj8v3kd7dpr5xkz3xp3gdvjih32ccd7527f5vp")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (home-page "http://www.ctan.org/pkg/iftex")
-      (synopsis "Determine the currently used TeX engine")
-      (description "This package, which works both for Plain TeX and for
-LaTeX, defines the @code{\\ifPDFTeX}, @code{\\ifXeTeX}, and @code{\\ifLuaTeX}
-conditionals for testing which engine is being used for typesetting.  The
-package also provides the @code{\\RequirePDFTeX}, @code{\\RequireXeTeX}, and
-@code{\\RequireLuaTeX} commands which throw an error if pdfTeX, XeTeX or
-LuaTeX (respectively) is not the engine in use.")
-      (license license:lppl1.3+))))
+  (package
+    (name "texlive-iftex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "/doc/generic/iftex/"
+                   "/tex/generic/iftex/")
+             (base32
+              "147xa5kl4kjs05nj8v3kd7dpr5xkz3xp3gdvjih32ccd7527f5vp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "http://www.ctan.org/pkg/iftex")
+    (synopsis "Determine the currently used TeX engine")
+    (description
+     "This package, which works both for Plain TeX and for LaTeX, defines the
+@code{\\ifPDFTeX}, @code{\\ifXeTeX}, and @code{\\ifLuaTeX} conditionals for
+testing which engine is being used for typesetting.  The package also provides
+the @code{\\RequirePDFTeX}, @code{\\RequireXeTeX}, and @code{\\RequireLuaTeX}
+commands which throw an error if pdfTeX, XeTeX or LuaTeX (respectively) is not
+the engine in use.")
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-generic-iftex texlive-iftex)
 
-- 
cgit 1.4.1


From e92dc9384ffb8384d23a90e04f1655d18036cf45 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 20:57:36 +0200
Subject: gnu: texlive-pst-text: Refresh package definition.

* gnu/packages/tex.scm (texlive-pst-text): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 91c0c11c5d..318d397f68 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10492,25 +10492,27 @@ or shading the cells of tables.")
       (license license:lppl1.3+))))
 
 (define-public texlive-pst-text
-  (let ((template (simple-texlive-package
-                   "texlive-pst-text"
-                   (list "/doc/generic/pst-text/"
-                         "/dvips/pst-text/pst-text.pro"
-                         "/tex/generic/pst-text/"
-                         "/tex/latex/pst-text/")
-                   (base32
-                    "146fpzd1xlqi94q5r48z8ni8qww713yh6nwkbr9pw27mjrqdadb9")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (propagated-inputs
-       (list texlive-pstricks))
-      (home-page "http://www.ctan.org/pkg/pst-text")
-      (synopsis "Text and character manipulation in PSTricks")
-      (description "Pst-text is a PSTricks based package for plotting text along
+  (package
+    (name "texlive-pst-text")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-text/"
+                   "dvips/pst-text/"
+                   "tex/generic/pst-text/"
+                   "tex/latex/pst-text/")
+             (base32
+              "146fpzd1xlqi94q5r48z8ni8qww713yh6nwkbr9pw27mjrqdadb9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-pstricks))
+    (home-page "http://www.ctan.org/pkg/pst-text")
+    (synopsis "Text and character manipulation in PSTricks")
+    (description "Pst-text is a PSTricks based package for plotting text along
 a different path and manipulating characters.  It includes the functionality
 of the old package @code{pst-char}.")
-      (license license:lppl))))
+    (license license:lppl)))
 
 (define-public texlive-marginnote
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From 9a33ab9fecf7d3894d41a936694d7145d5f1b06e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 21:20:42 +0200
Subject: gnu: texlive-pstricks: Refresh package definition.

* gnu/packages/tex.scm (texlive-pstricks): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-AMSFONTS, TEXLIVE-AMSMATH, TEXLIVE-BABEL,
TEXLIVE-BERA, TEXLIVE-BIBLATEX, TEXLIVE-BOOKTABS, TEXLIVE-CAPTION,
TEXLIVE-CHNGCNTR, TEXLIVE-ESO-PIC, TEXLIVE-FANCYVRB, TEXLIVE-FILECONTENTS,
TEXLIVE-FOOTMISC, TEXLIVE-GRAPHICS, TEXLIVE-HYPERREF, TEXLIVE-IFPLATFORM,
TEXLIVE-IFTEX, TEXLIVE-LISTINGS, TEXLIVE-MULTIDO, TEXLIVE-RAGGED2E,
TEXLIVE-SETSPACE, TEXLIVE-SUBFIG, TEXLIVE-TOOLS, TEXLIVE-XCOLOR.
---
 gnu/packages/tex.scm | 74 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 48 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 318d397f68..86ac27fbf3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10464,32 +10464,54 @@ change.")
     (license license:lppl1.3+)))
 
 (define-public texlive-pstricks
-  (let ((template (simple-texlive-package
-                   "texlive-pstricks"
-                   (list "/doc/generic/pstricks/"
-                         "/dvips/pstricks/"
-                         "/tex/generic/pstricks/"
-                         "/tex/latex/pstricks/")
-                   (base32
-                    "15c9iqfq2y9c8c78cvqb6vzd5a5rm7qq5x7m05jq1hb8sgqrqb0j")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (delete 'reset-gzip-timestamps)))))
-      (home-page "http://www.ctan.org/pkg/pstricks")
-      (synopsis "PostScript macros for TeX")
-      (description "PSTricks offers an extensive collection of macros for
-generating PostScript that is usable with most TeX macro formats, including
-Plain TeX, LaTeX, AMS-TeX, and AMS-LaTeX.  Included are macros for colour,
-graphics, pie charts, rotation, trees and overlays.  It has many special
-features, including a wide variety of graphics (picture drawing) macros, with
-a flexible interface and with colour support.  There are macros for colouring
-or shading the cells of tables.")
-      (license license:lppl1.3+))))
+  (package
+    (name "texlive-pstricks")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pstricks/"
+                   "dvips/pstricks/"
+                   "tex/generic/pstricks/"
+                   "tex/latex/pstricks/")
+             (base32
+              "15c9iqfq2y9c8c78cvqb6vzd5a5rm7qq5x7m05jq1hb8sgqrqb0j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-amsfonts
+           texlive-amsmath
+           texlive-babel
+           texlive-bera
+           texlive-biblatex
+           texlive-booktabs
+           texlive-caption
+           texlive-chngcntr
+           texlive-eso-pic
+           texlive-fancyvrb
+           texlive-filecontents
+           texlive-footmisc
+           texlive-graphics
+           texlive-hyperref
+           texlive-ifplatform
+           texlive-iftex
+           texlive-listings
+           texlive-multido
+           texlive-ragged2e
+           texlive-setspace
+           texlive-subfig
+           texlive-tools
+           texlive-xcolor))
+    (home-page "http://www.ctan.org/pkg/pstricks")
+    (synopsis "PostScript macros for TeX")
+    (description
+     "PSTricks offers an extensive collection of macros for generating
+PostScript that is usable with most TeX macro formats, including Plain TeX,
+LaTeX, AMS-TeX, and AMS-LaTeX.  Included are macros for colour, graphics, pie
+charts, rotation, trees and overlays.  It has many special features, including
+a wide variety of graphics (picture drawing) macros, with a flexible interface
+and with colour support.  There are macros for colouring or shading the cells
+of tables.")
+    (license license:lppl1.3+)))
 
 (define-public texlive-pst-text
   (package
-- 
cgit 1.4.1


From c5cfdf215d2d8412f595ee93b0b25147b9361147 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 21:29:09 +0200
Subject: gnu: texlive-beamer: Refresh package definition.

* gnu/packages/tex.scm (texlive-beamer): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-AMSFONTS, TEXLIVE-AMSMATH, TEXLIVE-ATBEGSHI,
TEXLIVE-ETOOLBOX, TEXLIVE-GRAPHICS, TEXLIVE-HYPERREF, TEXLIVE-IFTEX,
TEXLIVE-OBERDIEK, TEXLIVE-PGF, TEXLIVE-TOOLS, TEXLIVE-TRANSLATOR, TEXLIVE-UCS, TEXLIVE-XCOLOR.
---
 gnu/packages/tex.scm | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 86ac27fbf3..e390466287 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10337,19 +10337,34 @@ for a wealth of support information.")
 
 (define-public texlive-beamer
   (package
-    (inherit (simple-texlive-package
-              "texlive-beamer"
-              (list "/doc/latex/beamer/"
-                    "/tex/latex/beamer/")
-              (base32
-               "091n27n4l3iac911bvmpp735ffryyzaq46mkclgn3q9jsvc4ngiv")
-              #:trivial? #t))
+    (name "texlive-beamer")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/beamer/"
+                   "tex/latex/beamer/")
+             (base32
+              "091n27n4l3iac911bvmpp735ffryyzaq46mkclgn3q9jsvc4ngiv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (propagated-inputs
-     (list texlive-hyperref texlive-oberdiek texlive-etoolbox
-           texlive-pgf))
+     (list texlive-amsfonts
+           texlive-amsmath
+           texlive-atbegshi
+           texlive-etoolbox
+           texlive-graphics
+           texlive-hyperref
+           texlive-iftex
+           texlive-oberdiek
+           texlive-pgf
+           texlive-tools
+           texlive-translator
+           texlive-ucs
+           texlive-xcolor))
     (home-page "https://www.ctan.org/pkg/beamer")
     (synopsis "LaTeX class for producing presentations and slides")
-    (description "The beamer LaTeX class can be used for producing slides.
+    (description
+     "The @code{beamer} LaTeX class can be used for producing slides.
 The class works in both PostScript and direct PDF output modes, using the
 @code{pgf} graphics system for visual effects.  Content is created in the
 @code{frame} environment, and each frame can be made up of a number of slides
-- 
cgit 1.4.1


From dcbc87de6ae7d3673176a2cfcc4acc9869758dab Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 21:36:29 +0200
Subject: gnu: texlive-charter: Refresh package definition.

* gnu/packages/tex.scm (texlive-charter): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e390466287..75a1e280a5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10194,18 +10194,21 @@ package, such as @command{natbib} as well).")
 
 (define-public texlive-charter
   (package
-    (inherit (simple-texlive-package
-              "texlive-charter"
-              (list "/doc/fonts/charter/readme.charter"
-                    "/fonts/afm/bitstrea/charter/"
-                    "/fonts/tfm/bitstrea/charter/"
-                    "/fonts/type1/bitstrea/charter/"
-                    "/fonts/vf/bitstrea/charter/")
-              (base32
-               "09l5ymgz48s3hyn776l01g3isk3dnhrj1vdavdw4qq4kfxxpqdn9")
-              #:trivial? #t))
-    ;; This provides charter.map.
+    (name "texlive-charter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/charter/"
+                   "fonts/afm/bitstrea/charter/"
+                   "fonts/tfm/bitstrea/charter/"
+                   "fonts/type1/bitstrea/charter/"
+                   "fonts/vf/bitstrea/charter/")
+             (base32
+              "09l5ymgz48s3hyn776l01g3isk3dnhrj1vdavdw4qq4kfxxpqdn9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (propagated-inputs
+     ;; This provides charter.map.
      (list texlive-psnfss))
     (home-page "https://www.ctan.org/pkg/charter")
     (synopsis "Charter fonts for TeX")
-- 
cgit 1.4.1


From 6e535c932de0f5999cc28be1350c9e86b3954b86 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 21:38:48 +0200
Subject: gnu: texlive-xypic: Refresh package definition.

* gnu/packages/tex.scm (texlive-xypic): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-GRAPHICS, TEXLIVE-IFTEX.
---
 gnu/packages/tex.scm | 51 +++++++++++++++++++++++++--------------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 75a1e280a5..1e85a11b1c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10132,35 +10132,34 @@ glyphs.")
     (license license:lppl1.3+)))
 
 (define-public texlive-xypic
-  (let ((template (simple-texlive-package
-                   "texlive-xypic"
-                   (list "/doc/generic/xypic/"
-                         "/dvips/xypic/xy389dict.pro"
-                         "/fonts/enc/dvips/xypic/"
-                         "/fonts/map/dvips/xypic/xypic.map"
-
-                         "/fonts/source/public/xypic/"
-                         "/fonts/afm/public/xypic/"
-                         "/fonts/tfm/public/xypic/"
-                         "/fonts/type1/public/xypic/"
-                         "/tex/generic/xypic/")
-                   (base32
-                    "09b51bbm189xh7039h5n8nmab5nn2bybhh26qjn08763m80zdhjg")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (delete 'reset-gzip-timestamps)))))
-      (home-page "https://www.ctan.org/pkg/xypic")
-      (synopsis "Flexible diagramming macros")
-      (description "This is a package for typesetting a variety of graphs and
+  (package
+    (name "texlive-xypic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/xypic/"
+                   "dvips/xypic/"
+                   "fonts/afm/public/xypic/"
+                   "fonts/enc/dvips/xypic/"
+                   "fonts/map/dvips/xypic/"
+                   "fonts/source/public/xypic/"
+                   "fonts/tfm/public/xypic/"
+                   "fonts/type1/public/xypic/"
+                   "tex/generic/xypic/")
+             (base32
+              "09b51bbm189xh7039h5n8nmab5nn2bybhh26qjn08763m80zdhjg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics texlive-iftex))
+    (home-page "https://ctan.org/pkg/xypic")
+    (synopsis "Flexible diagramming macros")
+    (description
+     "This package provides a package for typesetting a variety of graphs and
 diagrams with TeX.  Xy-pic works with most formats (including LaTeX,
 AMS-LaTeX, AMS-TeX, and plain TeX).  The distribution includes Michael Barr's
 @code{diag} package, which was previously distributed stand-alone.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-deprecated-package texlive-fonts-xypic texlive-xypic)
 
-- 
cgit 1.4.1


From 69647e82150ddcf994efb2d954b0fb6187ca52a3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 21:40:22 +0200
Subject: gnu: texlive-xunicode: Refresh package definition.

* gnu/packages/tex.scm (texlive-xunicode): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-GRAPHICS.
---
 gnu/packages/tex.scm | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1e85a11b1c..6ac44af79a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10112,21 +10112,25 @@ such as footnotes and section titles.")
 
 (define-public texlive-xunicode
   (package
-    (inherit
-     (simple-texlive-package "texlive-xunicode"
-                             (list "doc/xelatex/xunicode/"
-                                   "tex/xelatex/xunicode/")
-                             (base32
-                              "1d96i8kd2lhbykc3rxy2jjvws404f2vy1cvdcp5bdr6l9m72q1fa")
-                             #:trivial? #t))
-    (propagated-inputs (list texlive-tipa))
-    (home-page "https://ctan.org/macros/xetex/latex/xunicode")
+    (name "texlive-xunicode")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/xunicode/"
+                   "tex/xelatex/xunicode/")
+             (base32
+              "1d96i8kd2lhbykc3rxy2jjvws404f2vy1cvdcp5bdr6l9m72q1fa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics texlive-tipa))
+    (home-page "https://ctan.org/pkg/xunicode")
     (synopsis "Generate Unicode characters from accented glyphs")
     (description
-     "The package supports XeTeX's (and other putative future similar engines')
-need for Unicode characters, in a similar way to what the fontenc does for
-8-bit (and the like) fonts: convert accent-glyph sequence to a single Unicode
-character for output.  The package also covers glyphs specified by
+     "The package supports XeTeX's (and other putative future similar
+engines') need for Unicode characters, in a similar way to what the fontenc
+does for 8-bit (and the like) fonts: convert accent-glyph sequence to a single
+Unicode character for output.  The package also covers glyphs specified by
 packages (such as @code{tipa}) which define many commands for single text
 glyphs.")
     (license license:lppl1.3+)))
-- 
cgit 1.4.1


From 63e66af94833adc8b20f9a5bac404056a88915b0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 21:44:29 +0200
Subject: gnu: texlive-pgf: Refresh package definition.

* gnu/packages/tex.scm (texlive-pgf): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-EVERYSHI.
---
 gnu/packages/tex.scm | 85 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 52 insertions(+), 33 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6ac44af79a..9d7c7391be 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9552,50 +9552,69 @@ striking out (line through words) and crossing out (/// over words).")
 
 (define-public texlive-pgf
   (package
-    (inherit (simple-texlive-package
-              "texlive-pgf"
-              (list "doc/generic/pgf/"
-                    "scripts/pgf/"
-                    "source/generic/pgf/c/"
-                    "source/generic/pgf/testsuite/external/"
-                    "source/generic/pgf/testsuite/mathtest/"
-                    "tex/context/third/pgf/basiclayer/"
-                    "tex/context/third/pgf/frontendlayer/"
-                    "tex/context/third/pgf/math/"
-                    "tex/context/third/pgf/systemlayer/"
-                    "tex/context/third/pgf/utilities/"
-                    "tex/generic/pgf/"
-                    "tex/latex/pgf/basiclayer/"
-                    "tex/latex/pgf/compatibility/"
-                    "tex/latex/pgf/doc/"
-                    "tex/latex/pgf/frontendlayer/"
-                    "tex/latex/pgf/math/"
-                    "tex/latex/pgf/systemlayer/"
-                    "tex/latex/pgf/utilities/"
-                    "tex/plain/pgf/basiclayer/"
-                    "tex/plain/pgf/frontendlayer/"
-                    "tex/plain/pgf/math/"
-                    "tex/plain/pgf/systemlayer/"
-                    "tex/plain/pgf/utilities/")
-              (base32
-               "02qfx9k0ggqfrbrjpfz74w8rkvvzk07rmgr37r7y64gggwpn4cw5")
-              #:trivial? #t))
+    (name "texlive-pgf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pgf/"
+                   "scripts/pgf/"
+                   "source/generic/pgf/c/"
+                   "source/generic/pgf/testsuite/external/"
+                   "source/generic/pgf/testsuite/mathtest/"
+                   "tex/context/third/pgf/basiclayer/"
+                   "tex/context/third/pgf/frontendlayer/"
+                   "tex/context/third/pgf/math/"
+                   "tex/context/third/pgf/systemlayer/"
+                   "tex/context/third/pgf/utilities/"
+                   "tex/generic/pgf/basiclayer/"
+                   "tex/generic/pgf/frontendlayer/tikz/libraries/circuits/"
+                   "tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/"
+                   "tex/generic/pgf/frontendlayer/tikz/libraries/graphs/"
+                   "tex/generic/pgf/graphdrawing/lua/"
+                   "tex/generic/pgf/graphdrawing/tex/experimental/"
+                   "tex/generic/pgf/libraries/datavisualization/"
+                   "tex/generic/pgf/libraries/decorations/"
+                   "tex/generic/pgf/libraries/luamath/pgf/luamath/"
+                   "tex/generic/pgf/libraries/shapes/circuits/"
+                   "tex/generic/pgf/lua/pgf/"
+                   "tex/generic/pgf/math/"
+                   "tex/generic/pgf/modules/"
+                   "tex/generic/pgf/systemlayer/"
+                   "tex/generic/pgf/utilities/"
+                   "tex/latex/pgf/basiclayer/"
+                   "tex/latex/pgf/compatibility/"
+                   "tex/latex/pgf/doc/"
+                   "tex/latex/pgf/frontendlayer/libraries/"
+                   "tex/latex/pgf/math/"
+                   "tex/latex/pgf/systemlayer/"
+                   "tex/latex/pgf/utilities/"
+                   "tex/plain/pgf/basiclayer/"
+                   "tex/plain/pgf/frontendlayer/"
+                   "tex/plain/pgf/math/"
+                   "tex/plain/pgf/systemlayer/"
+                   "tex/plain/pgf/utilities/")
+             (base32
+              "1d6s7sf7dmcqrx652f7j468rylkarihxl0ghg0sy5scjdn3z9bdr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (propagated-inputs
      (list texlive-atveryend
+           texlive-everyshi
            texlive-fp
            texlive-graphics
            texlive-ms
            texlive-pdftexcmds
            texlive-xcolor))
-    (home-page "https://ctan.org/graphics/pgf/base")
+    (home-page "https://ctan.org/pkg/pgf")
     (synopsis "Create PostScript and PDF graphics in TeX")
     (description
      "PGF is a macro package for creating graphics.  It is platform- and
 format-independent and works together with the most important TeX backend
-drivers, including pdfTeX and dvips.  It comes with a user-friendly syntax layer
-called TikZ.  Its usage is similar to pstricks and the standard picture
-environment.  PGF works with plain (pdf-)TeX, (pdf-)LaTeX, and ConTeXt.  Unlike
-pstricks, it can produce either PostScript or PDF output.")
+drivers, including pdfTeX and dvips.  It comes with a user-friendly syntax
+layer called TikZ.  Its usage is similar to @code{pstricks} and the standard
+@code{picture} environment.  PGF works with plain (pdf-)TeX, (pdf-)LaTeX, and
+ConTeXt.  Unlike @code{pstricks}, it can produce either PostScript or PDF
+output.")
     ;; The code of the package is dual-license: GPL-2 or LPPL-1.3c+.  The
     ;; documentation is also dual-license: LPPL-1.3c+ or GFDL-1.2.
     (license (list license:gpl2 license:lppl1.3c+ license:fdl1.2+))))
-- 
cgit 1.4.1


From a274b064db0d6fd14e053b96fc72664b969da461 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 21:46:34 +0200
Subject: gnu: texlive-ulem: Refresh package definition.

* gnu/packages/tex.scm (texlive-ulem): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9d7c7391be..4b2cdf01ba 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9535,19 +9535,23 @@ format.")
 
 (define-public texlive-ulem
   (package
-    (inherit (simple-texlive-package
-              "texlive-ulem"
-              (list "doc/generic/ulem/" "tex/generic/ulem/")
-              (base32 "0wcfnw5h6lsg2ilvkkf7mns8jgcn0n5sh45iznfsb49pfb4mming")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/ulem")
-    (synopsis "Underline text in TeX")
+    (name "texlive-ulem")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/ulem/" "tex/generic/ulem/")
+             (base32
+              "0wcfnw5h6lsg2ilvkkf7mns8jgcn0n5sh45iznfsb49pfb4mming")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ulem")
+    (synopsis "Package for underlining")
     (description
      "The package provides an @code{\\ul} (underline) command which will break
-over line ends; this technique may be used to replace @code{\\em} (both in that
-form and as the @code{\\emph} command), so as to make output look as if it comes
-from a typewriter.  The package also offers double and wavy underlining, and
-striking out (line through words) and crossing out (/// over words).")
+over line ends; this technique may be used to replace @code{\\em} (both in
+that form and as the @code{\\emph} command), so as to make output look as if
+it comes from a typewriter.  The package also offers double and wavy
+underlining, and striking out, and crossing out.")
     (license license:lppl1.3c+)))
 
 (define-public texlive-pgf
-- 
cgit 1.4.1


From ff4e6c2309b25515af74cb1467ee4abe3095420e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 21:53:08 +0200
Subject: gnu: texlive-pdftex: Refresh package definition.

* gnu/packages/tex.scm (texlive-pdftex): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 52 ++++++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4b2cdf01ba..390ca5c686 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8699,37 +8699,41 @@ e-TeX.")
 
 (define-public texlive-pdftex
   (package
-    (inherit (simple-texlive-package
-              "texlive-pdftex"
-              (list "/doc/pdftex/"
-                    "/doc/man/man1/pdftex.1"
-                    "/doc/man/man1/pdfetex.1"
-                    "/fonts/map/dvips/dummy-space/dummy-space.map"
-                    "/fonts/tfm/public/pdftex/dummy-space.tfm"
-                    "/fonts/type1/public/pdftex/dummy-space.pfb"
-                    "/scripts/simpdftex/simpdftex"
-                    "/tex/generic/config/pdftex-dvi.tex"
-                    "/tex/generic/pdftex/glyphtounicode.tex"
-                    "/tex/generic/pdftex/pdfcolor.tex")
-              (base32
-               "0w4ar5g7x4w8zw8z6hdwqxwcbglfzzq7pcznz8rawllwy6dssr8g")
-              #:trivial? #t))
-    ;; TODO: add this missing package:
-    ;; dehyph
+    (name "texlive-pdftex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/pdfetex.1"
+                   "doc/man/man1/pdfetex.man1.pdf"
+                   "doc/man/man1/pdftex.1"
+                   "doc/man/man1/pdftex.man1.pdf"
+                   "doc/pdftex/"
+                   "fonts/map/dvips/dummy-space/"
+                   "fonts/tfm/public/pdftex/"
+                   "fonts/type1/public/pdftex/"
+                   "scripts/simpdftex/"
+                   "tex/generic/config/"
+                   "tex/generic/pdftex/")
+             (base32
+              "1d2fvz0j7picfks57sacm5j4lwl4r231iia99fv5z71id9blr2vc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (propagated-inputs
      (list texlive-cm
+           texlive-dehyph
            texlive-etex
-           texlive-knuth-lib
+           texlive-hyph-utf8
            texlive-hyphen-base
+           texlive-knuth-lib
            texlive-kpathsea
-           texlive-tex-ini-files
-           texlive-plain))
-    (home-page "https://www.ctan.org/pkg/pdftex")
+           texlive-plain
+           texlive-tex-ini-files))
+    (home-page "https://ctan.org/pkg/pdftex")
     (synopsis "TeX extension for direct creation of PDF")
     (description
-     "This package provides an extension of TeX which can be configured to
-directly generate PDF documents instead of DVI.")
-    (license license:gpl2+)))
+     "This package is an extension of TeX which can directly generate PDF
+documents as well as DVI output.")
+    (license license:gpl3+)))
 
 (define-deprecated-package texlive-generic-pdftex texlive-pdftex)
 
-- 
cgit 1.4.1


From 32c17d6ab3d807528b9a71c402d58518265def04 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 21:54:12 +0200
Subject: gnu: texlive-wrapfig: Refresh package definition.

* gnu/packages/tex.scm (texlive-wrapfig): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 390ca5c686..47cd09a07d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8597,13 +8597,16 @@ implements an easy to use interface for these symbols.")
 
 (define-public texlive-wrapfig
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-wrapfig"
-      (list "doc/latex/wrapfig/" "tex/latex/wrapfig/")
-      (base32 "0wk1vp0dqsp597xzsqbwj8xk80v7d77qmpjir84n54f920rf9ka9")
-      #:trivial? #t))
-    (home-page "https://ctan.org/macros/latex/contrib/wrapfig")
+    (name "texlive-wrapfig")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/wrapfig/" "tex/latex/wrapfig/")
+             (base32
+              "0wk1vp0dqsp597xzsqbwj8xk80v7d77qmpjir84n54f920rf9ka9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/wrapfig")
     (synopsis "Produces figures which text can flow around")
     (description
      "This package allows figures or tables to have text wrapped around them.
-- 
cgit 1.4.1


From 492b7903a90fe60b62d3ea06ba3581f04028a9be Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 21:55:20 +0200
Subject: gnu: texlive-wasy: Refresh package definition.

* gnu/packages/tex.scm (texlive-wasy): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 47cd09a07d..1f8b4be9df 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8556,16 +8556,17 @@ natural width.")
 
 (define-public texlive-wasy
   (package
-    (inherit (simple-texlive-package
-              "texlive-wasy"
-              (list "/fonts/source/public/wasy/"
-                    "/fonts/tfm/public/wasy/"
-                    "/tex/plain/wasy/"
-                    "/doc/fonts/wasy/")
-              (base32
-               "1swzxgld3lndi5q0q6zkwbw06ndh13fvp04as7zpwyhh646s0hbx")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/wasy")
+    (name "texlive-wasy")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/wasy/" "fonts/source/public/wasy/"
+                   "fonts/tfm/public/wasy/" "tex/plain/wasy/")
+             (base32
+              "1swzxgld3lndi5q0q6zkwbw06ndh13fvp04as7zpwyhh646s0hbx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/wasy")
     (synopsis "Waldi symbol fonts")
     (description "This package provides the @code{wasy} (Waldi symbol) fonts,
 in the Metafont and Adobe Type 1 formats.  Support under LaTeX is provided by
-- 
cgit 1.4.1


From 238b1c4db6b96a33a1d7ecc980f1b8a3108d37b1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 21:56:58 +0200
Subject: gnu: texlive-marvosym: Refresh package definition.

* gnu/packages/tex.scm (texlive-marvosym): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1f8b4be9df..fe2775e8b2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8422,27 +8422,31 @@ OT2 encoded fonts, CM bright shaped fonts and Concrete shaped fonts.")
 
 (define-public texlive-marvosym
   (package
-    (inherit (simple-texlive-package
-              "texlive-marvosym"
-              (list "/doc/fonts/marvosym/"
-                    "/fonts/afm/public/marvosym/"
-                    "/fonts/map/dvips/marvosym/"
-                    "/fonts/tfm/public/marvosym/"
-                    "/fonts/truetype/public/marvosym/"
-                    "/fonts/type1/public/marvosym/"
-                    "/tex/latex/marvosym/")
-              (base32
-               "0m3bbg06cia8ni86fjhvb7x4a5qcxgnpqcvicfms91w2px9ysc46")
-              #:trivial? #t))
-    (home-page "https://martinvogel.de/blog/index.php?\
-/archives/131-Marvosym.ttf.html")
+    (name "texlive-marvosym")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/marvosym/"
+                   "fonts/afm/public/marvosym/"
+                   "fonts/map/dvips/marvosym/"
+                   "fonts/tfm/public/marvosym/"
+                   "fonts/truetype/public/marvosym/"
+                   "fonts/type1/public/marvosym/"
+                   "source/fonts/marvosym/"
+                   "tex/latex/marvosym/")
+             (base32
+              "16s5ibpw6c9d3vzc82hfn90dg643xlracivikdbr9s43f2ayak41")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/marvosym")
     (synopsis "Martin Vogel's Symbols (marvosym) font")
-    (description "The Martin Vogel’s Symbols fonts (marvosym) contains the
-Euro currency symbol as defined by the European commission, along with symbols
-for structural engineering, symbols for steel cross-sections, astronomy
-signs (sun, moon, planets), the 12 signs of the zodiac, scissor symbols, CE
-sign and others.  This package contains both the original TrueType font and
-the derived Type 1 font, together with support files for TeX (LaTeX).")
+    (description
+     "Martin Vogel's Symbol font (marvosym) contains the Euro currency symbol
+as defined by the European commission, along with symbols for structural
+engineering; symbols for steel cross-sections; astronomy signs (sun, moon,
+planets); the 12 signs of the zodiac; scissor symbols; CE sign and others.
+The package contains both the original TrueType font and the derived Type
+1 font, together with support files for TeX (LaTeX).")
     (license (list license:lppl          ;for TeX support files
                    license:silofl1.1)))) ;for fonts
 
-- 
cgit 1.4.1


From 606a75bde562263137040bdbaac26b4eb91f571f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:02:35 +0200
Subject: gnu: texlive-titlesec: Refresh package definition.

* gnu/packages/tex.scm (texlive-titlesec): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fe2775e8b2..1e38bb074c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8340,13 +8340,16 @@ LGR.  The package doesn't (currently) support mathematics.")
 
 (define-public texlive-titlesec
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-titlesec"
-      (list "doc/latex/titlesec/" "tex/latex/titlesec/")
-      (base32 "01nwh4p15xblc3kgivjliihy9kr8yr2cqsf9wn2iwqv1njx0i2zw")
-      #:trivial? #t))
-    (home-page "https://ctan.org/macros/latex/contrib/titlesec")
+    (name "texlive-titlesec")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/titlesec/" "tex/latex/titlesec/")
+             (base32
+              "01nwh4p15xblc3kgivjliihy9kr8yr2cqsf9wn2iwqv1njx0i2zw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/titlesec")
     (synopsis "Select alternative section titles")
     (description
      "This package provides an interface to sectioning commands for selection
@@ -8354,7 +8357,7 @@ from various title styles, e.g. for marginal titles and to change the font of
 all headings with a single command, also providing simple one-step page
 styles.  It also includes a package to change the page styles when there are
 floats in a page.  You may assign headers/footers to individual floats, too.")
-    (license license:lppl)))
+    (license license:expat)))
 
 (define-deprecated-package texlive-latex-titlesec texlive-titlesec)
 
-- 
cgit 1.4.1


From 3d1559d805afd0452c8dc18966db875fc11b503b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:06:19 +0200
Subject: gnu: texlive-dejavu: Refresh package definition.

* gnu/packages/tex.scm (texlive-dejavu): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-GRAPHICS.
[home-page]: Fix URL.
---
 gnu/packages/tex.scm | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1e38bb074c..03cf26857a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8311,24 +8311,26 @@ The package supersedes both the @code{libertineotf} and the
 
 (define-public texlive-dejavu
   (package
-    (inherit (simple-texlive-package
-              "texlive-dejavu"
-              (list "/doc/fonts/dejavu/"
-
-                    "/fonts/enc/dvips/dejavu/"
-                    "/fonts/map/dvips/dejavu/"
-
-                    "/fonts/afm/public/dejavu/"
-                    "/fonts/tfm/public/dejavu/"
-                    "/fonts/truetype/public/dejavu/"
-                    "/fonts/type1/public/dejavu/"
-                    "/fonts/vf/public/dejavu/"
-
-                    "/tex/latex/dejavu/")
-              (base32
-               "0y4qf5jl0xncah9nkcaalmy69wwq02n3j895zp71n2p0nfi24aka")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/libertine")
+    (name "texlive-dejavu")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/dejavu/"
+                   "fonts/afm/public/dejavu/"
+                   "fonts/enc/dvips/dejavu/"
+                   "fonts/map/dvips/dejavu/"
+                   "fonts/tfm/public/dejavu/"
+                   "fonts/truetype/public/dejavu/"
+                   "fonts/type1/public/dejavu/"
+                   "fonts/vf/public/dejavu/"
+                   "tex/latex/dejavu/")
+             (base32
+              "0y4qf5jl0xncah9nkcaalmy69wwq02n3j895zp71n2p0nfi24aka")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics))
+    (home-page "https://ctan.org/pkg/dejavu")
     (synopsis "LaTeX support for the DejaVu fonts")
     (description
      "The package contains LaTeX support for the DejaVu fonts, which are
-- 
cgit 1.4.1


From d669ea32718d3b5406dd984c980b1f09edd94ac1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:08:56 +0200
Subject: gnu: texlive-libertine: Refresh package definition.

* gnu/packages/tex.scm (texlive-libertine): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-FONTAXES, TEXLIVE-FONTSPEC, TEXLIVE-HYPERREF,
TEXLIVE-IFTEX, TEXLIVE-MWEIGHTS, TEXLIVE-XKEYVAL.
---
 gnu/packages/tex.scm | 48 +++++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 03cf26857a..a0cddeeeb7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8281,30 +8281,36 @@ command).")
 
 (define-public texlive-libertine
   (package
-    (inherit (simple-texlive-package
-              "texlive-libertine"
-              (list "/doc/fonts/libertine/"
-
-                    "/fonts/enc/dvips/libertine/"
-                    "/fonts/map/dvips/libertine/"
-                    "/fonts/opentype/public/libertine/"
-                    "/fonts/tfm/public/libertine/"
-                    "/fonts/type1/public/libertine/"
-                    "/fonts/vf/public/libertine/"
-
-                    "/tex/latex/libertine/")
-              (base32
-               "1d5r80isyvs2v3i8pzlhsn7ns6bn8ldkbs82g25widraixlhg6yg")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/libertine")
-    (synopsis "Use Linux Libertine and Biolinum fonts with LaTeX")
+    (name "texlive-libertine")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/libertine/"
+                   "fonts/enc/dvips/libertine/"
+                   "fonts/map/dvips/libertine/"
+                   "fonts/opentype/public/libertine/"
+                   "fonts/tfm/public/libertine/"
+                   "fonts/type1/public/libertine/"
+                   "fonts/vf/public/libertine/"
+                   "tex/latex/libertine/")
+             (base32
+              "1d5r80isyvs2v3i8pzlhsn7ns6bn8ldkbs82g25widraixlhg6yg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-fontaxes
+           texlive-fontspec
+           texlive-hyperref
+           texlive-iftex
+           texlive-mweights
+           texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/libertine")
+    (synopsis "Use of Linux Libertine and Biolinum fonts with LaTeX")
     (description
      "The package provides the Libertine and Biolinum fonts in both Type 1 and
 OTF styles, together with support macros for their use.  Monospaced and
-display fonts, and the \"keyboard\" set are also included, in OTF style, only.
-The @code{mweights} package is used to manage the selection of font weights.
-The package supersedes both the @code{libertineotf} and the
-@code{libertine-legacy} packages.")
+display fonts, and the keyboard set are also included, in OTF style, only.
+The @code{mweights} package is used to manage the selection of font weights.")
     (license (list license:gpl2+        ; with font exception
                    license:silofl1.1
                    license:lppl))))
-- 
cgit 1.4.1


From eab3b8036951c5cf89d8be61373746af14b3eff0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:14:38 +0200
Subject: gnu: texlive-jknappen: Deprecate package.

* gnu/packages/tex.scm (texlive-jknappen): Deprecate variable.
(texlive-paralist):
(texlive-jadetex):
(texlive-xindy):
* gnu/packages/maths.scm (hypre):
* gnu/packages/python-xyz.scm (python-nbconvert): Use TEXLIVE-JKNAPLTX instead.
---
 gnu/packages/maths.scm      |  2 +-
 gnu/packages/python-xyz.scm |  2 +-
 gnu/packages/statistics.scm |  2 +-
 gnu/packages/tex.scm        | 55 ++++-----------------------------------------
 4 files changed, 7 insertions(+), 54 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index dc1d62e4ad..79fccd7cc5 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5799,7 +5799,7 @@ set.")
                                      texlive-hanging
                                      texlive-helvetic
                                      texlive-hyperref
-                                     texlive-jknappen
+                                     texlive-jknapltx
                                      texlive-listofitems
                                      texlive-multirow
                                      texlive-natbib
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2b615680e2..ac560bfcfd 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15203,7 +15203,7 @@ time.")
            (texlive-updmap.cfg (list texlive-amsfonts
                                      texlive-amsmath
                                      texlive-eurosym
-                                     texlive-jknappen
+                                     texlive-jknapltx
                                      texlive-lm
                                      texlive-lm-math
                                      texlive-mathpazo
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index b2045cdd3c..11b57ae57a 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -4839,7 +4839,7 @@ from within R.")
            swig
            ;;texlive-aeguill    ;;FIXME: package me!
            texlive-base
-           texlive-jknappen))
+           texlive-jknapltx))
     (propagated-inputs
      (list r-lattice
            r-matrix))
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a0cddeeeb7..1bd09121ca 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6498,7 +6498,7 @@ written especially for XeLaTeX users.")
     (native-inputs (list texlive-latex-base
                          (texlive-updmap.cfg
                           (list texlive-cm
-                                texlive-jknappen))))
+                                texlive-jknapltx))))
     (home-page "https://ctan.org/pkg/paralist")
     (synopsis "Enumerate and itemize within paragraphs")
     (description "The @code{paralist} package provides enumerate and itemize
@@ -7211,6 +7211,7 @@ in SGML; use maths minus in text as appropriate; simple Young tableaux.")
     (license license:gpl3+)))
 
 (define-deprecated-package texlive-latex-jknapltx texlive-jknapltx)
+(define-deprecated-package texlive-jknappen texlive-jknapltx)
 
 (define-public texlive-kvoptions
   (let ((template (simple-texlive-package
@@ -8148,54 +8149,6 @@ of ink traps which typify the Kurier font.")
 
 (define-deprecated-package texlive-fonts-iwona texlive-iwona)
 
-(define-public texlive-jknappen
-  (package
-    (inherit (simple-texlive-package
-              "texlive-jknappen"
-              (list "/fonts/source/jknappen/"
-                    "/fonts/tfm/jknappen/"
-                    "/tex4ht/ht-fonts/alias/jknappen/"
-                    "/tex4ht/ht-fonts/unicode/jknappen/")
-              (base32
-               "0xvy3c845jc7iw1h9rcm1r2yvm1ni1sm9r9k9j2cfc82xy43rwij")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/jknappen")
-    (synopsis "Miscellaneous packages by Jörg Knappen")
-    (description
-     "This package contains a collection of macros by Jörg Knappen:
-@table @code
-@item greekctr
-New counterstyles @code{\\greek} and @code{\\Greek}.
-@item holtpolt
-Non-commutative fractions
-@item latin1jk
-@itemx latin2jk
-@itemx latin3jk
-Inputenc definition files that allow verbatim input in the respective ISO
-Latin codes.
-@item mathbol
-Blackboard bold fonts for use in maths.
-@item mathrsfs
-Mathematical script letters, as traditionally used in physics for Lagrangian,
-Hamiltonian, path integral measures, etc.
-@item parboxx
-New alignment options for parboxen at top and bottom of the box.
-@item sans
-Interchanges the roles of sans serif and roman fonts throughout the document.
-@item semtrans
-Support for special latin letters and diacritics used in transliteration of
-semitic languages
-@item smartmn
-Intelligent hyphen/minus, which guesses whether to render as hyphen or minus.
-@item sgmlcmpt
-Commands replacing the characters <, >, and &.
-@item tccompat
-A compatibility package for users of the older versions of the textcomp package.
-@item young
-Simple Young tableaux.
-@end table")
-    (license license:gpl2)))                    ;per the 00readme_txt file.
-
 (define-public texlive-jadetex
   (let ((template (simple-texlive-package
                    "texlive-jadetex"
@@ -8258,7 +8211,7 @@ Simple Young tableaux.
              texlive-latex-fonts        ;for lasy6
              ;; The t1cmr.fd file of texlive-latex-base refers to the ecrm font,
              ;; provided by the jknappen package collection.
-             texlive-jknappen
+             texlive-jknapltx
              texlive-hyperref
              texlive-colortbl
              texlive-fancyhdr
@@ -12290,7 +12243,7 @@ handle complex tests.")
                          (texlive-updmap.cfg ;fonts
                           (list texlive-cbfonts
                                 texlive-lh
-                                texlive-jknappen))))
+                                texlive-jknapltx))))
     (inputs (list clisp perl))          ;used at run time
     (home-page "https://www.ctan.org/pkg/xindy")
     (synopsis "General-purpose index processor")
-- 
cgit 1.4.1


From 7406c16b635647ca10a884032ade960075cbc48f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:17:23 +0200
Subject: gnu: texlive-paralist: Fix build.

* gnu/packages/tex.scm (texlive-paralist): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[arguments]: Remove unnecessary #:TEX-DIRECTORY keyword.
[native-inputs]: Remove unnecessary inputs.
---
 gnu/packages/tex.scm | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1bd09121ca..498cef9898 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6485,26 +6485,23 @@ written especially for XeLaTeX users.")
 
 (define-public texlive-paralist
   (package
-    (inherit (simple-texlive-package
-              "texlive-paralist"
-              (list "doc/latex/paralist/README"
-                    "source/latex/paralist/paralist.dtx"
-                    "source/latex/paralist/paralist.ins")
-              (base32 "1lz8yds2i64wkb89a9amydwkzsdbc09s1kbgn7vgh2qsxqrrgwam")))
+    (name "texlive-paralist")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/paralist/" "source/latex/paralist/"
+                   "tex/latex/paralist/")
+             (base32
+              "003gs7rjm97vqh903wdjys3ls96kx45w3s4qghjk1fdjx6qxd32l")))
     (outputs '("out" "doc"))
-    (arguments
-     (list
-      #:tex-directory "latex/paralist"))
-    (native-inputs (list texlive-latex-base
-                         (texlive-updmap.cfg
-                          (list texlive-cm
-                                texlive-jknapltx))))
+    (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/paralist")
-    (synopsis "Enumerate and itemize within paragraphs")
-    (description "The @code{paralist} package provides enumerate and itemize
-environments that can be used within paragraphs to format the items either as
-running text or as separate paragraphs with a preceding number or symbol.  It
-also provides compacted versions of enumerate and itemize.")
+    (synopsis "@code{enumerate} and @code{itemize} within paragraphs")
+    (description "The @code{paralist} package provides @code{enumerate} and
+@code{itemize} environments that can be used within paragraphs to format the
+items either as running text or as separate paragraphs with a preceding number
+or symbol.  It also provides compacted versions of @code{enumerate} and
+@code{itemize}.")
     (license license:lppl1.0+)))
 
 (define-public texlive-polyglossia
-- 
cgit 1.4.1


From 186bd48ee05fb003c5f89e855f89bf01967e402d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:22:45 +0200
Subject: gnu: texlive-stmaryrd: Fix build.

* gnu/packages/tex.scm (texlive-stmaryrd): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[arguments]: Remove unnecessary #:TEX-DIRECTORY keyword.
---
 gnu/packages/tex.scm | 61 +++++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 498cef9898..b0656400d8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7928,39 +7928,42 @@ captions sideways.  Options include @code{outercaption}, @code{innercaption},
 (define-deprecated-package texlive-latex-sidecap texlive-sidecap)
 
 (define-public texlive-stmaryrd
-  (let ((template (simple-texlive-package
-                   "texlive-stmaryrd"
-                   (list "/fonts/afm/public/stmaryrd/"
-                         "/fonts/map/dvips/stmaryrd/"
-                         "/fonts/source/public/stmaryrd/"
-                         "/fonts/tfm/public/stmaryrd/"
-                         "/fonts/type1/public/stmaryrd/"
-                         "/source/fonts/stmaryrd/"
-                         "/doc/fonts/stmaryrd/")
-                   (base32
-                    "0yn0yl6x1z9ab5gb56lhvkqabd2agz3ggxifwxkiysrj5780j29z"))))
-    (package
-      (inherit template)
-      (arguments (substitute-keyword-arguments (package-arguments template)
-                   ((#:tex-directory _ #t)
-                    "latex/stmaryrd")
-                   ((#:phases phases)
-                    `(modify-phases ,phases
-                       (add-after 'unpack 'patch-ins
-                         (lambda _
-                           (substitute* "source/fonts/stmaryrd/stmaryrd.ins"
-                             (("^%% LaTeX2e.*") "\\input docstrip\n")
-                             (("fontdef\\}\\}" line)
-                              (string-append line "\n\\endbatchfile")))))))))
-      (home-page "https://www.ctan.org/pkg/stmaryrd")
-      (synopsis "St Mary Road symbols for theoretical computer science")
-      (description
-       "The fonts were originally distributed as Metafont sources only, but
+  (package
+    (name "texlive-stmaryrd")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/stmaryrd/"
+                   "fonts/afm/public/stmaryrd/"
+                   "fonts/map/dvips/stmaryrd/"
+                   "fonts/source/public/stmaryrd/"
+                   "fonts/tfm/public/stmaryrd/"
+                   "fonts/type1/public/stmaryrd/"
+                   "source/fonts/stmaryrd/"
+                   "tex/latex/stmaryrd/")
+             (base32
+              "0ljrxbf2p301p4cmadf2w0qb5idvgmx4j6y3kq7qg2v8x4maqqj4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-ins
+            (lambda _
+              (substitute* "source/fonts/stmaryrd/stmaryrd.ins"
+                (("^%% LaTeX2e.*") "\\input docstrip\n")
+                (("fontdef\\}\\}" line)
+                 (string-append line "\n\\endbatchfile"))))))))
+    (home-page "https://ctan.org/pkg/stmaryrd")
+    (synopsis "St Mary Road symbols for theoretical computer science")
+    (description
+     "The fonts were originally distributed as METAFONT sources only, but
 Adobe Type 1 versions are also now available.  Macro support is provided for
 use under LaTeX; the package supports the @code{only} option (provided by the
 @code{somedefs} package) to restrict what is loaded, for those who don't need
 the whole font.")
-      (license license:lppl))))
+    (license license:lppl)))
 
 (define-deprecated-package texlive-fonts-stmaryrd texlive-stmaryrd)
 
-- 
cgit 1.4.1


From 6c281dfe816e0a5f2ebf457aa5e04299879e1916 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:24:46 +0200
Subject: gnu: Add texlive-xmltexconfig.

* gnu/packages/tex.scm (texlive-xmltexconfig): New variable.
---
 gnu/packages/tex.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b0656400d8..46f97dab43 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3709,6 +3709,22 @@ tables.")
 
 (define-deprecated-package texlive-latex-xcolor texlive-xcolor)
 
+(define-public texlive-xmltexconfig
+  (package
+    (name "texlive-xmltexconfig")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/xmltex/xmltexconfig/")
+             (base32
+              "0drgvmn27snq43kjkpg5k4igkcdi56p1q3fwkrv3ivsiqfp6cdz3")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xmltexconfig")
+    (synopsis "Configuration files for @code{xmltex} and @code{pdfxmltex}")
+    (description "This package provides configuration files for @code{xmltex}
+and @code{pdfxmltex}.")
+    (license license:public-domain)))
+
 (define-public texlive-xmltex
   (let ((template (simple-texlive-package
                    "texlive-xmltex"
-- 
cgit 1.4.1


From a447eb3cc8fe180f2ed3bd093afdbc1351229fa0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:27:56 +0200
Subject: gnu: texlive-xmltex: Fix build.

* gnu/packages/tex.scm (texlive-xmltex): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[arguments]: Remove unnecessary #:TEX-DIRECTORY keyword.
[native-inputs]: Add TEXLIVE-XMLTEXCONFIG.
---
 gnu/packages/tex.scm | 142 +++++++++++++++++++++++++++------------------------
 1 file changed, 76 insertions(+), 66 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 46f97dab43..c095c0c0bd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3726,72 +3726,82 @@ and @code{pdfxmltex}.")
     (license license:public-domain)))
 
 (define-public texlive-xmltex
-  (let ((template (simple-texlive-package
-                   "texlive-xmltex"
-                   (list
-                    "/doc/otherformats/xmltex/"
-                    "/tex/xmltex/")
-                   (base32
-                    "023gv9axq05vwqz50fnkig24dzahwlc4raks2s8xc4pzrv2dv1zy"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "tex/xmltex/base")
-         ((#:phases phases '%standard-phases)
-          `(modify-phases ,phases
-             (add-before 'install 'generate-formats
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (mkdir "web2c")
-                 (for-each (lambda (f)
-                             (copy-file f (basename f)))
-                           (find-files "tex" "\\.(ini|tex)$"))
-                 (invoke "fmtutil-sys" "--byfmt" "xmltex"
-                         "--fmtdir=web2c")
-                 (invoke "fmtutil-sys" "--byfmt" "pdfxmltex"
-                         "--fmtdir=web2c")))
-             (add-after 'install 'install-formats-and-wrappers
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 (let* ((out (assoc-ref outputs "out"))
-                        (texlive-bin (assoc-ref inputs "texlive-bin"))
-                        (pdftex (string-append texlive-bin "/bin/pdftex"))
-                        (web2c (string-append out "/share/texmf-dist/web2c")))
-                   (mkdir-p web2c)
-                   (copy-recursively "web2c" web2c)
-                   ;; Create convenience command wrappers.
-                   (mkdir-p (string-append out "/bin"))
-                   (symlink pdftex (string-append out "/bin/xmltex"))
-                   (symlink pdftex (string-append out "/bin/pdfxmltex"))
-                   #t)))))))
-      (propagated-inputs
-       ;; The following fonts are propagated as a texlive-updmap.cfg as the font
-       ;; maps need to be recreated for the fonts to be usable.  They are
-       ;; required by xmltex through mlnames.sty and unicode.sty.
-       `(("texlive" ,(texlive-updmap.cfg
-                      (list
-                       texlive-amsfonts
-                       texlive-babel
-                       texlive-courier
-                       texlive-helvetic
-                       texlive-hyperref
-                       texlive-symbol
-                       texlive-tipa
-                       texlive-times
-                       texlive-zapfding
-                       ;; The following fonts, while not required, are used if
-                       ;; available:
-                       texlive-stmaryrd
-                       texlive-wasy)))))
-      (native-inputs
-       (list texlive-tex-ini-files))
-      (home-page "https://www.ctan.org/pkg/xmltex/")
-      (synopsis "Support for parsing XML documents")
-      (description "The package provides an implementation of a parser for
-documents matching the XML 1.0 and XML Namespace Recommendations.  Element and
-attribute 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
+  (package
+    (name "texlive-xmltex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/otherformats/xmltex/base/"
+                   "tex/xmltex/base/")
+             (base32
+              "1rqwsapba8zs2ijjs7lpzksm20jqb8zbmanpw7wmdp2rq26ahylh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'generate-formats
+            (lambda _
+              (let ((web2c (string-append (getcwd) "/web2c")))
+                (mkdir "web2c")
+                (with-directory-excursion "tex/xmltex/base/"
+                  (invoke "fmtutil-sys"
+                          "--byfmt" "xmltex"
+                          (string-append"--fmtdir=" web2c))
+                  (invoke "fmtutil-sys"
+                          "--byfmt" "pdfxmltex"
+                          (string-append "--fmtdir=" web2c))))))
+          (add-after 'install 'install-formats-and-wrappers
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((pdftex (search-input-file inputs "/bin/pdftex"))
+                    (web2c (string-append #$output "/share/texmf-dist/web2c")))
+                (mkdir-p web2c)
+                (copy-recursively "web2c" web2c)
+                (for-each delete-file (find-files web2c "\\.log$"))
+                ;; Create convenience command wrappers.
+                (mkdir-p (string-append #$output "/bin"))
+                (symlink pdftex (string-append #$output "/bin/xmltex"))
+                (symlink pdftex (string-append #$output "/bin/pdfxmltex"))))))))
+    (native-inputs
+     (list texlive-tex-ini-files
+           texlive-xmltexconfig))
+    (propagated-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-amsfonts
+                  texlive-babel
+                  texlive-courier
+                  texlive-helvetic
+                  texlive-hyperref
+                  texlive-latex-fonts
+                  texlive-stmaryrd
+                  texlive-symbol
+                  texlive-times
+                  texlive-tipa
+                  texlive-wasy
+                  texlive-zapfding))
+           texlive-atbegshi
+           texlive-atveryend
+           texlive-babel
+           texlive-cm
+           texlive-dehyph
+           texlive-everyshi
+           texlive-firstaid
+           texlive-hyph-utf8
+           texlive-hyphen-base
+           texlive-l3backend
+           texlive-l3kernel
+           texlive-l3packages
+           texlive-tex-ini-files
+           texlive-xmltexconfig))
+    (home-page "https://ctan.org/pkg/xmltex")
+    (synopsis "Support for parsing XML documents")
+    (description
+     "The package provides an implementation of a parser for documents
+matching the XML 1.0 and XML Namespace Recommendations.  Element and attribute
+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-hyperref
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From f86a0905e61c47db2655b3189311226907dccb2b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:30:55 +0200
Subject: gnu: texlive-pict2e: Refresh package definition.

* gnu/packages/tex.scm (texlive-pict2e): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-GRAPHICS.
---
 gnu/packages/tex.scm | 50 +++++++++++++++++++-------------------------------
 1 file changed, 19 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c095c0c0bd..c090a98ecf 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4882,42 +4882,30 @@ Unicode entities, and common formatting object definitions for JadeTeX.")
     (license license:lppl1.0+)))
 
 (define-public texlive-pict2e
-  (let ((template (simple-texlive-package
-                   "texlive-pict2e"
-                   (list "doc/latex/pict2e/"
-                         "source/latex/pict2e/"
-                         "tex/latex/pict2e/")
-                   (base32
-                    "0pazv1khsgjhxc673qrhjrbzlkgmcj53qccb9hw7ygdajxrjc2ba"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t) "latex/pict2e")
-         ((#:build-targets _ '()) '(list "pict2e.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'build 'build-doc
-                (lambda _
-                  (copy-file "p2e-drivers.dtx" "build/p2e-drivers.dtx")
-                  (with-directory-excursion "build"
-                    (invoke "pdflatex" "p2e-drivers.dtx")
-                    (delete-file "p2e-drivers.dtx")
-                    ;; texlive.tlpbd expects a "pict2e.cfg" configuration file
-                    ;; instead of "pict2e-example.cfg".  Please it.
-                    (rename-file "pict2e-example.cfg" "pict2e.cfg"))))))))
-      (home-page "https://ctan.org/pkg/pict2e")
-      (native-inputs
-       (list (texlive-updmap.cfg)))
-      (synopsis "New implementation of picture commands")
-      (description
-       "This package extends the existing LaTeX @code{picture} environment,
+  (package
+    (name "texlive-pict2e")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pict2e/"
+                   "source/latex/pict2e/"
+                   "tex/latex/pict2e/")
+             (base32
+              "0pazv1khsgjhxc673qrhjrbzlkgmcj53qccb9hw7ygdajxrjc2ba")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics))
+    (home-page "https://ctan.org/pkg/pict2e")
+    (synopsis "New implementation of @code{picture} commands")
+    (description
+     "This package extends the existing LaTeX @code{picture} environment,
 using the familiar technique (the @code{graphics} and @code{color} packages)
 of driver files (at present, drivers for dvips, pdfTeX, LuaTeX, XeTeX, VTeX,
 dvipdfm, and dvipdfmx are available).  The package documentation has a fair
 number of examples of use, showing where things are improved by comparison
 with the LaTeX @code{picture} environment.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
 
 (define-public texlive-psnfss
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From 9ae3c7b455d294cd92a47dcf3039c63976f78547 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:33:56 +0200
Subject: gnu: texlive-psnfss: Refresh package definition.

* gnu/packages/tex.scm (texlive-psnfss): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 131 +++++++++------------------------------------------
 1 file changed, 22 insertions(+), 109 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c090a98ecf..e893ec55c3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4908,114 +4908,27 @@ with the LaTeX @code{picture} environment.")
     (license license:lppl1.3+)))
 
 (define-public texlive-psnfss
-  (let ((template (simple-texlive-package
-                   "texlive-psnfss"
-                   (list "/doc/latex/psnfss/"
-                         "/source/latex/psnfss/"
-                         "/fonts/map/dvips/psnfss/"
-
-                         ;; Only the .sty files are generated from the sources.
-                         "/tex/latex/psnfss/8rbch.fd"
-                         "/tex/latex/psnfss/8rpag.fd"
-                         "/tex/latex/psnfss/8rpbk.fd"
-                         "/tex/latex/psnfss/8rpcr.fd"
-                         "/tex/latex/psnfss/8rphv.fd"
-                         "/tex/latex/psnfss/8rpnc.fd"
-                         "/tex/latex/psnfss/8rppl.fd"
-                         "/tex/latex/psnfss/8rptm.fd"
-                         "/tex/latex/psnfss/8rput.fd"
-                         "/tex/latex/psnfss/8rpzc.fd"
-                         "/tex/latex/psnfss/omlbch.fd"
-                         "/tex/latex/psnfss/omlpag.fd"
-                         "/tex/latex/psnfss/omlpbk.fd"
-                         "/tex/latex/psnfss/omlpcr.fd"
-                         "/tex/latex/psnfss/omlphv.fd"
-                         "/tex/latex/psnfss/omlpnc.fd"
-                         "/tex/latex/psnfss/omlppl.fd"
-                         "/tex/latex/psnfss/omlptm.fd"
-                         "/tex/latex/psnfss/omlptmcm.fd"
-                         "/tex/latex/psnfss/omlput.fd"
-                         "/tex/latex/psnfss/omlpzc.fd"
-                         "/tex/latex/psnfss/omlzplm.fd"
-                         "/tex/latex/psnfss/omlzpple.fd"
-                         "/tex/latex/psnfss/omlztmcm.fd"
-                         "/tex/latex/psnfss/omsbch.fd"
-                         "/tex/latex/psnfss/omspag.fd"
-                         "/tex/latex/psnfss/omspbk.fd"
-                         "/tex/latex/psnfss/omspcr.fd"
-                         "/tex/latex/psnfss/omsphv.fd"
-                         "/tex/latex/psnfss/omspnc.fd"
-                         "/tex/latex/psnfss/omsppl.fd"
-                         "/tex/latex/psnfss/omsptm.fd"
-                         "/tex/latex/psnfss/omsput.fd"
-                         "/tex/latex/psnfss/omspzc.fd"
-                         "/tex/latex/psnfss/omspzccm.fd"
-                         "/tex/latex/psnfss/omszplm.fd"
-                         "/tex/latex/psnfss/omszpple.fd"
-                         "/tex/latex/psnfss/omsztmcm.fd"
-                         "/tex/latex/psnfss/omxpsycm.fd"
-                         "/tex/latex/psnfss/omxzplm.fd"
-                         "/tex/latex/psnfss/omxzpple.fd"
-                         "/tex/latex/psnfss/omxztmcm.fd"
-                         "/tex/latex/psnfss/ot1bch.fd"
-                         "/tex/latex/psnfss/ot1pag.fd"
-                         "/tex/latex/psnfss/ot1pbk.fd"
-                         "/tex/latex/psnfss/ot1pcr.fd"
-                         "/tex/latex/psnfss/ot1phv.fd"
-                         "/tex/latex/psnfss/ot1pnc.fd"
-                         "/tex/latex/psnfss/ot1ppl.fd"
-                         "/tex/latex/psnfss/ot1pplj.fd"
-                         "/tex/latex/psnfss/ot1pplx.fd"
-                         "/tex/latex/psnfss/ot1ptm.fd"
-                         "/tex/latex/psnfss/ot1ptmcm.fd"
-                         "/tex/latex/psnfss/ot1put.fd"
-                         "/tex/latex/psnfss/ot1pzc.fd"
-                         "/tex/latex/psnfss/ot1zplm.fd"
-                         "/tex/latex/psnfss/ot1zpple.fd"
-                         "/tex/latex/psnfss/ot1ztmcm.fd"
-                         "/tex/latex/psnfss/t1bch.fd"
-                         "/tex/latex/psnfss/t1pag.fd"
-                         "/tex/latex/psnfss/t1pbk.fd"
-                         "/tex/latex/psnfss/t1pcr.fd"
-                         "/tex/latex/psnfss/t1phv.fd"
-                         "/tex/latex/psnfss/t1pnc.fd"
-                         "/tex/latex/psnfss/t1ppl.fd"
-                         "/tex/latex/psnfss/t1pplj.fd"
-                         "/tex/latex/psnfss/t1pplx.fd"
-                         "/tex/latex/psnfss/t1ptm.fd"
-                         "/tex/latex/psnfss/t1put.fd"
-                         "/tex/latex/psnfss/t1pzc.fd"
-                         "/tex/latex/psnfss/ts1bch.fd"
-                         "/tex/latex/psnfss/ts1pag.fd"
-                         "/tex/latex/psnfss/ts1pbk.fd"
-                         "/tex/latex/psnfss/ts1pcr.fd"
-                         "/tex/latex/psnfss/ts1phv.fd"
-                         "/tex/latex/psnfss/ts1pnc.fd"
-                         "/tex/latex/psnfss/ts1ppl.fd"
-                         "/tex/latex/psnfss/ts1pplj.fd"
-                         "/tex/latex/psnfss/ts1pplx.fd"
-                         "/tex/latex/psnfss/ts1ptm.fd"
-                         "/tex/latex/psnfss/ts1put.fd"
-                         "/tex/latex/psnfss/ts1pzc.fd"
-                         "/tex/latex/psnfss/ufplm.fd"
-                         "/tex/latex/psnfss/ufplmbb.fd"
-                         "/tex/latex/psnfss/upsy.fd"
-                         "/tex/latex/psnfss/upzd.fd")
-                   (base32
-                    "11f14dzhwsy4pli21acccip43d36nf3pac33ihjffnps1i2mhqkd"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "latex/psnfss")))
-      (native-inputs
-       (list texlive-cm))
-      (home-page "https://www.ctan.org/pkg/psnfss")
-      (synopsis "Font support for common PostScript fonts")
-      (description
-       "The PSNFSS collection includes a set of files that provide a complete
+  (package
+    (name "texlive-psnfss")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/psnfss/"
+                   "fonts/map/dvips/psnfss/"
+                   "source/latex/psnfss/"
+                   "tex/latex/psnfss/")
+             (base32
+              "17zxqz32ky99z22yaqayg9ih8lyaswi97d34jykc0s12w4k4i97c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs
+     (list texlive-cm))
+    (propagated-inputs
+     (list texlive-graphics texlive-symbol texlive-zapfding))
+    (home-page "https://www.ctan.org/pkg/psnfss")
+    (synopsis "Font support for common PostScript fonts")
+    (description
+     "The PSNFSS collection includes a set of files that provide a complete
 working setup of the LaTeX font selection scheme (NFSS2) for use with common
 PostScript fonts.  The base set of text fonts covered by PSNFSS includes the
 AvantGarde, Bookman, Courier, Helvetica, New Century Schoolbook, Palatino,
@@ -5026,7 +4939,7 @@ Helvetica to be loaded with its size scaled to something more appropriate for
 use as a Sans-Serif font to match Times, while @code{pifont} provides the
 means to select single glyphs from symbol fonts.  The bundle as a whole is
 part of the LaTeX required set of packages.")
-      (license license:lppl1.2+))))
+    (license license:lppl1.2+)))
 
 (define-deprecated-package texlive-latex-psnfss texlive-psnfss)
 
-- 
cgit 1.4.1


From ecf5171faf8167036b04ed8fd708721382b90f86 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:34:13 +0200
Subject: gnu: texlive-babel-swedish: Refresh package definition.

* gnu/packages/tex.scm (texlive-babel-swedish): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e893ec55c3..74ac445909 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4801,25 +4801,23 @@ German.")
 (define-deprecated-package texlive-generic-babel-german texlive-babel-german)
 
 (define-public texlive-babel-swedish
-  (let ((template (simple-texlive-package
-                   "texlive-babel-swedish"
-                   (list "/source/generic/babel-swedish/")
-                   (base32
-                    "03rp4n9wkqyckman765r8v8j2pg5fg9frbfxsnhq0i2mr0yhbr6v"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/babel-swedish")
-         ((#:build-targets _ '())
-          ''("swedish.ins"))))
-      (home-page "https://www.ctan.org/pkg/babel-swedish")
-      (synopsis "Babel support for Swedish")
-      (description "This package provides the language definition file for
-support of Swedish in @code{babel}.  It provides all the necessary macros,
-definitions and settings to typeset Swedish documents.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-babel-swedish")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-swedish/"
+                   "source/generic/babel-swedish/"
+                   "tex/generic/babel-swedish/")
+             (base32
+              "0qi2rzhlxikabrk9n0096inbczgp5hwghvy5zn0mph8zmsxlfbdf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-swedish")
+    (synopsis "Babel support for typesetting Swedish")
+    (description
+     "The package provides the language definition file for Swedish.")
+    (license license:lppl1.3+)))
 
 (define-public texlive-cyrillic
   (package
-- 
cgit 1.4.1


From b52ef783c1dac49c1567b3982901b09c37a4740f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:36:38 +0200
Subject: gnu: texlive-csplain: Refresh package definition.

* gnu/packages/tex.scm (texlive-csplain): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-CM, TEXLIVE-CS, TEXLIVE-ENCTEX,
TEXLIVE-HYPH-UTF8, TEXLIVE-HYPHEN-BASE, TEXLIVET-TEX-INI-FILES.
---
 gnu/packages/tex.scm | 48 ++++++++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 74ac445909..1b5cbafad6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4699,26 +4699,38 @@ available.")
 ;;; its license.
 (define-public texlive-csplain
   (package
-    (inherit (simple-texlive-package
-              "texlive-csplain"
-              (list "tex/csplain/base/")
-              (base32 "0cgrwc8lgf2x2hq6bb4kqxw597card985zdd9ipn7k98mmwrxhz3")
-              #:trivial? #t))
+    (name "texlive-csplain")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/csplain/base/"
+                   "tex/csplain/fonts/"
+                   "tex/csplain/opmac/")
+             (base32
+              "068g31l2ralz03gsv58j67dm85vy0ad58dvdkh93ws0yzf0rnr5f")))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-cm
+           texlive-cs
+           texlive-enctex
+           texlive-hyph-utf8
+           texlive-hyphen-base
+           texlive-tex-ini-files))
     (home-page "https://petr.olsak.net/csplain-e.html")
     (synopsis "Plain TeX multilanguage support")
-    (description "CSplain is a small extension of basic Plain TeX macros from
-which the formats @code{csplain} and @code{pdfcsplain} can be generated.  It
-supports: hyphenation of words for 50+ languages, simple and powerful font
-loading system (various sizes of fonts), TeX, pdfTeX, XeTeX and LuaTeX
-engines, math fonts simply loaded with full amstex-like features, three
-internal encodings (IL2 for Czech/Slovak languages, T1 for many languages with
-latin alphabet and Unicode in new TeX engines), natural UTF-8 input in pdfTeX
-using encTeX without any active characters, Czech and Slovak special
-typesetting features.  An important part of the package is OPmac, which
-implements most of LaTeX's features (sectioning, font selection, color, hyper
-reference and URLs, bibliography, index, table of contents, tables, etc.) by
-Plain TeX macros.  The OPmac macros can generate a bibliography without any
-external program.")
+    (description
+     "CSplain is a small extension of basic Plain TeX macros from which the
+formats @code{csplain} and @code{pdfcsplain} can be generated.  It supports:
+hyphenation of words for 50+ languages, simple and powerful font loading
+system (various sizes of fonts), TeX, pdfTeX, XeTeX and LuaTeX engines, math
+fonts simply loaded with full amstex-like features, three internal
+encodings (IL2 for Czech/Slovak languages, T1 for many languages with latin
+alphabet and Unicode in new TeX engines), natural UTF-8 input in pdfTeX using
+encTeX without any active characters, Czech and Slovak special typesetting
+features.  An important part of the package is OPmac, which implements most of
+LaTeX's features (sectioning, font selection, color, hyper reference and URLs,
+bibliography, index, table of contents, tables, etc.) by Plain TeX macros.
+The OPmac macros can generate a bibliography without any external program.")
     ;; This custom permissive license includes as a redistribution condition
     ;; that says the package must be renamed from 'csplain' if it is modified.
     (license (license:non-copyleft "file:///tex/csplain/base/csplain.ini"))))
-- 
cgit 1.4.1


From c79a2f0f50ceba15ee6c5fc05584e8ee9e94e777 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:38:21 +0200
Subject: gnu: texlive-babel-french: Refresh package definition.

* gnu/packages/tex.scm (texlive-babel-french): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1b5cbafad6..1f58e25143 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4760,30 +4760,24 @@ Canadian and USA text.")
 (define-deprecated-package texlive-generic-babel-english texlive-babel-english)
 
 (define-public texlive-babel-french
-  (let ((template
-         (simple-texlive-package
-          "texlive-babel-french"
-          (list "doc/generic/babel-french/"
-                "source/generic/babel-french/"
-                "tex/generic/babel-french/")
-          (base32 "0cgn4dq5wnlfh9wddjzxsf7p56pk29lyndg56zg6558y7xf67cw8"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/babel-french")
-         ((#:build-targets _ '())
-          ;; TODO: use dtx and build documentation.
-          '(list "frenchb.ins"))))
-      (home-page "https://ctan.org/macros/latex/contrib/babel-contrib/french")
-      (synopsis "Babel contributed support for French")
-      (description
-       "The package, formerly known as frenchb, establishes French conventions
-in a document (or a subset of the conventions, if French is not the main
-language of the document).")
-      (license license:lppl1.3+))))
+  (package
+    (name "texlive-babel-french")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-french/"
+                   "source/generic/babel-french/"
+                   "tex/generic/babel-french/")
+             (base32
+              "0cgn4dq5wnlfh9wddjzxsf7p56pk29lyndg56zg6558y7xf67cw8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-french")
+    (synopsis "Babel contributed support for French")
+    (description
+     "The package establishes French conventions in a document (or a subset of
+the conventions, if French is not the main language of the document).")
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-generic-babel-french texlive-babel-french)
 
-- 
cgit 1.4.1


From 25ee881ba30d1243f3d315df11a297a7c2b0f37d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:39:43 +0200
Subject: gnu: texlive-babel: Refresh package definition.

* gnu/packages/tex.scm (texlive-babel): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 72 ++++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1f58e25143..c1bc161280 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4619,48 +4619,48 @@ distribution.")
 (define-deprecated-package texlive-latex-amscls texlive-amscls)
 
 (define-public texlive-babel
-  (let ((template (simple-texlive-package
-                   "texlive-babel"
-                   (list "/doc/latex/babel/"
-                         "/source/latex/babel/"
-                         "/makeindex/babel/")
-                   (base32
-                    "0qr5vjp79g1c1l6k173qhfdfabgbky73wymzhm56pazx4a8r08wz"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "generic/babel")
-         ((#:phases phases)
-          `(modify-phases ,phases
-             ;; This package tries to produce babel.aux twice but refuses to
-             ;; overwrite the first one.
-             (add-before 'build 'fix-ins
-               (lambda _
-                 (substitute* "source/latex/babel/babel.ins"
-                   (("askonceonly") "askforoverwritefalse"))))
-             (add-after 'install 'install-locales
-               (lambda* (#:key outputs #:allow-other-keys)
-                 (let ((locale-directory
-                        (string-append (assoc-ref outputs "out")
-                                       "/share/texmf-dist/tex/generic/babel/locale/")))
-                   (mkdir-p locale-directory)
-                   (invoke "unzip" "locale.zip" "-d"
-                           locale-directory))))))))
-      (native-inputs
-       (list unzip))
-      (home-page "https://www.ctan.org/pkg/babel")
-      (synopsis "Multilingual support for Plain TeX or LaTeX")
-      (description
-       "The package manages culturally-determined typographical (and other)
+  (package
+    (name "texlive-babel")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/babel/"
+                   "makeindex/babel/"
+                   "source/latex/babel/"
+                   "tex/generic/babel/")
+             (base32
+              "00gl0b55hg912bmrqkpzn5rfyds7hcbsfwdlsmqishq5gjp6pnr0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; This package tries to produce babel.aux twice but refuses to
+          ;; overwrite the first one.
+          (add-before 'build 'fix-ins
+            (lambda _
+              (substitute* "source/latex/babel/babel.ins"
+                (("askonceonly") "askforoverwritefalse"))))
+          (add-before 'build 'generate-locales
+            (lambda _
+              (let ((locale-directory (string-append (getcwd) "/build/locale")))
+                (mkdir-p locale-directory)
+                (with-directory-excursion "source/latex/babel/"
+                  (invoke "unzip" "locale.zip" "-d" locale-directory))))))))
+    (native-inputs
+     (list unzip))
+    (home-page "https://www.ctan.org/pkg/babel")
+    (synopsis "Multilingual support for Plain TeX or LaTeX")
+    (description
+     "The package manages culturally-determined typographical (and other)
 rules, and hyphenation patterns for a wide range of languages.  A document may
 select a single language to be supported, or it may select several, in which
 case the document may switch from one language to another in a variety of
 ways.  Babel uses contributed configuration files that provide the detail of
 what has to be done for each language.  Users of XeTeX are advised to use the
 polyglossia package rather than Babel.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-latex-babel texlive-babel)
 
-- 
cgit 1.4.1


From 433bfdab56bbf18b57340aeaae54a63940d8fc43 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:40:37 +0200
Subject: gnu: texlive-mathdots: Refresh package definition.

* gnu/packages/tex.scm (texlive-mathdots): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c1bc161280..337b144723 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4566,31 +4566,27 @@ definitions.")
 (define-deprecated-package texlive-latex-amsmath texlive-amsmath)
 
 (define-public texlive-mathdots
-  (let ((template
-         (simple-texlive-package
-          "texlive-mathdots"
-          (list "doc/generic/mathdots/"
-                "source/generic/mathdots/"
-                "tex/generic/mathdots/")
-          (base32"1jaffj343p1chdxs2g7s6lpckvihk0jfw22nw0vmijyjxfiy9yg0"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/mathdots")
-         ((#:build-targets _ '())
-          '(list "mathdots.ins"))))
-      (home-page "https://ctan.org/macros/generic/mathdots")
-      (synopsis "Commands to produce dots in math that respect font size")
-      (description
-       "Mathdots redefines @code{\\ddots} and @code{\\vdots}, and defines
+  (package
+    (name "texlive-mathdots")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/mathdots/"
+                   "source/generic/mathdots/"
+                   "tex/generic/mathdots/")
+             (base32
+              "1jaffj343p1chdxs2g7s6lpckvihk0jfw22nw0vmijyjxfiy9yg0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mathdots")
+    (synopsis "Commands to produce dots in math that respect font size")
+    (description
+     "Mathdots redefines @code{\\ddots} and @code{\\vdots}, and defines
 @code{\\iddots}.  The dots produced by @code{\\iddots} slant in the opposite
 direction to @code{\\ddots}.  All the commands are designed to change size
 appropriately in scripts, as well as in response to LaTeX size changing
 commands.  The commands may also be used in plain TeX.")
-      (license license:lppl))))
+    (license license:lppl)))
 
 (define-public texlive-amscls
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From 3fdd7b538c569dee59c62a05ff9131d4e274cc62 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:43:13 +0200
Subject: gnu: texlive-bigfoot: Refresh package definition.

* gnu/packages/tex.scm (texlive-bigfoot): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 45 +++++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 337b144723..53f2b27d78 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5136,31 +5136,24 @@ either in conjunction with BibTeX or as a replacement for BibTeX.")
 (define-deprecated-package texlive-latex-amsrefs texlive-amsrefs)
 
 (define-public texlive-bigfoot
-  (let ((template (simple-texlive-package
-                   "texlive-bigfoot"
-                   (list "doc/latex/bigfoot/"
-                         "source/latex/bigfoot/"
-                         "tex/latex/bigfoot/")
-                   (base32
-                    "140b4bbjcgajd1flznmi3ga6lx5pna2nxybr2dqm9515lny8gwf0"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t) "latex/bigfoot")
-         ((#:build-targets _ '()) '(list "bigfoot.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'chdir 'delete-drv-files
-                (lambda _
-                  (for-each delete-file (find-files "." "\\.drv$"))))))))
-      (propagated-inputs
-       (list texlive-etex texlive-ncctools))
-      (home-page "https://ctan.org/pkg/bigfoot")
-      (synopsis "Footnotes for critical editions")
-      (description
-       "The package aims to provide a one-stop solution to requirements for
+  (package
+    (name "texlive-bigfoot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bigfoot/"
+                   "source/latex/bigfoot/"
+                   "tex/latex/bigfoot/")
+             (base32
+              "140b4bbjcgajd1flznmi3ga6lx5pna2nxybr2dqm9515lny8gwf0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etex texlive-ncctools))
+    (home-page "https://ctan.org/pkg/bigfoot")
+    (synopsis "Footnotes for critical editions")
+    (description
+     "The package aims to provide a one-stop solution to requirements for
 footnotes.  It offers multiple footnote apparatus superior to that of
 @code{manyfoot}.  Footnotes can be formatted in separate paragraphs, or be run
 into a single paragraph.  Note that the majority of the @code{bigfoot}
@@ -5169,7 +5162,7 @@ information from that package's documentation.
 
 The @code{bigfoot} bundle also provides the @code{perpage} and @code{suffix}
 packages.")
-      (license license:gpl2+))))
+    (license license:gpl2+)))
 
 (define-deprecated-package texlive-latex-bigfoot texlive-bigfoot)
 
-- 
cgit 1.4.1


From 40f910d2fa29749715ec95aeb5f63eba4f02c628 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:45:10 +0200
Subject: gnu: texlive-filemod: Refresh package definition.

* gnu/packages/tex.scm (texlive-filemod): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 53f2b27d78..3c994c9e72 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5402,14 +5402,18 @@ remain in sequence).")
 
 (define-public texlive-filemod
   (package
-    (inherit (simple-texlive-package
-              "texlive-filemod"
-              (list "/doc/latex/filemod/"
-                    "/tex/latex/filemod/"
-                    "/tex/generic/filemod/")
-              (base32
-               "1snsj7kblkj1ig3x3845lsypz7ab04lf0dcpdh946xakgjnz4fb5")
-              #:trivial? #t))
+    (name "texlive-filemod")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/filemod/" "tex/generic/filemod/"
+                   "tex/latex/filemod/")
+             (base32
+              "1snsj7kblkj1ig3x3845lsypz7ab04lf0dcpdh946xakgjnz4fb5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-pdftexcmds))
     (home-page "https://www.ctan.org/pkg/filemod")
     (synopsis "Provide file modification times, and compare them")
     (description
-- 
cgit 1.4.1


From 8ef25d0a632d35d7b5fa1e944eae4374faa318fe Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:46:25 +0200
Subject: gnu: texlive-firstaid: Refresh package definition.

* gnu/packages/tex.scm (texlive-firstaid): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3c994c9e72..9a1a9edb8d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5478,29 +5478,27 @@ corresponding italics: light, regular, medium, bold, ...")
                    license:silofl1.1))))
 
 (define-public texlive-firstaid
-  (let ((template (simple-texlive-package
-                   "texlive-firstaid"
-                   (list "/doc/latex/firstaid/"
-                         "/source/latex/firstaid/"
-                         "/tex/latex/firstaid/")
-                   (base32
-                    "1ahn47kz8a2qdmzdfdgjanf6h5bn8f2rzp1zvwgjpk1plcix8k90"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t) "tex/latex/firstaid")
-         ((#:build-targets _ '()) '(list "firstaid.ins"))))
-      (home-page "https://ctan.org/macros/latex/required/firstaid")
-      (synopsis
-       "First aid for external LaTeX files and packages that need updating")
-      (description
-       "This package contains some first aid for LaTeX packages or classes
-that require updates because of internal changes to the LaTeX kernel that are
-not yet reflected in the package's or class's code.  The file
+  (package
+    (name "texlive-firstaid")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/firstaid/" "source/latex/firstaid/"
+                   "tex/latex/firstaid/")
+             (base32
+              "1ahn47kz8a2qdmzdfdgjanf6h5bn8f2rzp1zvwgjpk1plcix8k90")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/firstaid")
+    (synopsis
+     "First aid for external LaTeX files and packages that need updating")
+    (description
+     "This package contains some first aid for LaTeX packages or classes that
+require updates because of internal changes to the LaTeX kernel that are not
+yet reflected in the package's or class's code.  The file
 @file{latex2e-first-aid-for-external-files.ltx} provided by this package is
 meant to be loaded during format generation and not by the user.")
-      (license license:lppl1.3c))))
+    (license license:lppl1.3c)))
 
 (define-public texlive-ifplatform
   (package
-- 
cgit 1.4.1


From 21dbe0812d5522bc5be85416ab634391d9266af7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:47:31 +0200
Subject: gnu: texlive-pdftexcmds: Refresh package definition.

* gnu/packages/tex.scm (texlive-pdftexcmds): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9a1a9edb8d..ef8335f7f5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5633,30 +5633,26 @@ used to write the verbatim text to a file.")
     (license license:lppl1.3+)))
 
 (define-public texlive-pdftexcmds
-  (let ((template (simple-texlive-package
-                   "texlive-pdftexcmds"
-                   (list "doc/generic/pdftexcmds/"
-                         "source/generic/pdftexcmds/"
-                         "tex/generic/pdftexcmds/")
-                   (base32
-                    "0gad1vi0r5xw7gyj1cb2cp58j4dqrw4awcfxmfrna9xbz91g4sn9"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/pdftexcmds")
-         ((#:build-targets _ '())
-          #~(list "pdftexcmds.dtx"))))
-      (propagated-inputs
-       (list texlive-iftex texlive-infwarerr texlive-ltxcmds))
-      (home-page "https://www.ctan.org/pkg/pdftexcmds")
-      (synopsis "LuaTeX support for pdfTeX utility functions")
-      (description
-       "This package makes a number of utility functions from pdfTeX
+  (package
+    (name "texlive-pdftexcmds")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pdftexcmds/"
+                   "source/generic/pdftexcmds/"
+                   "tex/generic/pdftexcmds/")
+             (base32
+              "0gad1vi0r5xw7gyj1cb2cp58j4dqrw4awcfxmfrna9xbz91g4sn9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-iftex texlive-infwarerr texlive-ltxcmds))
+    (home-page "https://www.ctan.org/pkg/pdftexcmds")
+    (synopsis "LuaTeX support for pdfTeX utility functions")
+    (description
+     "This package makes a number of utility functions from pdfTeX
 available for LuaTeX by reimplementing them using Lua.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-latex-pdftexcmds texlive-pdftexcmds)
 
-- 
cgit 1.4.1


From c5b02655200954326641825602cdffb7879f885c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:49:12 +0200
Subject: gnu: texlive-refcount: Refresh package definition.

* gnu/packages/tex.scm (texlive-refcount): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-INFWARERR, TEXLIVE-LTXCMDS.
---
 gnu/packages/tex.scm | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ef8335f7f5..97613e6595 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5718,31 +5718,28 @@ re-processing.")
 (define-deprecated-package texlive-latex-pstool texlive-pstool)
 
 (define-public texlive-refcount
-  (let ((template (simple-texlive-package
-                   "texlive-refcount"
-                   (list "doc/latex/refcount/"
-                         "source/latex/refcount/"
-                         "tex/latex/refcount/")
-                   (base32
-                    "128cvwdl4wcdshvs59yn5iljdxxdrc5jircbxav77y7kc3l33z7z"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/refcount")
-         ((#:build-targets _ '())
-          #~(list "refcount.dtx"))))
-      (home-page "https://www.ctan.org/pkg/refcount")
-      (synopsis "Counter operations with label references")
-      (description
-       "This package provides the @code{\\setcounterref} and
+  (package
+    (name "texlive-refcount")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/refcount/" "source/latex/refcount/"
+                   "tex/latex/refcount/")
+             (base32
+              "128cvwdl4wcdshvs59yn5iljdxxdrc5jircbxav77y7kc3l33z7z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-infwarerr texlive-ltxcmds))
+    (home-page "https://www.ctan.org/pkg/refcount")
+    (synopsis "Counter operations with label references")
+    (description
+     "This package provides the @code{\\setcounterref} and
 @code{\\addtocounterref} commands which use the section (or other) number
 from the reference as the value to put into the counter.  It also provides
 @code{\\setcounterpageref} and @code{\\addtocounterpageref} that do the
 corresponding thing with the page reference of the label.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-latex-refcount texlive-refcount)
 
-- 
cgit 1.4.1


From e2d105a1f6866aeb511a708b454f52db1e3c9305 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:51:05 +0200
Subject: gnu: texlive-capt-of: Refresh package definition.

* gnu/packages/tex.scm (texlive-capt-of): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 97613e6595..a749af7118 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5970,28 +5970,23 @@ including files to the root of the tree).  The package supersedes FiNK.")
     (license license:public-domain)))
 
 (define-public texlive-capt-of
-  (let ((template
-         (simple-texlive-package
-          "texlive-capt-of"
-          (list "doc/latex/capt-of/"
-                "source/latex/capt-of/"
-                "tex/latex/capt-of/")
-          (base32 "0bf0cdd9ca3kkqxqqkq6jalh5ybs60l80l5gfkl2whk2v4bnzfvz"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/capt-of")
-         ((#:build-targets _ '())
-          '(list "capt-of.ins"))))
-      (home-page "https://www.ctan.org/pkg/capt-of")
-      (synopsis "Captions on more than floats")
-      (description
-       "This package defines a command @code{\\captionof} for putting a caption
+  (package
+    (name "texlive-capt-of")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/capt-of/" "source/latex/capt-of/"
+                   "tex/latex/capt-of/")
+             (base32
+              "0bf0cdd9ca3kkqxqqkq6jalh5ybs60l80l5gfkl2whk2v4bnzfvz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://www.ctan.org/pkg/capt-of")
+    (synopsis "Captions on more than floats")
+    (description
+     "This package defines a command @code{\\captionof} for putting a caption
 to something that's not a float.")
-      (license license:lppl))))
+    (license license:lppl)))
 
 (define-deprecated-package texlive-latex-capt-of texlive-capt-of)
 
-- 
cgit 1.4.1


From a933d6f056928260de914c01eff3a706b072256f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:52:00 +0200
Subject: gnu: texlive-makecmds: Refresh package definition.

* gnu/packages/tex.scm (texlive-makecmds): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a749af7118..97797b258b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6293,19 +6293,20 @@ diagrams.")
 
 (define-public texlive-makecmds
   (package
-    (inherit (simple-texlive-package
-              "texlive-makecmds"
-              (list "doc/latex/makecmds/README"
-                    "source/latex/makecmds/makecmds.dtx"
-                    "source/latex/makecmds/makecmds.ins")
-              (base32 "0znx80x6ic7a25v9dw8yjibq7lx65wangcyii18kk5x5z4jljba9")))
+    (name "texlive-makecmds")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/makecmds/" "source/latex/makecmds/"
+                   "tex/latex/makecmds/")
+             (base32
+              "05y5n265in7mrbpgjxqg339l8r8dmp6lvl4k528pr3rkb8z94qaf")))
     (outputs '("out" "doc"))
-    (arguments
-     (list
-      #:tex-directory "latex/makecmds"))
-    (native-inputs (list (texlive-updmap.cfg
-                          (list texlive-amsfonts
-                                texlive-cm))))
+    (build-system texlive-build-system)
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-amsfonts
+                  texlive-cm))))
     (home-page "https://www.ctan.org/pkg/makecmds")
     (synopsis "TeX macro to define or redefine a command")
     (description "The package provides a @code{\\makecommand} command, which
-- 
cgit 1.4.1


From bc99cd0f7fd2608ece6c7c70b81726a42d47c9d9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 22:52:48 +0200
Subject: gnu: texlive-metalogo: Refresh package definition.

* gnu/packages/tex.scm (texlive-metalogo): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 64 ++++++++++++++--------------------------------------
 1 file changed, 17 insertions(+), 47 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 97797b258b..21f54d020a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6342,56 +6342,26 @@ output routine.")
 
 (define-public texlive-metalogo
   (package
-    (inherit (simple-texlive-package
-              "texlive-metalogo"
-              (list "doc/latex/metalogo/README"
-                    ;; These PDFs are apparently used as graphic files, not
-                    ;; built.
-                    "doc/latex/metalogo/TeXoutline.pdf"
-                    "doc/latex/metalogo/eLaToutline.pdf"
-                    "source/latex/metalogo/metalogo.dtx"
-                    "source/latex/metalogo/metalogo.ins")
-              (base32 "0v1jwp8xhzwn0a4apiyya17s4r1kpn6q9nmv38jj1wwdvgia0jpi")))
+    (name "texlive-metalogo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/metalogo/" "source/latex/metalogo/"
+                   "tex/latex/metalogo/")
+             (base32
+              "1xzy982kc7k5n7gy019rk4hbvxli2mlf4s7h7s11diasmh5fa2gf")))
     (outputs '("out" "doc"))
-    (arguments
-     (list
-      #:tex-directory "latex/metalogo"
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-metalogo.dtx
-            (lambda _
-              (substitute* "source/latex/metalogo/metalogo.dtx"
-                ;; Prevent embedding a build time date, for reproducibility.
-                (("^% \\\\date.*") "")
-                ;; These fonts are not free.
-                (("^\\\\setmainfont.*") "")
-                (("^\\\\DeclareSymbolFont\\{SabonMaths}.*") "")
-                (("^\\\\AtBeginDocument\\{.*") "")
-                ((".*\\\\expandafter.*\\\\symSabonMaths.*") "")
-                (("^\\\\setsansfont.*MgOpen Cosmetica.*") "")
-                (("^\\\\setmonofont.*Consolas.*") "")
-                ;; The 'stix' texlive font package has been obsoleted by
-                ;; stix2.
-                (("^\\\\newfontfamily\\\\stixgeneral\\{STIXGeneral}")
-                 "\\newfontfamily\\stixgeneral{STIX Two Text}")))))))
-    (native-inputs (list fontconfig    ;for XDG_DATA_DIRS, to locate OTF fonts
-                         texlive-booktabs
-                         texlive-cm
-                         texlive-eukdate
-                         texlive-fontspec
-                         texlive-iftex
-                         texlive-latex-base
-                         texlive-graphics
-                         texlive-multirow
-                         texlive-lm     ;for lmroman10-regular
-                         texlive-stix2-otf))
-    (propagated-inputs (list texlive-fontspec texlive-iftex
-                             texlive-graphics))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-fontspec
+           texlive-graphics
+           texlive-iftex))
     (home-page "https://ctan.org/pkg/metalogo")
     (synopsis "Extended TeX logo macros")
-    (description "This package exposes spacing parameters for various TeX
-logos to the end user, to optimise the logos for different fonts.  It is
-written especially for XeLaTeX users.")
+    (description
+     "This package exposes spacing parameters for various TeX logos to the end
+user, to optimise the logos for different fonts.  It is written especially for
+XeLaTeX users.")
     (license license:lppl1.3c+)))
 
 (define-public texlive-paralist
-- 
cgit 1.4.1


From b0dbca9c4d5dcc3ebd1f0d259055053ab675db73 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:10:51 +0200
Subject: gnu: texlive-bidi: Fix build.

* gnu/packages/tex.scm (texlive-bidi)[source]: Add missing location.
---
 gnu/packages/tex.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 21f54d020a..23534b3a92 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -630,19 +630,21 @@ This package contains the binaries.")
                     (url (string-append "svn://www.tug.org/texlive/tags/"
                                         "texlive-2022.0/Master/texmf-dist"))
                     (locations (list "doc/xelatex/bidi/"
-                                     "source/xelatex/bidi/"))
+                                     "source/xelatex/bidi/"
+                                     "tex/xelatex/bidi/"))
                     (revision 62885)))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "09nfvsjfnms3pclyd2rcivyb5qvzw48b934i3bcl83hv69ix2ks7"))))
+                "1s2p6zp64q6nh8r8hrdx7bbpzj90sq51jbwslh6zj281yx9mv61s"))))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs (list texlive-iftex
-                             texlive-ltxcmds
-                             texlive-hyperref
-                             texlive-xkeyval
-                             texlive-zref))
+    (propagated-inputs
+     (list texlive-iftex
+           texlive-ltxcmds
+           texlive-hyperref
+           texlive-xkeyval
+           texlive-zref))
     (home-page "https://ctan.org/pkg/bidi")
     (synopsis "Bidirectional typesetting in plain TeX and LaTeX using XeTeX")
     (description "The @code{bidi} package provides a convenient interface for
-- 
cgit 1.4.1


From 773bbd5af1fb14d5def6418809f6617bbb60154b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:15:06 +0200
Subject: gnu: texlive-fontspec: Refresh package definition.

* gnu/packages/tex.scm (texlive-fontspec): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-EUENC, TEXLIVE-IFTEX, TEXLIVE-L3KERNEL, TEXLIVE-XUNICODE.
---
 gnu/packages/tex.scm | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 23534b3a92..af24823fe8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4222,29 +4222,32 @@ a means of defining generic functions using a key-value syntax, and
 (define-deprecated-package texlive-latex-l3packages texlive-l3packages)
 
 (define-public texlive-fontspec
-  (let ((template (simple-texlive-package
-                   "texlive-fontspec"
-                   (list "/doc/latex/fontspec/"
-                         "/source/latex/fontspec/"
-                         "/tex/latex/fontspec/fontspec.cfg")
-                   (base32
-                    "06rms8dw1j67v3rgv6xmfykdmgbxi5rp78yxc782cy1sw07blgsg"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "latex/fontspec")))
-      (propagated-inputs
-       (list texlive-cm texlive-l3packages texlive-lm))
-      (home-page "https://www.ctan.org/pkg/fontspec")
-      (synopsis "Advanced font selection in XeLaTeX and LuaLaTeX")
-      (description
-       "Fontspec is a package for XeLaTeX and LuaLaTeX.  It provides an
+  (package
+    (name "texlive-fontspec")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fontspec/"
+                   "source/latex/fontspec/"
+                   "tex/latex/fontspec/")
+             (base32
+              "1k999jgdd4a9d20rywl53vzpvl3synqxik1fiskxwzlzibjlibv1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-euenc
+           texlive-iftex
+           texlive-l3kernel
+           texlive-l3packages
+           texlive-lm
+           texlive-xunicode))
+    (home-page "https://ctan.org/pkg/fontspec")
+    (synopsis "Advanced font selection in XeLaTeX and LuaLaTeX")
+    (description
+     "Fontspec is a package for XeLaTeX and LuaLaTeX.  It provides an
 automatic and unified interface to feature-rich AAT and OpenType fonts through
-the NFSS in LaTeX running on XeTeX or LuaTeX engines.  The package requires
-the l3kernel and xparse bundles from the LaTeX 3 development team.")
-      (license license:lppl1.3+))))
+the NFSS in LaTeX running on XeTeX or LuaTeX engines.")
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-latex-fontspec texlive-fontspec)
 
-- 
cgit 1.4.1


From 107c61b1d4af65046fb8a3576bb89b82e17c2fbb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:19:46 +0200
Subject: gnu: texlive-fancyhdr: Refresh package definition.

* gnu/packages/tex.scm (texlive-fancyhdr): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index af24823fe8..0e38704799 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6790,29 +6790,24 @@ floats, center, flushleft, and flushright, lists, and pages.")
 (define-deprecated-package texlive-latex-fancybox texlive-fancybox)
 
 (define-public texlive-fancyhdr
-  (let ((template (simple-texlive-package
-                   "texlive-fancyhdr"
-                   (list "doc/latex/fancyhdr/"
-                         "source/latex/fancyhdr/"
-                         "tex/latex/fancyhdr/")
-                   (base32
-                    "15fainwxs22gg4xhwsv1vmjgdhg34dbkir26nnk4pb6jprpwb83f"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/fancyhdr")
-         ((#:build-targets _ '())
-          #~(list "fancyhdr.ins"))))
-      (home-page "https://www.ctan.org/pkg/fancyhdr")
-      (synopsis "Extensive control of page headers and footers in LaTeX2e")
-      (description
-       "This package provides extensive facilities, both for constructing
-headers and footers, and for controlling their use (for example, at times when
-LaTeX would automatically change the heading style in use).")
-      (license license:lppl))))
+  (package
+    (name "texlive-fancyhdr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fancyhdr/" "source/latex/fancyhdr/"
+                   "tex/latex/fancyhdr/")
+             (base32
+              "15fainwxs22gg4xhwsv1vmjgdhg34dbkir26nnk4pb6jprpwb83f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fancyhdr")
+    (synopsis "Extensive control of page headers and footers in LaTeX2e")
+    (description
+     "The package provides extensive facilities, both for constructing headers
+and footers, and for controlling their use (for example, at times when LaTeX
+would automatically change the heading style in use).")
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-latex-fancyhdr texlive-fancyhdr)
 
-- 
cgit 1.4.1


From b91b5f41afd6f91804fec2343703ca285eb570e1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:21:39 +0200
Subject: gnu: texlive-polyglossia: Refresh package definition.

* gnu/packages/tex.scm (texlive-polyglossia): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[arguments]<#:phases>: Do not use Amiri font.  Do not generate TeX format
files.
[native-inputs]: Remove TEXLIVE-BIN, TEXLIVE-ETOOLBOX, TEXLIVE-FONTSPEC,
TEXLIVE-KPATHSEA, TEXLIVE-LATEX-BASE, TEXLIVE-MAKECMDS, TEXLIVE-TEX-INI-FILES
and TEXLIVE-TOOLS.
[propagated-inputs]: Remove TEXLIVE-HYPERREF, TEXLIVE-L3PACKAGES,
TEXLIVE-LUABIDI, TEXLIVE-TOOLS.
---
 gnu/packages/tex.scm | 134 ++++++++++++++++++++-------------------------------
 1 file changed, 51 insertions(+), 83 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0e38704799..bd1981d45e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6392,93 +6392,62 @@ or symbol.  It also provides compacted versions of @code{enumerate} and
 
 (define-public texlive-polyglossia
   (package
-    (inherit (simple-texlive-package
-              "texlive-polyglossia"
-              (list "source/latex/polyglossia/"
-                    ;; These files are not part of polyglossia.dtx
-                    "tex/latex/polyglossia/arabicnumbers.sty"
-                    "tex/latex/polyglossia/xpg-cyrillicnumbers.sty")
-              (base32 "1p0hhclypv2zbs8h64c6sd689m9ym3vvpn966qpwpjxbymsrc49g")))
+    (name "texlive-polyglossia")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/polyglossia/"
+                   "fonts/misc/xetex/fontmapping/polyglossia/"
+                   "source/latex/polyglossia/"
+                   "tex/latex/polyglossia/")
+             (base32
+              "1lkf06mr7p7p1fdkrnhmvj8iamzppjy952d79mc81cilkw5zskah")))
     (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (arguments
      (list
-      #:tex-directory "latex/polyglossia"
       #:tex-format "xelatex"
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'build-and-install-xelatex.fmt
-            (lambda* (#:key tex-format #:allow-other-keys)
-              (invoke "fmtutil-sys" "--byfmt" tex-format "--fmtdir=web2c")
-              ;; Extend the current TEXMF environment variable to make
-              ;; available the newly built formats.
-              (setenv "GUIX_TEXMF" (string-append (getcwd) ":"
-                                                  (getenv "GUIX_TEXMF")))
-              ;; XXX: Extend the base (more limited) xelatex.fmt provided by
-              ;; texlive-latex-base, otherwise packages using Polyglossia
-              ;; would encounter the same lack of hyphenation support problem.
-              (install-file "web2c/xetex/xelatex.fmt"
-                            (string-append #$output
-                                           "/share/texmf-dist/web2c/xetex"))))
-          (add-before 'build 'chdir
+          (add-after 'unpack 'substitute-fonts
             (lambda _
-              ;; This is so the build can find the files not part of the .dtx.
-              (setenv "TEXINPUTS" (string-append (getcwd)
-                                                 "/tex/latex/polyglossia:"))))
-          (add-after 'chdir 'substitute-nonfree-fonts
+              (substitute* "source/latex/polyglossia/polyglossia.dtx"
+                (("\\{Serto Jerusalem}") "{FreeSans}") ;non-free
+                ;; XXX: Amiri font would introduce a (native) dependency on
+                ;; webkitgtk!  No, thanks.
+                (("\\{Amiri}") "{FreeSans}"))))
+          (add-after 'unpack 'extend-texmf
             (lambda _
-              (substitute* "polyglossia.dtx"
-                (("\\{Serto Jerusalem}")
-                 "{FreeSans}"))))
-          (add-after 'substitute-nonfree-fonts 'extract-dtx
-            (lambda* (#:key tex-format #:allow-other-keys)
-              (invoke tex-format "polyglossia.dtx"))))))
-    (native-inputs (list fontconfig     ;for XDG_DATA_DIRS (to locate fonts)
-                         font-amiri
-                         font-dejavu
-                         font-gfs-ambrosia
-                         font-gnu-freefont
-                         font-linuxlibertine
-                         font-sil-ezra
-                         texlive-latex-base
-                         texlive-babel
-                         texlive-bin    ;for fmtutil.cnf
-                         texlive-bidi
-                         texlive-booktabs
-                         texlive-caption
-                         texlive-context
-                         texlive-fancyvrb
-                         texlive-etoolbox
-                         texlive-latex-fonts
-                         texlive-fontspec
-                         texlive-hyperref
-                         ;; TODO: Remove texlive-stringenc and
-                         ;; texlive-zapfding after texlive-hyperref propagates
-                         ;; them.
-                         texlive-stringenc
-                         texlive-zapfding
-                         texlive-graphics
-                         texlive-kpathsea ;for cp227.tcx & friends
-                         texlive-makecmds
-                         texlive-metalogo
-                         texlive-microtype
-                         texlive-paralist
-                         texlive-tools
-                         texlive-tex-ini-files)) ;for pdftexconfig
-    ;; polyglossia.sty \RequirePackage or \\usepackage these other TexLive
-    ;; packages.
-    (propagated-inputs
-     (list texlive-bidi
-           texlive-etoolbox
-           texlive-fontspec
+              ;; Extend the current TEXMF environment variable to make
+              ;; Polyglossia own libraries visible.
+              (setenv "GUIX_TEXMF"
+                      (string-append (getcwd) ":"
+                                     (getenv "GUIX_TEXMF"))))))))
+    (native-inputs
+     (list font-dejavu
+           font-gfs-ambrosia
+           font-gnu-freefont
+           font-linuxlibertine
+           font-sil-ezra
+           fontconfig                   ;for XDG_DATA_DIRS (to locate fonts)
+           texlive-babel
+           texlive-bidi
+           texlive-booktabs
+           texlive-caption
+           texlive-context
+           texlive-fancyvrb
+           texlive-graphics
            texlive-hyperref
-           ;; TODO: Remove texlive-stringenc and
-           ;; texlive-zapfding after texlive-hyperref propagates
-           ;; them.
-           texlive-stringenc
-           texlive-zapfding
+           texlive-latex-fonts
+           texlive-metalogo
+           texlive-microtype
+           texlive-paralist))
+    (propagated-inputs
+     (list texlive-etoolbox
+           texlive-filehook
+           texlive-fontspec
+           texlive-iftex
            texlive-makecmds
-           texlive-l3packages           ;expl3, l3keys2e, xparse
-           texlive-tools
            texlive-xkeyval))
     (home-page "https://www.ctan.org/pkg/polyglossia")
     (synopsis "Alternative to Babel for XeLaTeX and LuaLaTeX")
@@ -6491,25 +6460,24 @@ different writing system.  It enables:
 Loading the appropriate hyphenation patterns.
 @item
 Setting the script and language tags of the current font (if possible and
-available), using the package fontspec.
+available), using the package @code{fontspec}.
 @item
 Switching to a font assigned by the user to a particular script or language.
 @item
 Adjusting some typographical conventions in function of the current language
-(such as afterindent, frenchindent, spaces before or after punctuation marks,
-etc.)
+(such as @code{afterindent}, @code{frenchindent}, spaces before or after
+punctuation marks, etc.)
 @item
 Redefining the document strings (like @samp{chapter}, @samp{figure},
 @samp{bibliography}).  Adapting the formatting of dates (for non-gregorian
-calendars via external packages bundled with polyglossia: currently the
+calendars via external packages bundled with @code{polyglossia}: currently the
 Hebrew, Islamic and Farsi calendars are supported).
 @item
 For languages that have their own numeration system, modifying the formatting
 of numbers appropriately.
 @item
 Ensuring the proper directionality if the document contains languages
-written from right to left (via the packages bidi and luabidi, available
-separately).
+written from right to left.
 @end itemize")
     (license license:expat)))
 
-- 
cgit 1.4.1


From 4c3237429436870cc7df57eadfe674f0a7bba6a3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:24:22 +0200
Subject: gnu: texlive-letltxmacro: Refresh package definition.

* gnu/packages/tex.scm (texlive-letltxmacro): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-ETOOLBOX.
---
 gnu/packages/tex.scm | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bd1981d45e..aebe698a5c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6831,30 +6831,28 @@ footnotes with symbols rather than numbers.")
 (define-deprecated-package texlive-latex-footmisc texlive-footmisc)
 
 (define-public texlive-letltxmacro
-  (let ((template (simple-texlive-package
-                   "texlive-letltxmacro"
-                   (list "doc/latex/letltxmacro/"
-                         "source/latex/letltxmacro/"
-                         "tex/latex/letltxmacro/")
-                   (base32
-                    "16bmwsng9p80jf78sdmib24apwnw3raw306cs1ms50z5s9dsfdby"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/letltxmacro")
-         ((#:build-targets _ '())
-          #~(list "letltxmacro.dtx"))))
-      (home-page "https://www.ctan.org/pkg/letltxmacro")
-      (synopsis "Let assignment for macros")
-      (description
-       "TeX’s @code{\\let} assignment does not work for LaTeX macros with
-optional arguments, or for macros that are defined as robust macros by
-@code{\\DeclareRobustCommand}.  This package defines @code{\\LetLtxMacro}
-that also takes care of the involved internal macros.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-letltxmacro")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/letltxmacro/"
+                   "source/latex/letltxmacro/"
+                   "tex/latex/letltxmacro/")
+             (base32
+              "16bmwsng9p80jf78sdmib24apwnw3raw306cs1ms50z5s9dsfdby")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etoolbox))
+    (home-page "https://ctan.org/pkg/letltxmacro")
+    (synopsis "Let assignment for LaTeX macros")
+    (description
+     "TeX's @code{\\let} assignment does not work for LaTeX macros with
+optional arguments or for macros that are defined as robust macros by
+@code{\\DeclareRobustCommand}.  This package defines @code{\\LetLtxMacro} that
+also takes care of the involved internal macros.")
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-latex-letltxmacro texlive-letltxmacro)
 
-- 
cgit 1.4.1


From c0011a5d0b1d1160ebd4f02f5a545c498ab70e8c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:27:01 +0200
Subject: gnu: texlive-listings: Refresh package definition.

* gnu/packages/tex.scm (texlive-listings): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-FANCYVRB, TEXLIVE-HYPERREF, TEXLIVE-URL.
---
 gnu/packages/tex.scm | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index aebe698a5c..34fc53337b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6973,30 +6973,30 @@ TeX-paragraphs.  All the paragraphs are taken with permission from
     (license license:lppl1.3+)))
 
 (define-public texlive-listings
-  (let ((template
-         (simple-texlive-package
-          "texlive-listings"
-          (list "doc/latex/listings/"
-                "source/latex/listings/"
-                "tex/latex/listings/")
-          (base32 "15dnm0j86305x84ss3ymhhcczcw45b2liq01vrab6fj204wzsahk"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/listings")
-         ((#:build-targets _ '())
-          #~(list "listings.ins"))))
-      (home-page "https://www.ctan.org/pkg/listings")
-      (synopsis "Typeset source code listings using LaTeX")
-      (description
-       "The package enables the user to typeset programs (programming code)
+  (package
+    (name "texlive-listings")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/listings/" "source/latex/listings/"
+                   "tex/latex/listings/")
+             (base32
+              "15dnm0j86305x84ss3ymhhcczcw45b2liq01vrab6fj204wzsahk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     ;; Do not build intermediate "lstdrvrs.ins".
+     (list #:build-targets '(list "listings.ins")))
+    (propagated-inputs
+     (list texlive-fancyvrb texlive-hyperref texlive-url))
+    (home-page "https://ctan.org/pkg/listings")
+    (synopsis "Typeset source code listings using LaTeX")
+    (description
+     "The package enables the user to typeset programs (programming code)
 within LaTeX; the source code is read directly by TeX---no front-end processor
 is needed.  Keywords, comments and strings can be typeset using different
 styles.  Support for @code{hyperref} is provided.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
 
 (define-public texlive-listingsutf8
   (package
-- 
cgit 1.4.1


From a11405bffe188f6eef3919845cbaca0eae455191 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:28:54 +0200
Subject: gnu: texlive-kvoptions: Refresh package definition.

* gnu/packages/tex.scm (texlive-kvoptions): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 34fc53337b..2b93e79349 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7058,30 +7058,26 @@ in SGML; use maths minus in text as appropriate; simple Young tableaux.")
 (define-deprecated-package texlive-jknappen texlive-jknapltx)
 
 (define-public texlive-kvoptions
-  (let ((template (simple-texlive-package
-                   "texlive-kvoptions"
-                   (list "doc/latex/kvoptions/"
-                         "source/latex/kvoptions/"
-                         "tex/latex/kvoptions/")
-                   (base32
-                    "1b8q93l54160b8gn3fq484n15n6cylrhmf2xk7p42czg2rqw7w3l"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/kvoptions")
-         ((#:build-targets _ '())
-          #~(list "kvoptions.dtx"))))
-      (propagated-inputs
-       (list texlive-kvsetkeys texlive-ltxcmds))
-      (home-page "https://www.ctan.org/pkg/kvoptions")
-      (synopsis "Key/value format for package options")
-      (description
-       "This package provides facilities for using key-value format in
+  (package
+    (name "texlive-kvoptions")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/kvoptions/"
+                   "source/latex/kvoptions/"
+                   "tex/latex/kvoptions/")
+             (base32
+              "1b8q93l54160b8gn3fq484n15n6cylrhmf2xk7p42czg2rqw7w3l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-kvsetkeys texlive-ltxcmds))
+    (home-page "https://www.ctan.org/pkg/kvoptions")
+    (synopsis "Key/value format for package options")
+    (description
+     "This package provides facilities for using key-value format in
 package options.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-latex-kvoptions texlive-kvoptions)
 
-- 
cgit 1.4.1


From e1d1b4f992ffa92d3e8e0ddfa4ec570ff94f006a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:29:41 +0200
Subject: gnu: texlive-eso-pic: Refresh package definition.

* gnu/packages/tex.scm (texlive-eso-pic): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2b93e79349..596ea5c83c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7440,29 +7440,24 @@ via one of the packages @code{calrsfs} and @code{mathrsfs}.")
 (define-deprecated-package texlive-fonts-rsfs texlive-rsfs)
 
 (define-public texlive-eso-pic
-  (let ((template (simple-texlive-package
-                   "texlive-eso-pic"
-                   (list "doc/latex/eso-pic/"
-                         "source/latex/eso-pic/"
-                         "tex/latex/eso-pic/")
-                   (base32
-                    "05bqm4x209wji0q6xk1jrjp0nzqafp44dlq30hlpcagrggjb3d9s"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/eso-pic")
-         ((#:build-targets _ '())
-          #~(list "eso-pic.ins"))))
-      (home-page "https://ctan.org/macros/latex/contrib/eso-pic")
-      (synopsis "Add picture commands (or backgrounds) to every page")
-      (description
-       "The package adds one or more user commands to LaTeX's @code{shipout}
+  (package
+    (name "texlive-eso-pic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/eso-pic/" "source/latex/eso-pic/"
+                   "tex/latex/eso-pic/")
+             (base32
+              "05bqm4x209wji0q6xk1jrjp0nzqafp44dlq30hlpcagrggjb3d9s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/eso-pic")
+    (synopsis "Add picture commands (or backgrounds) to every page")
+    (description
+     "The package adds one or more user commands to LaTeX's @code{shipout}
 routine, which may be used to place the output at fixed positions.  The
 @code{grid} option may be used to find the correct places.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-latex-eso-pic texlive-eso-pic)
 
-- 
cgit 1.4.1


From 04460871a75f4b0a0f8c092808a72a736df341b4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:30:49 +0200
Subject: gnu: texlive-pdfpages: Refresh package definition.

* gnu/packages/tex.scm (texlive-pdfpages): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 596ea5c83c..a09b5006a5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7673,34 +7673,29 @@ defines some associated length commands.")
 (define-deprecated-package texlive-latex-pbox texlive-pbox)
 
 (define-public texlive-pdfpages
-  (let ((template (simple-texlive-package
-                   "texlive-pdfpages"
-                   (list "doc/latex/pdfpages/"
-                         "source/latex/pdfpages/"
-                         "tex/latex/pdfpages/")
-                   (base32
-                    "0a68vxkygk20fp51fkp7nvs8mc7h6irdvxal8qsnn9zrgr965d76"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/pdfpages")
-         ((#:build-targets _ '())
-          #~(list "pdfpages.ins"))))
-      (propagated-inputs
-       (list texlive-tools texlive-oberdiek texlive-graphics texlive-eso-pic))
-      (home-page "https://ctan.org/macros/latex/contrib/pdfpages")
-      (synopsis "Include PDF documents in LaTeX")
-      (description
-       "This package simplifies the inclusion of external multi-page PDF
+  (package
+    (name "texlive-pdfpages")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pdfpages/" "source/latex/pdfpages/"
+                   "tex/latex/pdfpages/")
+             (base32
+              "0a68vxkygk20fp51fkp7nvs8mc7h6irdvxal8qsnn9zrgr965d76")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-eso-pic texlive-graphics texlive-oberdiek texlive-tools))
+    (home-page "https://ctan.org/pkg/pdfpages")
+    (synopsis "Include PDF documents in LaTeX")
+    (description
+     "This package simplifies the inclusion of external multi-page PDF
 documents in LaTeX documents.  Pages may be freely selected and it is possible
 to put several logical pages onto each sheet of paper.  Furthermore a lot of
 hypertext features like hyperlinks and article threads are provided.  The
 package supports pdfTeX (pdfLaTeX) and VTeX.  With VTeX it is even possible to
 use this package to insert PostScript files, in addition to PDF files.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-latex-pdfpages texlive-pdfpages)
 
-- 
cgit 1.4.1


From 361507d5b288b0952074f252698b3488251ef56d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:36:10 +0200
Subject: gnu: texlive-subfigure: Refresh package definition.

* gnu/packages/tex.scm (texlive-subfigure): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a09b5006a5..fd4ef07aeb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7828,35 +7828,31 @@ caption for that subfigure.")
     (license license:lppl)))
 
 (define-public texlive-subfigure
-  (let ((template (simple-texlive-package
-                   "texlive-subfigure"
-                   (list "doc/latex/subfigure/"
-                         "source/latex/subfigure/"
-                         "tex/latex/subfigure/")
-                   (base32
-                    "1327ygajf6gza5msvhfjjnk6r3sw7vb7rxg23v4gx4dmyxqfqrbi"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/subfigure")
-         ((#:build-targets _ '())
-          #~(list "subfigure.ins"))))
-      (home-page "https://www.ctan.org/pkg/subfigure")
-      (synopsis "Figures divided into subfigures")
-      (description
+  (package
+    (name "texlive-subfigure")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/subfigure/"
+                   "source/latex/subfigure/"
+                   "tex/latex/subfigure/")
+             (base32
+              "1327ygajf6gza5msvhfjjnk6r3sw7vb7rxg23v4gx4dmyxqfqrbi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/subfigure")
+    (synopsis "Deprecated: Figures divided into subfigures")
+    (description
        "This (deprecated) package provides support for the manipulation and
-reference of small or \"sub\" figures and tables within a single figure or
-table environment.  It is convenient to use this package when your subfigures
-are to be separately captioned, referenced, or are to be included in the
+reference of small, or sub, figures and tables within a single figure or table
+environment.  It is convenient to use this package when your subfigures are to
+be separately captioned, referenced, or are to be included in the
 List-of-Figures.  A new @code{\\subfigure} command is introduced which can be
 used inside a figure environment for each subfigure.  An optional first
 argument is used as the caption for that subfigure.  The package is now
 considered obsolete: it was superseded by @code{subfig}, but users may find
 the more recent @code{subcaption} package more satisfactory.")
-      (license license:lppl))))
+      (license license:lppl)))
 
 (define-deprecated-package texlive-latex-subfigure texlive-subfigure)
 
-- 
cgit 1.4.1


From fad4fdafffe7ba489d1a897a18f31a9e589494dd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:37:44 +0200
Subject: gnu: texlive-lh: Refresh package definition.

* gnu/packages/tex.scm (texlive-lh): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 55 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fd4ef07aeb..efcdb996cd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8179,28 +8179,37 @@ same job for T1- and TS1-encoded @code{ec} fonts.")
 (define-deprecated-package texlive-latex-type1cm texlive-type1cm)
 
 (define-public texlive-lh
-  (let ((template (simple-texlive-package
-                   "texlive-lh"
-                   (list "/doc/fonts/lh/"
-                         "/source/fonts/lh/"
-                         "/source/latex/lh/"
-                         "/fonts/source/lh/"
-                         "/tex/plain/lh/")
-                   (base32
-                    "0vw75i52asi5sssp8k9r8dy4ihvqbvmbsl3dini3ls8cky15lz37"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "latex/lh")
-         ((#:build-targets _ '())
-          ''("nfssfox.ins" "lcyfonts.ins" "ot2fonts.ins" "t2ccfonts.ins"))))
-      (home-page "https://www.ctan.org/pkg/lh")
-      (synopsis "Cyrillic fonts that support LaTeX standard encodings")
-      (description
-       "The LH fonts address the problem of the wide variety of alphabets that
+  (package
+    (name "texlive-lh")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/lh/"
+                   "fonts/source/lh/base/"
+                   "fonts/source/lh/lh-XSlav/"
+                   "fonts/source/lh/lh-conc/"
+                   "fonts/source/lh/lh-lcy/"
+                   "fonts/source/lh/lh-ot2/"
+                   "fonts/source/lh/lh-t2a/"
+                   "fonts/source/lh/lh-t2b/"
+                   "fonts/source/lh/lh-t2c/"
+                   "fonts/source/lh/lh-t2d/"
+                   "fonts/source/lh/lh-x2/"
+                   "fonts/source/lh/nont2/"
+                   "fonts/source/lh/specific/"
+                   "source/fonts/lh/"
+                   "source/latex/lh/"
+                   "tex/latex/lh/"
+                   "tex/plain/lh/")
+             (base32
+              "0cqwns4zy1847fn3dp8z3wbfpy4dl05cr065nk9k65fmp7wksnjk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-ec))
+    (home-page "https://ctan.org/pkg/lh")
+    (synopsis "Cyrillic fonts that support LaTeX standard encodings")
+    (description
+     "The LH fonts address the problem of the wide variety of alphabets that
 are written with Cyrillic-style characters.  The fonts are the original basis
 of the set of T2* and X2 encodings that are now used when LaTeX users need to
 write in Cyrillic languages.  Macro support in standard LaTeX encodings is
@@ -8209,7 +8218,7 @@ offers support for other (more traditional) encodings.  The fonts, in the
 standard T2* and X2 encodings are available in Adobe Type 1 format, in the
 CM-Super family of fonts.  The package also offers its own LaTeX support for
 OT2 encoded fonts, CM bright shaped fonts and Concrete shaped fonts.")
-      (license license:lppl))))
+    (license license:lppl)))
 
 (define-deprecated-package texlive-latex-lh texlive-lh)
 
-- 
cgit 1.4.1


From ada78c49fec8993334d3af847cfe1cda6bf23ea5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:39:06 +0200
Subject: gnu: texlive-acronym: Refresh package definition.

* gnu/packages/tex.scm (texlive-acronym): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index efcdb996cd..e6df23be0e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8479,31 +8479,28 @@ files.")
 (define-deprecated-package texlive-latex-preview texlive-preview)
 
 (define-public texlive-acronym
-  (let ((template (simple-texlive-package
-                   "texlive-acronym"
-                   (list "doc/latex/acronym/"
-                         "source/latex/acronym/"
-                         "tex/latex/acronym/")
-                   (base32
-                    "0p2sws3qy7wv0v6bsy6c5j36n9s1ps7b1z7dmg1370schrjpqnfh"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t) "latex/acronym")
-         ((#:build-targets _ '()) '(list "acronym.ins"))))
-      (propagated-inputs
-       (list texlive-bigfoot texlive-relsize texlive-xstring))
-      (home-page "https://ctan.org/pkg/acronym")
-      (synopsis "Expand acronyms at least once")
-      (description
-       "This package ensures that all acronyms used in the text are spelled
-out in full at least once.  It also provides an environment to build a list of
+  (package
+    (name "texlive-acronym")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/acronym/" "source/latex/acronym/"
+                   "tex/latex/acronym/")
+             (base32
+              "0p2sws3qy7wv0v6bsy6c5j36n9s1ps7b1z7dmg1370schrjpqnfh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-bigfoot texlive-relsize texlive-xstring))
+    (home-page "https://ctan.org/pkg/acronym")
+    (synopsis "Expand acronyms at least once")
+    (description
+     "This package ensures that all acronyms used in the text are spelled out
+in full at least once.  It also provides an environment to build a list of
 acronyms used.  The package is compatible with PDF bookmarks.  The package
 requires the @code{suffix} package, which in turn requires that it runs under
 e-TeX.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-latex-acronym texlive-acronym)
 
-- 
cgit 1.4.1


From 342800f747e7675144568aed19039dbacc639ed4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:40:08 +0200
Subject: gnu: texlive-ms: Refresh package definition.

* gnu/packages/tex.scm (texlive-ms): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e6df23be0e..562974b8bc 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9148,28 +9148,27 @@ and back-ends.  It also ensures compatibility with the @code{media9} and
 (define-deprecated-package texlive-latex-ocgx2 texlive-ocgx2)
 
 (define-public texlive-ms
-  (let ((template
-         (simple-texlive-package
-          "texlive-ms"
-          (list "doc/latex/ms/" "source/latex/ms/" "tex/latex/ms/")
-          (base32 "1cgrpx5mybiirjjdmni8kvqdg37dwfkixq3h9ami0mgxqqqfl2x3"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/ms")
-         ((#:tex-format _ "latex") "latex")
-         ((#:build-targets _ '())
-          #~(list "count1to.ins" "multitoc.ins"))))
-      (home-page "https://ctan.org/macros/latex/contrib/ms")
-      (synopsis "Various LaTeX packages by Martin Schroder")
-      (description
-       "The remains of a bundle of LaTeX packages by Martin Schroder; the
-collection comprises: count1to, make use of TeX counters; and multitoc,
-typeset the table of contents in multiple columns.")
-      (license license:lppl))))
+  (package
+    (name "texlive-ms")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ms/" "source/latex/ms/"
+                   "tex/latex/ms/")
+             (base32
+              "1cgrpx5mybiirjjdmni8kvqdg37dwfkixq3h9ami0mgxqqqfl2x3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (propagated-inputs
+     (list texlive-everyshi texlive-tools))
+    (home-page "https://ctan.org/pkg/ms")
+    (synopsis "Various LaTeX packages by Martin Schroder")
+    (description
+     "This package is the remains of a bundle of LaTeX packages by Martin
+Schroder; the collection comprises: @code{count1to}, make use of TeX counters;
+and @code{multitoc}, typeset the table of contents in multiple columns.")
+    (license license:lppl)))
 
 (define-deprecated-package texlive-latex-ms texlive-ms)
 
-- 
cgit 1.4.1


From df2b6cd2b1053a3df6bdc4e683581a85a32f275f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:40:49 +0200
Subject: gnu: texlive-ncctools: Refresh package definition.

* gnu/packages/tex.scm (texlive-ncctools): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 562974b8bc..c42bcfc5ec 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9173,26 +9173,23 @@ and @code{multitoc}, typeset the table of contents in multiple columns.")
 (define-deprecated-package texlive-latex-ms texlive-ms)
 
 (define-public texlive-ncctools
-  (let ((template (simple-texlive-package
-                   "texlive-ncctools"
-                   (list "doc/latex/ncctools/"
-                         "source/latex/ncctools/"
-                         "tex/latex/ncctools/")
-                   (base32
-                    "1g3fpvrg6kx2ns97ih6iwdk0rcbxlv043x8rdppxdincl2lvbdx5"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t) "latex/ncctools")
-         ((#:build-targets _ '()) '(list "ncctools.ins"))))
-      (propagated-inputs
-       (list texlive-amsmath texlive-graphics))
-      (home-page "https://ctan.org/pkg/ncctools")
-      (synopsis "Collection of general packages for LaTeX")
-      (description
-       "The NCCtools bundle contains many packages for general use under LaTeX;
+  (package
+    (name "texlive-ncctools")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ncctools/" "source/latex/ncctools/"
+                   "tex/latex/ncctools/")
+             (base32
+              "1g3fpvrg6kx2ns97ih6iwdk0rcbxlv043x8rdppxdincl2lvbdx5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-amsmath texlive-graphics))
+    (home-page "https://ctan.org/pkg/ncctools")
+    (synopsis "A collection of general packages for LaTeX")
+    (description
+     "The NCCtools bundle contains many packages for general use under LaTeX;
 many are also used by NCC LaTeX.  The bundle includes tools for:
 @itemize
 @item executing commands after a package is loaded;
@@ -9221,7 +9218,7 @@ toc-entries;
 @item centered page layouts;
 @item un-numbered top-level section.
 @end itemize")
-      (license license:lppl))))
+    (license license:lppl)))
 
 (define-public texlive-numprint
   (let ((template
-- 
cgit 1.4.1


From 260140f3313b485469822e7d57a24400c736d151 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:41:22 +0200
Subject: gnu: texlive-numprint: Refresh package definition.

* gnu/packages/tex.scm (texlive-numprint): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 64 ++++++++++++++++++++++------------------------------
 1 file changed, 27 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c42bcfc5ec..f0a86cb544 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9221,43 +9221,33 @@ toc-entries;
     (license license:lppl)))
 
 (define-public texlive-numprint
-  (let ((template
-         (simple-texlive-package
-          "texlive-numprint"
-          (list "doc/latex/numprint/"
-                "source/latex/numprint/"
-                "tex/latex/numprint/")
-          (base32 "1rqbqj4ffcfxxxxbs100pdslaiimwzgg19mf2qzcmm5snxwrf7zj"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/numprint")
-         ((#:build-targets _ '())
-          '(list "numprint.ins"))))
-      (home-page "https://www.ctan.org/pkg/numprint")
-      (synopsis "Print numbers with separators and exponent if necessary")
-      (description
-       "The package numprint prints numbers with a separator every three
-digits and converts numbers given as 12345.6e789 to 12\\,345,6\\cdot
-10^{789}.  Numbers are printed in the current mode (text or math) in
-order to use the correct font.
-
-Many things, including the decimal sign, the thousand separator, as
-well as the product sign can be changed by the user, e.g., to reach
-12,345.6\\times 10^{789}.
-
-If an optional argument is given it is printed upright as unit.
-Numbers can be rounded to a given number of digits.  The package
-supports an automatic, language-dependent change of the number format.
-
-Tabular alignment using the tabular, array, tabularx, and longtable
-environments (similar to the dcolumn and rccol packages) is supported
-using all features of numprint.  Additional text can be added before
-and after the formatted number.")
-      (license license:lppl))))
+  (package
+    (name "texlive-numprint")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/numprint/" "source/latex/numprint/"
+                   "tex/latex/numprint/")
+             (base32
+              "1rqbqj4ffcfxxxxbs100pdslaiimwzgg19mf2qzcmm5snxwrf7zj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-tools))
+    (home-page "https://ctan.org/pkg/numprint")
+    (synopsis "Print numbers with separators and exponent if necessary")
+    (description
+     "The package numprint prints numbers with a separator every three digits
+and converts numbers given as @samp{12345.6e789} to @samp{12\\,345,6\\cdot
+10^@{789@}}.  Numbers are printed in the current mode (text or math) in order
+to use the correct font.
+
+Many things, including the decimal sign, the thousand separator, as well as
+the product sign can be changed by the user.  If an optional argument is given
+it is printed upright as unit.  Numbers can be rounded to a given number of
+digits.  The package supports an automatic, language-dependent change of the
+number format.")
+    (license license:lppl)))
 
 (define-deprecated-package texlive-latex-numprint texlive-numprint)
 
-- 
cgit 1.4.1


From 0c45eb5be83a0f784733f7c193943c4eb414473e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:42:30 +0200
Subject: gnu: texlive-atbegshi: Refresh package definition.

* gnu/packages/tex.scm (texlive-atbegshi): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-IFTEX, TEXLIVE-INFWARERR, TEXLIVE-LTXCMDS.
---
 gnu/packages/tex.scm | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f0a86cb544..2429988a29 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9470,30 +9470,27 @@ not only with KOMA-Script classes but also with the standard classes.")
 (define-deprecated-package texlive-latex-koma-script texlive-koma-script)
 
 (define-public texlive-atbegshi
-  (let ((template (simple-texlive-package
-                   "texlive-atbegshi"
-                   (list "doc/latex/atbegshi/"
-                         "source/latex/atbegshi/"
-                         "tex/generic/atbegshi/")
-                   (base32
-                    "0vd90wdjwj5w4g4xka4nms3rgixjw63iwf0hj0v1akcfflwvgn69"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/atbegshi")
-         ((#:build-targets _ '())
-          #~(list "atbegshi.dtx"))))
-      (home-page "https://www.ctan.org/pkg/atbegshi")
-      (synopsis "Execute commands at @code{\\shipout} time")
-      (description
-       "This package is a modern reimplementation of package @code{everyshi},
+  (package
+    (name "texlive-atbegshi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/atbegshi/" "source/latex/atbegshi/"
+                   "tex/generic/atbegshi/")
+             (base32
+              "0vd90wdjwj5w4g4xka4nms3rgixjw63iwf0hj0v1akcfflwvgn69")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-iftex texlive-infwarerr texlive-ltxcmds))
+    (home-page "https://ctan.org/pkg/atbegshi")
+    (synopsis "Execute commands at @code{\\shipout} time")
+    (description
+     "This package is a modern reimplementation of package @code{everyshi},
 providing various commands to be executed before a @code{\\shipout} command.
 It makes use of e-TeX’s facilities if they are available.  The package may
 be used either with LaTeX or with plain TeX.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-generic-atbegshi texlive-atbegshi)
 
-- 
cgit 1.4.1


From f61ae4a417dcdaeb564dd9e48b7cfff1c2aafd3f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:44:09 +0200
Subject: gnu: texlive-bigintcalc: Refresh package definition.

* gnu/packages/tex.scm (texlive-bigintcalc): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 44 ++++++++++++++++++++------------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2429988a29..6ce5b5fcb2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9495,30 +9495,26 @@ be used either with LaTeX or with plain TeX.")
 (define-deprecated-package texlive-generic-atbegshi texlive-atbegshi)
 
 (define-public texlive-bigintcalc
-  (let ((template (simple-texlive-package
-                   "texlive-bigintcalc"
-                   (list "doc/latex/bigintcalc/"
-                         "source/latex/bigintcalc/"
-                         "tex/generic/bigintcalc/")
-                   (base32
-                    "1cyv4mcvx83ab782l6h2f86a63ipm845r7hv1m6f1z2336vy7rc5"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/bigintcalc")
-         ((#:build-targets _ '())
-          #~(list "bigintcalc.dtx"))))
-      (propagated-inputs
-       (list texlive-pdftexcmds))
-      (home-page "https://www.ctan.org/pkg/bigintcalc")
-      (synopsis "Integer calculations on very large numbers")
-      (description
-       "This package provides expandable arithmetic operations with big
-integers that can exceed TeX's number limits.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-bigintcalc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bigintcalc/"
+                   "source/latex/bigintcalc/"
+                   "tex/generic/bigintcalc/")
+             (base32
+              "1cyv4mcvx83ab782l6h2f86a63ipm845r7hv1m6f1z2336vy7rc5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-pdftexcmds))
+    (home-page "https://ctan.org/pkg/bigintcalc")
+    (synopsis "Integer calculations on very large numbers")
+    (description
+     "This package provides expandable arithmetic operations with big integers
+that can exceed TeX's number limits.")
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-generic-bigintcalc texlive-bigintcalc)
 
-- 
cgit 1.4.1


From 5e346d44b3ef9e280b915146d60dc5a4c1e6c8d9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:44:58 +0200
Subject: gnu: texlive-bitset: Refresh package definition.

* gnu/packages/tex.scm (texlive-bitset): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 45 ++++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6ce5b5fcb2..8dcdfd40ce 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9519,31 +9519,26 @@ that can exceed TeX's number limits.")
 (define-deprecated-package texlive-generic-bigintcalc texlive-bigintcalc)
 
 (define-public texlive-bitset
-  (let ((template (simple-texlive-package
-                   "texlive-bitset"
-                   (list "doc/latex/bitset/"
-                         "source/latex/bitset/"
-                         "tex/generic/bitset/")
-                   (base32
-                    "1q7vk5gr5a4vaa3l20j178cg2q7a99rxdiyxhzpx9a6lfqfkjddz"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/bitset")
-         ((#:build-targets _ '())
-          #~(list "bitset.dtx"))))
-      (propagated-inputs
-       (list texlive-bigintcalc texlive-infwarerr texlive-intcalc))
-      (home-page "https://www.ctan.org/pkg/bitset")
-      (synopsis "Handle bit-vector datatype")
-      (description
-       "This package defines and implements the data type bit set, a vector
-of bits.  The size of the vector may grow dynamically.  Individual bits
-can be manipulated.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-bitset")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bitset/" "source/latex/bitset/"
+                   "tex/generic/bitset/")
+             (base32
+              "1q7vk5gr5a4vaa3l20j178cg2q7a99rxdiyxhzpx9a6lfqfkjddz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-bigintcalc texlive-infwarerr texlive-intcalc))
+    (home-page "https://ctan.org/pkg/bitset")
+    (synopsis "Handle bit-vector datatype")
+    (description
+     "This package defines and implements the data type bit set, a vector of
+bits.  The size of the vector may grow dynamically.  Individual bits can be
+manipulated.")
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-generic-bitset texlive-bitset)
 
-- 
cgit 1.4.1


From 29b903133e7709230010ef65e2b98a1154baa8a1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:45:37 +0200
Subject: gnu: texlive-etexcmds: Refresh package definition.

* gnu/packages/tex.scm (texlive-etexcmds): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8dcdfd40ce..7d0ea3291c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9543,32 +9543,27 @@ manipulated.")
 (define-deprecated-package texlive-generic-bitset texlive-bitset)
 
 (define-public texlive-etexcmds
-  (let ((template (simple-texlive-package
-                   "texlive-etexcmds"
-                   (list "doc/latex/etexcmds/"
-                         "source/latex/etexcmds/"
-                         "tex/generic/etexcmds/")
-                   (base32
-                    "13cf1fs5x9d8749b2jgxmgnkrx0r4hwpl389r15kq3ldz9jfl627"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/etexcmds")
-         ((#:build-targets _ '())
-          #~(list "etexcmds.dtx"))))
-      (propagated-inputs
-       (list texlive-iftex texlive-infwarerr))
-      (home-page "https://www.ctan.org/pkg/etexcmds")
-      (synopsis "Avoid name clashes with e-TeX commands")
-      (description
-       "New primitive commands are introduced in e-TeX; sometimes the names
-collide with existing macros.  This package solves the name clashes by
-adding a prefix to e-TeX’s commands.  For example, ε-TeX’s
-@code{\\unexpanded} is provided as @code{\\etex@@unexpanded}.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-etexcmds")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/etexcmds/" "source/latex/etexcmds/"
+                   "tex/generic/etexcmds/")
+             (base32
+              "13cf1fs5x9d8749b2jgxmgnkrx0r4hwpl389r15kq3ldz9jfl627")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-iftex texlive-infwarerr))
+    (home-page "https://ctan.org/pkg/etexcmds")
+    (synopsis "Avoid name clashes with e-TeX commands")
+    (description
+     "New primitive commands are introduced in e-TeX; sometimes the names
+collide with existing macros.  This package solves the name clashes by adding
+a prefix to e-TeX’s commands.  For example, ε-TeX’s @code{\\unexpanded} is
+provided as @code{\\etex@@unexpanded}.")
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-generic-etexcmds texlive-etexcmds)
 
-- 
cgit 1.4.1


From 92f820efca7d83248dc20cb1b827d2fb878ebee0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:46:16 +0200
Subject: gnu: texlive-gettitlestring: Refresh package definition.

* gnu/packages/tex.scm (texlive-gettitlestring): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7d0ea3291c..c74377140c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9595,29 +9595,25 @@ modifiers; some purely expandable numerics.")
     (license license:lppl)))
 
 (define-public texlive-gettitlestring
-  (let ((template (simple-texlive-package
-                   "texlive-gettitlestring"
-                   (list "doc/latex/gettitlestring/"
-                         "source/latex/gettitlestring/"
-                         "tex/generic/gettitlestring/")
-                   (base32
-                    "1vbvmwrpsvy37gbwdmsqbbsicjiww3i0bh1yqnb75jiya9an0sjb"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/gettitlestring")
-         ((#:build-targets _ '())
-          #~(list "gettitlestring.dtx"))))
-      (home-page "https://www.ctan.org/pkg/gettitlestring")
-      (synopsis "Clean up title references")
-      (description
-       "This package provides commands for cleaning up the title string
+  (package
+    (name "texlive-gettitlestring")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gettitlestring/"
+                   "source/latex/gettitlestring/"
+                   "tex/generic/gettitlestring/")
+             (base32
+              "1vbvmwrpsvy37gbwdmsqbbsicjiww3i0bh1yqnb75jiya9an0sjb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gettitlestring")
+    (synopsis "Clean up title references")
+    (description
+     "This package provides commands for cleaning up the title string
 (such as removing @code{\\label} commands) for packages that typeset such
 strings.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-generic-gettitlestring texlive-gettitlestring)
 
-- 
cgit 1.4.1


From f35acb911be34e54564a2ca17a173bf832afb1a7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:46:54 +0200
Subject: gnu: texlive-infwarerr: Refresh package definition.

* gnu/packages/tex.scm (texlive-infwarerr): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 44 ++++++++++++++++++++------------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c74377140c..74dafc6bea 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9618,30 +9618,26 @@ strings.")
 (define-deprecated-package texlive-generic-gettitlestring texlive-gettitlestring)
 
 (define-public texlive-infwarerr
-  (let ((template (simple-texlive-package
-                   "texlive-infwarerr"
-                   (list "doc/latex/infwarerr/"
-                         "source/latex/infwarerr/"
-                         "tex/generic/infwarerr/")
-                   (base32
-                    "0lpcrpf3d6xfdp68ri22126x57mvmq5dpj9np68ph8p8lhvhqdjd"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/infwarerr")
-         ((#:build-targets _ '())
-          #~(list "infwarerr.dtx"))))
-      (home-page "https://www.ctan.org/pkg/infwarerr")
-      (synopsis "Information/warning/error macros")
-      (description
-       "This package provides a complete set of macros for information,
-warning and error messages.  Under LaTeX, the commands are wrappers for
-the corresponding LaTeX commands; under Plain TeX they are available as
-complete implementations.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-infwarerr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/infwarerr/"
+                   "source/latex/infwarerr/"
+                   "tex/generic/infwarerr/")
+             (base32
+              "0lpcrpf3d6xfdp68ri22126x57mvmq5dpj9np68ph8p8lhvhqdjd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/infwarerr")
+    (synopsis "Complete set of information/warning/error message macros")
+    (description
+     "This package provides a complete set of macros for information, warning
+and error messages.  Under LaTeX, the commands are wrappers for the
+corresponding LaTeX commands; under Plain TeX they are available as complete
+implementations.")
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-generic-infwarerr texlive-infwarerr)
 
-- 
cgit 1.4.1


From a8de5e3a2a3830bb2a979d2697a4d940b0b3b015 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:47:26 +0200
Subject: gnu: texlive-intcalc: Refresh package definition.

* gnu/packages/tex.scm (texlive-intcalc): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 74dafc6bea..1991500582 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9642,28 +9642,23 @@ implementations.")
 (define-deprecated-package texlive-generic-infwarerr texlive-infwarerr)
 
 (define-public texlive-intcalc
-  (let ((template (simple-texlive-package
-                   "texlive-intcalc"
-                   (list "doc/latex/intcalc/"
-                         "source/latex/intcalc/"
-                         "tex/generic/intcalc/")
-                   (base32
-                    "15alwp9cr8wasfajs3p201p7nqml37vly9mpg1j5l6xv95javk7x"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/intcalc")
-         ((#:build-targets _ '())
-          #~(list "intcalc.dtx"))))
-      (home-page "https://www.ctan.org/pkg/intcalc")
-      (synopsis "Expandable arithmetic operations with integers")
-      (description
-       "This package provides expandable arithmetic operations with integers,
+  (package
+    (name "texlive-intcalc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/intcalc/" "source/latex/intcalc/"
+                   "tex/generic/intcalc/")
+             (base32
+              "15alwp9cr8wasfajs3p201p7nqml37vly9mpg1j5l6xv95javk7x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/intcalc")
+    (synopsis "Expandable arithmetic operations with integers")
+    (description
+     "This package provides expandable arithmetic operations with integers,
 using the e-TeX extension @code{\\numexpr} if it is available.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-generic-intcalc texlive-intcalc)
 
-- 
cgit 1.4.1


From d75b23ee8abf6a0f4780fde0f0c16a54a56e5f71 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:47:59 +0200
Subject: gnu: texlive-kvdefinekeys: Refresh package definition.

* gnu/packages/tex.scm (texlive-kvdefinekeys): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-LTXCMDS.
---
 gnu/packages/tex.scm | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1991500582..a09433288f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9663,28 +9663,26 @@ using the e-TeX extension @code{\\numexpr} if it is available.")
 (define-deprecated-package texlive-generic-intcalc texlive-intcalc)
 
 (define-public texlive-kvdefinekeys
-  (let ((template (simple-texlive-package
-                   "texlive-kvdefinekeys"
-                   (list "doc/latex/kvdefinekeys/"
-                         "source/latex/kvdefinekeys/"
-                         "tex/generic/kvdefinekeys/")
-                   (base32
-                    "1026h223ph3nzhs6jqbasa0bzsrdg3zgllfcwwcavfzb5i6p9jdf"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/kvdefinekeys")
-         ((#:build-targets _ '())
-          #~(list "kvdefinekeys.dtx"))))
-      (home-page "https://www.ctan.org/pkg/kvdefinekeys")
-      (synopsis "Define keys for use in the @code{kvsetkeys} package")
-      (description
-       "This package provides the @code{\\kv@@define@@key} (analogous to
+  (package
+    (name "texlive-kvdefinekeys")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/kvdefinekeys/"
+                   "source/latex/kvdefinekeys/"
+                   "tex/generic/kvdefinekeys/")
+             (base32
+              "1026h223ph3nzhs6jqbasa0bzsrdg3zgllfcwwcavfzb5i6p9jdf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-ltxcmds))
+    (home-page "https://ctan.org/pkg/kvdefinekeys")
+    (synopsis "Define keys for use in the @code{kvsetkeys} package")
+    (description
+     "This package provides the @code{\\kv@@define@@key} (analogous to
 keyval’s @code{\\define@@key}, to define keys for use by @code{kvsetkeys}.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-generic-kvdefinekeys texlive-kvdefinekeys)
 
-- 
cgit 1.4.1


From d9d72c834e3bf89cd0304c8a8bfa2ffe826faa1c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:49:09 +0200
Subject: gnu: texlive-kvsetkeys: Refresh package definition.

* gnu/packages/tex.scm (texlive-kvdefinekeys): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-INFWARERR.
---
 gnu/packages/tex.scm | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a09433288f..2ee2df0b1b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9687,30 +9687,28 @@ keyval’s @code{\\define@@key}, to define keys for use by @code{kvsetkeys}.")
 (define-deprecated-package texlive-generic-kvdefinekeys texlive-kvdefinekeys)
 
 (define-public texlive-kvsetkeys
-  (let ((template (simple-texlive-package
-                   "texlive-kvsetkeys"
-                   (list "doc/latex/kvsetkeys/"
-                         "source/latex/kvsetkeys/"
-                         "tex/generic/kvsetkeys/")
-                   (base32
-                    "0b2f2r49vi8x54qshm1h9sh8zhdmy0mc2y44yd05kcmmbiiq7hfz"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/kvsetkeys")
-         ((#:build-targets _ '())
-          #~(list "kvsetkeys.dtx"))))
-      (home-page "https://www.ctan.org/pkg/kvsetkeys")
-      (synopsis "Key value parser with default handler support")
-      (description
-       "This package provides @code{\\kvsetkeys}, a variant of @code{\\setkeys}
+  (package
+    (name "texlive-kvsetkeys")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/kvsetkeys/"
+                   "source/latex/kvsetkeys/"
+                   "tex/generic/kvsetkeys/")
+             (base32
+              "0b2f2r49vi8x54qshm1h9sh8zhdmy0mc2y44yd05kcmmbiiq7hfz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-infwarerr))
+    (home-page "https://ctan.org/pkg/kvsetkeys")
+    (synopsis "Key value parser with default handler support")
+    (description
+     "This package provides @code{\\kvsetkeys}, a variant of @code{\\setkeys}
 from the @code{keyval} package.  Users can specify a handler that deals with
 unknown options.  Active commas and equal signs may be used, and only one
 level of curly braces are removed from the values.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-generic-kvsetkeys texlive-kvsetkeys)
 
-- 
cgit 1.4.1


From 1053084b23553b69c1666b810e574549f34a5fc5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:50:28 +0200
Subject: gnu: texlive-ltxcmds: Refresh package definition.

* gnu/packages/tex.scm (texlive-ltxcmds): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2ee2df0b1b..961e40c5a4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9735,29 +9735,25 @@ interface.")
 (define-deprecated-package texlive-generic-listofitems texlive-listofitems)
 
 (define-public texlive-ltxcmds
-  (let ((template (simple-texlive-package
-                   "texlive-ltxcmds"
-                   (list "doc/generic/ltxcmds/"
-                         "source/generic/ltxcmds/"
-                         "tex/generic/ltxcmds/")
-                   (base32
-                    "1izcw9jl64iij541183hc156sjwamvxm7q9fkpfnz8sppyg31fkb"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/ltxcmds")
-         ((#:build-targets _ '())
-          #~(list "ltxcmds.dtx"))))
-      (home-page "https://www.ctan.org/pkg/ltxcmds")
-      (synopsis "LaTeX kernel commands extracted for general use")
-      (description
-       "This package exports some utility macros from the LaTeX kernel into
-a separate namespace and also makes them available for other formats such
-as plain TeX.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-ltxcmds")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/ltxcmds/"
+                   "source/generic/ltxcmds/"
+                   "tex/generic/ltxcmds/")
+             (base32
+              "1izcw9jl64iij541183hc156sjwamvxm7q9fkpfnz8sppyg31fkb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ltxcmds")
+    (synopsis "Some LaTeX kernel commands for general use")
+    (description
+     "This package exports some utility macros from the LaTeX kernel into
+a separate namespace and also makes them available for other formats such as
+plain TeX.")
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-generic-ltxcmds texlive-ltxcmds)
 
-- 
cgit 1.4.1


From f2384113b76adb0b32ea88b0b6e16613b9970a6a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:51:40 +0200
Subject: gnu: texlive-pdfescape: Refresh package definition.

* gnu/packages/tex.scm (texlive-pdfescape): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-LTXCMDS, TEXLIVE-PDFTEXCMDS.
---
 gnu/packages/tex.scm | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 961e40c5a4..f7b18887e5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9758,29 +9758,27 @@ plain TeX.")
 (define-deprecated-package texlive-generic-ltxcmds texlive-ltxcmds)
 
 (define-public texlive-pdfescape
-  (let ((template (simple-texlive-package
-                   "texlive-pdfescape"
-                   (list "doc/latex/pdfescape/"
-                         "source/latex/pdfescape/"
-                         "tex/generic/pdfescape/")
-                   (base32
-                    "16a0rdmpa4wxh6gyf46qwfgyh399rwdind2wc89phqd50ky9b5m4"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/pdfescape")
-         ((#:build-targets _ '())
-          #~(list "pdfescape.dtx"))))
-      (home-page "https://www.ctan.org/pkg/pdfescape")
-      (synopsis "pdfTeX's escape features for plain TeX")
-      (description
-       "This package implements pdfTeX's escape features (@code{\\pdfescapehex},
+  (package
+    (name "texlive-pdfescape")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pdfescape/"
+                   "source/latex/pdfescape/"
+                   "tex/generic/pdfescape/")
+             (base32
+              "16a0rdmpa4wxh6gyf46qwfgyh399rwdind2wc89phqd50ky9b5m4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-ltxcmds texlive-pdftexcmds))
+    (home-page "https://ctan.org/pkg/pdfescape")
+    (synopsis "Implements pdfTeX's escape features using TeX or e-TeX")
+    (description
+     "This package implements pdfTeX's escape features (@code{\\pdfescapehex},
 @code{\\pdfunescapehex}, @code{\\pdfescapename}, @code{\\pdfescapestring})
 using TeX or e-TeX.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-generic-pdfescape texlive-pdfescape)
 
-- 
cgit 1.4.1


From 5adb6cded6ac16519e3377952af3ab0ff59b9013 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:52:51 +0200
Subject: gnu: texlive-uniquecounter: Refresh package definition.

* gnu/packages/tex.scm (texlive-uniquecounter): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f7b18887e5..b795573b03 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9783,31 +9783,27 @@ using TeX or e-TeX.")
 (define-deprecated-package texlive-generic-pdfescape texlive-pdfescape)
 
 (define-public texlive-uniquecounter
-  (let ((template (simple-texlive-package
-                   "texlive-uniquecounter"
-                   (list "doc/latex/uniquecounter/"
-                         "source/latex/uniquecounter/"
-                         "tex/generic/uniquecounter/")
-                   (base32
-                    "1ll3iwk8x44l3qx1dhna399ngg66vbllivv8i3lwzriwkx22xbf3"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/uniquecounter")
-         ((#:build-targets _ '())
-          #~(list "uniquecounter.dtx"))))
-      (propagated-inputs
-       (list texlive-bigintcalc texlive-infwarerr))
-      (home-page "https://www.ctan.org/pkg/uniquecounter")
-      (synopsis "Unlimited unique counter")
-      (description
-       "This package provides a kind of counter that provides unique number
-values.  Several counters can be created with different names.  The numeric
-values are not limited.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-uniquecounter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uniquecounter/"
+                   "source/latex/uniquecounter/"
+                   "tex/generic/uniquecounter/")
+             (base32
+              "1ll3iwk8x44l3qx1dhna399ngg66vbllivv8i3lwzriwkx22xbf3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-bigintcalc texlive-infwarerr))
+    (home-page "https://ctan.org/pkg/uniquecounter")
+    (synopsis "Provides unlimited unique counter")
+    (description
+     "This package provides a kind of counter that provides unique number values.
+Several counters can be created with different names.  The numeric values are
+not limited.")
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-generic-uniquecounter texlive-uniquecounter)
 
-- 
cgit 1.4.1


From f2a8c918c22bc237a3f158d08f9bf3e643f7679e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 15 May 2023 23:59:12 +0200
Subject: gnu: Add texlive-colorprofiles.

* gnu/packages/tex.scm (texlive-colorprofiles): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b795573b03..3d5b36c118 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6709,6 +6709,26 @@ copy-and-paste functions work properly.")
 
 (define-deprecated-package texlive-latex-cmap texlive-cmap)
 
+(define-public texlive-colorprofiles
+  (package
+    (name "texlive-colorprofiles")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/colorprofiles/"
+                   "tex/generic/colorprofiles/")
+             (base32
+              "1nxbds0jhn5wvf50iy1a4mpfgk56587kqvs4wxf08ysvqx6xiaxv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/colorprofiles")
+    (synopsis "Collection of free ICC profiles")
+    (description
+     "This package collects ICC profiles that can be used by color profile
+aware applications or tools like the @code{pdfx} package, as well as TeX and
+LaTeX packages to access them.")
+    (license license:lppl1.2+)))        ;per "colorprofiles.sty"
+
 (define-public texlive-colortbl
   (package
     (name "texlive-colortbl")
-- 
cgit 1.4.1


From b28445b50f341fef5f0d6604949c7220c3e78c86 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:00:03 +0200
Subject: gnu: texlive-pdfx: Refresh package definition.

* gnu/packages/tex.scm (texlive-pdfx): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-COLORPROFILES, TEXLIVE-EVERYSHI,
TEXLIVE-HYPERREF, TEXLIVE-IFTEX, TEXLIVE-PDFTEXCMDS, TEXLIVE-STRINGENC,
TEXLIVE-XCOLOR, TEXLIVE-XMPINCL.  Remove TEXLIVE-PDFTEX.
---
 gnu/packages/tex.scm | 59 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3d5b36c118..5fc57d736d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10207,33 +10207,40 @@ the file to which it applies.")
 (define-deprecated-package texlive-latex-xmpincl texlive-xmpincl)
 
 (define-public texlive-pdfx
-  (let ((template (simple-texlive-package
-                   "texlive-pdfx"
-                   (list "/doc/latex/pdfx/"
-                         "/source/latex/pdfx/"
-                         "/tex/latex/pdfx/")
-                   (base32
-                    "1z4j4d92k2fjmf8jfap4zn7ij97d9rz2jcs9aslcac07ag4x5bdp"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "latex/pdfx")
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'fix-encoding
-               (lambda _
-                 (substitute* "source/latex/pdfx/pdfx.dtx"
-                   (("    .+umaczy") "umaczy"))))))))
-      (propagated-inputs
-       (list texlive-pdftex))
-      (home-page "https://www.ctan.org/pkg/pdfx")
-      (synopsis "PDF/X and PDF/A support for pdfTeX, LuaTeX and XeTeX")
-      (description
-       "This package helps LaTeX users to create PDF/X, PDF/A and other
+  (package
+    (name "texlive-pdfx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pdfx/" "source/latex/pdfx/"
+                   "tex/latex/pdfx/")
+             (base32
+              "1z4j4d92k2fjmf8jfap4zn7ij97d9rz2jcs9aslcac07ag4x5bdp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-encoding
+            (lambda _
+              (substitute* "source/latex/pdfx/pdfx.dtx"
+                (("    .+umaczy") "umaczy")))))))
+    (propagated-inputs
+     (list texlive-colorprofiles
+           texlive-everyshi
+           texlive-hyperref
+           texlive-iftex
+           texlive-pdftexcmds
+           texlive-stringenc
+           texlive-xcolor
+           texlive-xmpincl))
+    (home-page "https://ctan.org/pkg/pdfx")
+    (synopsis "PDF/X and PDF/A support for pdfTeX, LuaTeX and XeTeX")
+    (description
+     "The package helps LaTeX users to create PDF/X, PFD/A and other
 standards-compliant PDF documents with pdfTeX, LuaTeX and XeTeX.")
-      (license license:lppl1.2+))))
+    (license license:lppl1.2+)))
 
 (define-deprecated-package texlive-latex-pdfx texlive-pdfx)
 
-- 
cgit 1.4.1


From ddaeb4b09f4bab5485a6874e9b152d727eaa0607 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:03:10 +0200
Subject: gnu: texlive-marginnote: Refresh package definition.

* gnu/packages/tex.scm (texlive-marginnote): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5fc57d736d..bc342002ad 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10361,26 +10361,25 @@ of the old package @code{pst-char}.")
     (license license:lppl)))
 
 (define-public texlive-marginnote
-  (let ((template (simple-texlive-package
-                   "texlive-marginnote"
-                   (list "/source/latex/marginnote/marginnote.dtx")
-                   (base32
-                    "152bwxhnssj40rr72r6cfirvqbnc0h7xnagfrbz58v2xck53qhg1"))))
-    (package
-      (inherit template)
-      (home-page "http://www.ctan.org/pkg/marginnote")
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/marginnote")
-         ((#:build-targets _ '())
-          ''("marginnote.dtx"))))
-      (synopsis "Notes in the margin")
-      (description "This package provides the command @code{\\marginnote} that
+  (package
+    (name "texlive-marginnote")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/marginnote/"
+                   "source/latex/marginnote/"
+                   "tex/latex/marginnote/")
+             (base32
+              "1drmscvd14akcv7n6wl3d3cnj18cwkd7z7rm2gg7z43b89s7kdqr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/marginnote")
+    (synopsis "Notes in the margin")
+    (description "This package provides the command @code{\\marginnote} that
 may be used instead of @code{\\marginpar} at almost every place where
 @code{\\marginpar} cannot be used, e.g., inside floats, footnotes, or in
 frames made with the @code{framed} package.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-public texlive-iftex
   (package
-- 
cgit 1.4.1


From 13c3ec8ba7938483782ae6190ad59f1bd7b76e14 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:08:37 +0200
Subject: gnu: texlive-alphalph: Refresh package definition.

* gnu/packages/tex.scm (texlive-alphalph): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 49 +++++++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bc342002ad..e1d0f23f88 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -692,32 +692,29 @@ executables.  It is maintained as a part of TeX Live.")))
     (deprecated-package (symbol->string 'old-name) name)))
 
 (define-public texlive-alphalph
-  (let ((template (simple-texlive-package
-                   "texlive-alphalph"
-                   (list "doc/latex/alphalph/"
-                         "source/latex/alphalph/"
-                         "tex/generic/alphalph/")
-                   (base32
-                    "0ap59hmg0brg2wlh3bl77jxfxrk7hphhdal8cr05mby9bw35gffy"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:build-targets _ '())
-          #~(list "alphalph.dtx"))))
-      (propagated-inputs
-       (list texlive-intcalc texlive-infwarerr))
-      (home-page "https://ctan.org/pkg/alphalph")
-      (synopsis "Convert numbers to letters")
-      (description
-       "This package provides commands @code{\\alphalph} and
-@code{\\AlphAlph}.  They are like @code{\\number} but the expansion
-consists of lowercase and uppercase letters respectively (1 to a, 26 to
-z, 27 to aa, 52 to zz, 53 to ba, 702 to zz, 703 to aaa, etc.).
-Alphalph's commands can be used as a replacement for LaTeX's
-@code{\\@@alph} and @code{\\@@Alph} macros.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-alphalph")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/alphalph/"
+                   "source/latex/alphalph/"
+                   "tex/generic/alphalph/")
+             (base32
+              "0ap59hmg0brg2wlh3bl77jxfxrk7hphhdal8cr05mby9bw35gffy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-intcalc texlive-infwarerr))
+    (home-page "https://ctan.org/pkg/alphalph")
+    (synopsis "Convert numbers to letters")
+    (description
+     "This package provides commands @code{\\alphalph} and @code{\\AlphAlph}.
+They are like @code{\\number} but the expansion consists of lowercase and
+uppercase letters respectively (1 to a, 26 to z, 27 to aa, 52 to zz, 53 to ba,
+702 to zz, 703 to aaa, etc.).  Alphalph's commands can be used as
+a replacement for LaTeX's @code{\\@@alph} and @code{\\@@Alph} macros.")
+    (license license:lppl1.3c+)))
 
 (define texlive-docstrip
   (package
-- 
cgit 1.4.1


From c279e3bddb8ffa7b409e097c81858ef0bc34d399 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:09:27 +0200
Subject: gnu: texlive-unicode-data: Refresh package definition.

* gnu/packages/tex.scm (texlive-unicode-data): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e1d0f23f88..33af84ba7d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -756,14 +756,18 @@ affected).")
 
 (define-public texlive-unicode-data
   (package
-    (inherit (simple-texlive-package
-              "texlive-unicode-data"
-              (list "/tex/generic/unicode-data/"
-                    "/doc/generic/unicode-data/")
-              (base32
-               "1d41zvjsig7sqf2j2m89dnbv3gicpb16r04b4ikps4gabhbky83k")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/unicode-data")
+    (name "texlive-unicode-data")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/unicode-data/"
+                   "tex/generic/unicode-data/")
+             (base32
+              "1d41zvjsig7sqf2j2m89dnbv3gicpb16r04b4ikps4gabhbky83k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-base #f))
+    (home-page "https://ctan.org/pkg/unicode-data")
     (synopsis "Unicode data and loaders for TeX")
     (description "This bundle provides generic access to Unicode Consortium
 data for TeX use.  It contains a set of text files provided by the Unicode
-- 
cgit 1.4.1


From cf67717d41f15830c760d835b6870415ff909497 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:13:07 +0200
Subject: gnu: texlive-mflogo: Refresh package definition.

* gnu/packages/tex.scm (texlive-mflogo): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[arguments]<#:phases>: Build font metrics.
---
 gnu/packages/tex.scm | 68 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 52 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 33af84ba7d..85c3e6820d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1594,24 +1594,60 @@ circle fonts (for use in the picture environment) and LaTeX symbol fonts.")
 (define-deprecated-package texlive-fonts-latex texlive-latex-fonts)
 
 (define-public texlive-mflogo
-  (let ((template (simple-texlive-package
-                   "texlive-mflogo"
-                   (list "/doc/latex/mflogo/"
-                         "/source/latex/mflogo/"
-                         "/fonts/source/public/mflogo/logosl8.mf")
-                   (base32
-                    "1vb4mg7fh4k54g7nqwiw3qm4iir8whpfnspis76l4sddzar1amh7"))))
-    (package
-      (inherit template)
-      (native-inputs
-       (list texlive-bin texlive-metafont texlive-knuth-lib))
-      (home-page "http://www.ctan.org/pkg/mflogo")
-      (synopsis "LaTeX support for Metafont logo fonts")
-      (description
-       "This package provides LaTeX and font definition files to access the
+  (package
+    (name "texlive-mflogo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mflogo/"
+                   "fonts/source/public/mflogo/"
+                   "fonts/tfm/public/mflogo/"
+                   "source/latex/mflogo/"
+                   "tex/latex/mflogo/")
+             (base32
+              "1r53qlrcqfwc0dfr7ji1nxnqrj6n0qrlg1rl7fjlw6ap3q9y434k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'build 'build-font-metrics
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((root (assoc-ref inputs "source"))
+                    (mf #$(this-package-native-input "texlive-metafont"))
+                    (kl #$(this-package-native-input "texlive-knuth-lib")))
+                ;; Tell mf where to find mf.base.
+                (setenv "MFBASES"
+                        (string-append mf "/share/texmf-dist/web2c"))
+                ;; Tell mf where to look for source files.
+                (setenv "MFINPUTS"
+                        (string-append root ":"
+                                       mf "/share/texmf-dist/metafont/base:"
+                                       kl "/share/texmf-dist/fonts/source/public/knuth-lib:"
+                                       root "/fonts/source/public/mflogo/"))
+                (for-each (lambda (font)
+                            (format #t "building font ~a\n" font)
+                            (invoke "mf" "-progname=mf"
+                                    "-output-directory=build"
+                                    (string-append "\\"
+                                                   "mode:=ljfour; "
+                                                   "mag:=1; "
+                                                   "scrollmode; "
+                                                   "input " (basename font))))
+                          (find-files
+                           (string-append root
+                                          "/fonts/source/public/mflogo/")
+                           "\\.mf$"))))))))
+    (native-inputs
+     (list texlive-bin texlive-knuth-lib texlive-metafont))
+    (home-page "https://ctan.org/pkg/mflogo")
+    (synopsis "LaTeX support for Metafont logo fonts")
+    (description
+     "This package provides LaTeX and font definition files to access the
 Knuthian mflogo fonts described in The Metafontbook and to typeset Metafont
 logos in LaTeX documents.")
-      (license license:lppl))))
+    (license license:lppl)))
 
 (define-deprecated-package texlive-latex-mflogo texlive-mflogo)
 
-- 
cgit 1.4.1


From e9af0271fd7c1b6d8ff24b7d29b44b980b8e8400 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:15:57 +0200
Subject: gnu: texlive-halloweenmath: Refresh package definition.

* gnu/packages/tex.scm (texlive-halloweenmath): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[native-inputs]: Remove TEXLIVE-BIN, TEXLIVE-KPATHSEA, call to
TEXLIVE-UPDMAP.CFG.  Add TEXLIVE-CM.
---
 gnu/packages/tex.scm | 67 ++++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 85c3e6820d..f4d002d46d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1817,47 +1817,42 @@ discussed in the book).")
 (define-deprecated-package texlive-tex-plain texlive-plain)
 
 (define-public texlive-halloweenmath
-  (let ((template (simple-texlive-package
-                   "texlive-halloweenmath"
-                   (list "doc/latex/halloweenmath/"
-                         "source/latex/halloweenmath/"
-                         "tex/latex/halloweenmath/")
-                   (base32
-                    "1xq72k1p820b5q3haxf936g69p6gv34hr30870l96jnxa3ad7y05"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t) "latex/halloweenmath")
-         ((#:build-targets _ '()) '(list "halloweenmath.ins"))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'chdir 'non-interactive-build
-                ;; When it realizes it cannot employ the usedir directive, the
-                ;; build process stops and waits for an input before inserting
-                ;; generated files in the working directory.  Do not ask for
-                ;; an input.
-                (lambda _
-                  (substitute* "source/latex/halloweenmath/halloweenmath.ins"
-                    (("\\Ask.*") "")
-                    (("\\(your .*? will be ignored\\).*") ""))))))))
-      (native-inputs
-       (list texlive-bin
-             texlive-kpathsea
-             (texlive-updmap.cfg)))     ;for psfonts.map
-      (propagated-inputs
-       (list texlive-amsmath texlive-pict2e))
-      (home-page "https://ctan.org/pkg/halloweenmath")
-      (synopsis "Scary and creepy math symbols with AMS-LaTeX integration")
-      (description
-       "The package defines a handful of commands for typesetting mathematical
+  (package
+    (name "texlive-halloweenmath")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/halloweenmath/"
+                   "source/latex/halloweenmath/"
+                   "tex/latex/halloweenmath/")
+             (base32
+              "1xq72k1p820b5q3haxf936g69p6gv34hr30870l96jnxa3ad7y05")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'non-interactive-build
+            ;; When it realizes it cannot employ the usedir directive, the
+            ;; build process stops and waits for an input before inserting
+            ;; generated files in the working directory.  Do not ask for an
+            ;; input.
+            (lambda _
+              (substitute* "source/latex/halloweenmath/halloweenmath.ins"
+                (("\\Ask.*") "")
+                (("\\(your .*? will be ignored\\).*") "")))))))
+    (native-inputs (list texlive-cm))
+    (home-page "https://ctan.org/pkg/halloweenmath")
+    (synopsis "Scary and creepy math symbols with AMS-LaTeX integration")
+    (description
+     "The package defines a handful of commands for typesetting mathematical
 symbols of various kinds, ranging from large operators to extensible
 arrow-like relations and growing arrow-like math accents that all draw from
 the classic Halloween-related iconography (pumpkins, witches, ghosts, cats,
 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+))))
+    (license license:lppl1.3+)))
 
 (define-public texlive-hardwrap
   (package
-- 
cgit 1.4.1


From dab531f4a0c1e1526900d500a02319cfd9a8dcdd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:17:54 +0200
Subject: gnu: texlive-atveryend: Refresh package definition.

* gnu/packages/tex.scm (texlive-atveryend): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f4d002d46d..6327392351 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3379,29 +3379,28 @@ customize their appearance in the enclosing document.")
     (license license:lppl1.3+)))
 
 (define-public texlive-atveryend
-  (let ((template (simple-texlive-package
-                   "texlive-atveryend"
-                   (list "doc/latex/atveryend/"
-                         "source/latex/atveryend/"
-                         "tex/latex/atveryend/")
-                   (base32 "1rp805h0m99rxs107a798l951lyahlnp7irfklfadn2a2ljzhafn"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:build-targets _ #t)
-          #~(list "atveryend.dtx"))))
-      (home-page "https://ctan.org/macros/latex/contrib/atveryend")
-      (synopsis "Hooks at the very end of a document")
-      (description
-       "This LaTeX packages provides two hooks for @code{\\end{document}} that
+  (package
+    (name "texlive-atveryend")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/atveryend/"
+                   "source/latex/atveryend/"
+                   "tex/latex/atveryend/")
+             (base32
+              "1rp805h0m99rxs107a798l951lyahlnp7irfklfadn2a2ljzhafn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/atveryend")
+    (synopsis "Hooks at the very end of a document")
+    (description
+     "This LaTeX packages provides two hooks for @code{\\end{document}} that
 are executed after the hook of @code{\\AtEndDocument}:
 @code{\\AfterLastShipout} can be used for code that is to be executed right
 after the last @code{\\clearpage} before the @file{.aux} file is closed.
 @code{\\AtVeryEndDocument} is used for code after closing and final reading of
 the @file{.aux} file.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-latex-atveryend texlive-atveryend)
 
-- 
cgit 1.4.1


From 7b46032adf2ea40656643dee75f42eca720d260c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:18:24 +0200
Subject: gnu: texlive-auxhook: Refresh package definition.

* gnu/packages/tex.scm (texlive-auxhook): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6327392351..82f9c14423 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3405,26 +3405,23 @@ the @file{.aux} file.")
 (define-deprecated-package texlive-latex-atveryend texlive-atveryend)
 
 (define-public texlive-auxhook
-  (let ((template (simple-texlive-package
-                   "texlive-auxhook"
-                   (list "doc/latex/auxhook/"
-                         "source/latex/auxhook/"
-                         "tex/latex/auxhook/")
-                   (base32
-                    "1qfs7bz8ryp4prr2fw4hwypnfc6yr4rc4wd8qy4rpmab0hab0vdy"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:build-targets _ '())
-          #~(list "auxhook.dtx"))))
-      (home-page "https://www.ctan.org/pkg/auxhook")
-      (synopsis "Hooks for auxiliary files")
-      (description
-       "This package provides hooks for adding code at the beginning of
+  (package
+    (name "texlive-auxhook")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/auxhook/" "source/latex/auxhook/"
+                   "tex/latex/auxhook/")
+             (base32
+              "1qfs7bz8ryp4prr2fw4hwypnfc6yr4rc4wd8qy4rpmab0hab0vdy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/auxhook")
+    (synopsis "Hooks for auxiliary files")
+    (description
+     "This package provides hooks for adding code at the beginning of
 @file{.aux} files.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-latex-auxhook texlive-auxhook)
 
-- 
cgit 1.4.1


From 5c0d75bf1e1039ebb61bd4533d24cc85ecf29886 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:19:22 +0200
Subject: gnu: texlive-epstopdf-pkg: Refresh package definition.

* gnu/packages/tex.scm (texlive-epstopdf-pkg): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 82f9c14423..0e705ea25c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3426,33 +3426,30 @@ the @file{.aux} file.")
 (define-deprecated-package texlive-latex-auxhook texlive-auxhook)
 
 (define-public texlive-epstopdf-pkg
-  (let ((template (simple-texlive-package
-                   "texlive-epstopdf-pkg"
-                   (list "doc/latex/epstopdf-pkg/"
-                         "source/latex/epstopdf-pkg/"
-                         "tex/latex/epstopdf-pkg/")
-                   (base32
-                    "1ajyc5pkn1niifz5asyf09vbdqvmy05xwl0vxcdl7ik0ll0jcaxp"))))
-    (package
-     (inherit template)
-     (arguments
-      (substitute-keyword-arguments (package-arguments template)
-        ((#:tex-directory _ '())
-         "latex/epstopdf-pkg")
-        ((#:build-targets _ '())
-         #~(list "epstopdf.ins"))))
-     (propagated-inputs
-      (list texlive-grfext
-            texlive-infwarerr
-            texlive-kvoptions
-            texlive-pdftexcmds))
-     (home-page "https://www.ctan.org/pkg/epstopdf-pkg")
-     (synopsis "Call @command{epstopdf} on the fly")
-     (description
-      "The package adds support for EPS files in the @code{graphicx} package
+  (package
+    (name "texlive-epstopdf-pkg")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/epstopdf-pkg/"
+                   "source/latex/epstopdf-pkg/"
+                   "tex/latex/epstopdf-pkg/")
+             (base32
+              "1ajyc5pkn1niifz5asyf09vbdqvmy05xwl0vxcdl7ik0ll0jcaxp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-grfext
+           texlive-infwarerr
+           texlive-kvoptions
+           texlive-pdftexcmds))
+    (home-page "https://www.ctan.org/pkg/epstopdf-pkg")
+    (synopsis "Call @command{epstopdf} on the fly")
+    (description
+     "The package adds support for EPS files in the @code{graphicx} package
 when running under pdfTeX.  If an EPS graphic is detected, the package spawns
 a process to convert the EPS to PDF, using the script @command{epstopdf}.")
-     (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-latex-epstopdf-pkg texlive-epstopdf-pkg)
 
-- 
cgit 1.4.1


From 8a7628247ea6f1cfb41bdd0ac022bc09f2938ffa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:20:02 +0200
Subject: gnu: texlive-filecontents: Refresh package definition.

* gnu/packages/tex.scm (texlive-filecontents): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0e705ea25c..186274bead 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3454,29 +3454,29 @@ a process to convert the EPS to PDF, using the script @command{epstopdf}.")
 (define-deprecated-package texlive-latex-epstopdf-pkg texlive-epstopdf-pkg)
 
 (define-public texlive-filecontents
-  (let ((template (simple-texlive-package
-                   "texlive-filecontents"
-                   (list "doc/latex/filecontents/"
-                         "source/latex/filecontents/"
-                         "tex/latex/filecontents/")
-                   (base32
-                    "0ifhqfdzx91hrmndhg5441rpmv9k4lxrql02kd5yx75xpplxryzw"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '()) "latex/filecontents")))
-      (home-page "https://ctan.org/pkg/filecontents")
-      (synopsis "Create an external file from within a LaTeX document")
-      (description
-       "LaTeX2e's @code{filecontents} and @code{filecontents*} environments
+  (package
+    (name "texlive-filecontents")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/filecontents/"
+                   "source/latex/filecontents/"
+                   "tex/latex/filecontents/")
+             (base32
+              "0ifhqfdzx91hrmndhg5441rpmv9k4lxrql02kd5yx75xpplxryzw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/filecontents")
+    (synopsis "Create an external file from within a LaTeX document")
+    (description
+     "LaTeX2e's @code{filecontents} and @code{filecontents*} environments
 enable a LaTeX source file to generate external files as it runs through
 LaTeX.  However, there are two limitations of these environments: they refuse
 to overwrite existing files, and they can only be used in the preamble of
 a document.  The filecontents package removes these limitations, letting you
 overwrite existing files and letting you use @code{filecontents}
 @code{filecontents*} anywhere.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-latex-filecontents texlive-filecontents)
 
-- 
cgit 1.4.1


From 927fd738e626bd25dc9e8561223019575b19bfaa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:21:08 +0200
Subject: gnu: texlive-graphics: Refresh package definition.

* gnu/packages/tex.scm (texlive-graphics): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 186274bead..214c4a6e45 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3630,31 +3630,29 @@ set default \"driver\" options for the color and graphics packages.")
     (license license:public-domain)))
 
 (define-public texlive-graphics
-  (let ((template (simple-texlive-package
-                   "texlive-graphics"
-                   (list "doc/latex/graphics/"
-                         "source/latex/graphics/"
-                         "tex/latex/graphics/")
-                   (base32
-                    "0prw1zcv4fcj3zg0kyhj0k7ax0530adl60bajzvbv3fi16d7rqlq"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/graphics")
-         ((#:build-targets _ '())
-          #~(list "graphics-drivers.ins" "graphics.ins"))))
-      (propagated-inputs (list texlive-graphics-def texlive-graphics-cfg))
-      (home-page "https://ctan.org/macros/latex/required/graphics")
-      (synopsis "The LaTeX standard graphics bundle")
-      (description
-       "This is a collection of LaTeX packages for: producing colour including
+  (package
+    (name "texlive-graphics")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/graphics/"
+                   "source/latex/graphics/"
+                   "tex/latex/graphics/")
+             (base32
+              "0prw1zcv4fcj3zg0kyhj0k7ax0530adl60bajzvbv3fi16d7rqlq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics-def texlive-graphics-cfg))
+    (home-page "https://ctan.org/macros/latex/required/graphics")
+    (synopsis "The LaTeX standard graphics bundle")
+    (description
+     "This is a collection of LaTeX packages for: producing colour including
 graphics (e.g., PostScript) files rotation and scaling of text in LaTeX
-documents.  It comprises the packages color, graphics, graphicx, trig, epsfig,
-keyval, and lscape.")
-      (license license:lppl1.3c))))
+documents.  It comprises the packages @code{color}, @code{graphics},
+@code{graphicx}, @code{trig}, @code{epsfig}, @code{keyval}, and
+@code{lscape}.")
+    (license license:lppl1.3c)))
 
 (define-deprecated-package texlive-latex-graphics texlive-graphics)
 
-- 
cgit 1.4.1


From fdff8fcc0f4951d83f0c2cd7501b76fbf1ed2195 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:23:55 +0200
Subject: gnu: Add texlive-hopatch.

* gnu/packages/tex.scm (texlive-hopatch): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 214c4a6e45..dfd4f0d68f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -782,6 +782,29 @@ out to date by @code{unicode-letters.tex}.")
 
 (define-deprecated-package texlive-generic-unicode-data texlive-unicode-data)
 
+(define-public texlive-hopatch
+  (package
+    (name "texlive-hopatch")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hopatch/" "source/latex/hopatch/"
+                   "tex/latex/hopatch/")
+             (base32
+              "1yc9pzh8h4caaxii197jzd8wmvj754ymdq5x2hvmn171mxqp4d3v")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-ltxcmds))
+    (home-page "https://ctan.org/pkg/hopatch")
+    (synopsis "Load patches for packages")
+    (description
+     "Hopatch provides a command with which the user may register of patch code
+for a particular package.  Hopatch will apply the patch immediately, if the
+relevant package has already been loaded; otherwise it will store the patch
+until the package appears.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-hyphen-base
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 64403b87f1ac3498ea1122a978080f77d2d93ea5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:21:46 +0200
Subject: gnu: texlive-hycolor: Refresh package definition.

* gnu/packages/tex.scm (texlive-hycolor): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-HOPATCH.
---
 gnu/packages/tex.scm | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dfd4f0d68f..bd397bf7c3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3697,28 +3697,26 @@ for Greek text font encodings for use with fontenc.")
     (license license:lppl1.3+)))
 
 (define-public texlive-hycolor
-  (let ((template  (simple-texlive-package
-                    "texlive-hycolor"
-                    (list "doc/latex/hycolor/"
-                          "source/latex/hycolor/"
-                          "tex/latex/hycolor/")
-                    (base32
-                     "0hmkx37wwmznxjqqnca87shy7qrgqrh2cn5r941ddgivnym31xbh"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/hycolor")
-         ((#:build-targets _ '())
-          #~(list "hycolor.dtx"))))
-      (home-page "https://www.ctan.org/pkg/latex-graphics")
-      (synopsis "Color for hyperref and bookmark")
-      (description
-       "This package provides the code for the @code{color} option that is
-used by @code{hyperref} and @code{bookmark}.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-hycolor")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hycolor/" "source/latex/hycolor/"
+                   "tex/latex/hycolor/")
+             (base32
+              "0hmkx37wwmznxjqqnca87shy7qrgqrh2cn5r941ddgivnym31xbh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-hopatch))
+    (home-page "https://ctan.org/pkg/hycolor")
+    (synopsis "Colour for packages @code{hyperref} and @code{bookmark}")
+    (description
+     "This package provides the code for the color option that is used by
+packages @code{hyperref} and @code{bookmark}.  It is not intended as a package
+for the user.")
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-latex-hycolor texlive-hycolor)
 
-- 
cgit 1.4.1


From 6384af5f3128cc4b07c33c7668dba169f8ea00be Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:26:27 +0200
Subject: gnu: texlive-xcolor: Refresh package definition.

* gnu/packages/tex.scm (texlive-xcolor): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 49 ++++++++++++++++++++++---------------------------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bd397bf7c3..19d27dcd52 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3721,37 +3721,32 @@ for the user.")
 (define-deprecated-package texlive-latex-hycolor texlive-hycolor)
 
 (define-public texlive-xcolor
-  (let ((template (simple-texlive-package
-                   "texlive-xcolor"
-                   (list "doc/latex/xcolor/"
-                         "dvips/xcolor/"
-                         "source/latex/xcolor/"
-                         "tex/latex/xcolor/")
-                   (base32
-                    "1d7108b67fcaf1sgyk43ph18l0z5m35iqg3aahqs1ymzwdfnd3f7"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/xcolor")
-         ((#:build-targets _ '())
-          #~(list "xcolor.ins"))))
-      ;; TODO: Propagate texlive-hyperref and many others in the next rebuild
-      ;; cycle.  Grep for '\usepackage' to see what packages it requires.
-      ;; (propagated-inputs (list texlive-hyperref ...))
-      (home-page "https://www.ctan.org/pkg/xcolor")
-      (synopsis "Driver-independent color extensions for LaTeX and pdfLaTeX")
-      (description
-       "The package starts from the basic facilities of the colorcolor package,
+  (package
+    (name "texlive-xcolor")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xcolor/" "dvips/xcolor/"
+                   "source/latex/xcolor/" "tex/latex/xcolor/")
+             (base32
+              "1d7108b67fcaf1sgyk43ph18l0z5m35iqg3aahqs1ymzwdfnd3f7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-colortbl
+           texlive-hyperref
+           texlive-lwarp))
+    (home-page "https://ctan.org/pkg/xcolor")
+    (synopsis "Driver-independent color extensions for LaTeX and pdfLaTeX")
+    (description
+     "The package starts from the basic facilities of the colorcolor package,
 and provides easy driver-independent access to several kinds of color tints,
-shades, tones, and mixes of arbitrary colors.  It allows a user to select a
-document-wide target color model and offers complete tools for conversion
+shades, tones, and mixes of arbitrary colors.  It allows a user to select
+a document-wide target color model and offers complete tools for conversion
 between eight color models.  Additionally, there is a command for alternating
 row colors plus repeated non-aligned material (like horizontal lines) in
 tables.")
-      (license license:lppl1.2+))))
+    (license license:lppl1.2+)))
 
 (define-deprecated-package texlive-latex-xcolor texlive-xcolor)
 
-- 
cgit 1.4.1


From 3de942e71eb7fa810782486abc9cf1370c81f491 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:27:11 +0200
Subject: gnu: texlive-hyperref: Refresh package definition.

* gnu/packages/tex.scm (texlive-hyperref): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 79 ++++++++++++++++++++++++++--------------------------
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 19d27dcd52..d53b999ae8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3845,52 +3845,51 @@ UTF-8 or a suitable 8-bit encoding.")
     (license license:lppl1.0+)))        ;per xmltex/base/readme.txt
 
 (define-public texlive-hyperref
-  (let ((template (simple-texlive-package
-                   "texlive-hyperref"
-                   (list "doc/latex/hyperref/"
-                         "source/latex/hyperref/"
-                         "tex/latex/hyperref/")
-                   (base32 "052k1nygm4msaivn8245n86km4h41knivigw80q58b7rc13s6hrk"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/hyperref")
-         ((#:build-targets _ '())
-          #~(list "hyperref.ins"))))
-      (propagated-inputs
-       (list texlive-atbegshi
-             texlive-auxhook
-             texlive-bitset
-             texlive-cm
-             texlive-etexcmds
-             texlive-gettitlestring
-             texlive-graphics           ;for keyval
-             texlive-hycolor
-             texlive-intcalc
-             texlive-kvdefinekeys
-             texlive-kvsetkeys
-             texlive-letltxmacro
-             texlive-ltxcmds
-             texlive-pdfescape
-             texlive-refcount
-             texlive-rerunfilecheck
-             texlive-stringenc
-             texlive-url
-             texlive-zapfding))
-      (home-page "https://www.ctan.org/pkg/hyperref")
-      (synopsis "Extensive support for hypertext in LaTeX")
-      (description
-       "The @code{hyperref} package is used to handle cross-referencing commands
+  (package
+    (name "texlive-hyperref")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hyperref/"
+                   "source/latex/hyperref/"
+                   "tex/latex/hyperref/")
+             (base32
+              "052k1nygm4msaivn8245n86km4h41knivigw80q58b7rc13s6hrk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-atbegshi
+           texlive-auxhook
+           texlive-bitset
+           texlive-cm
+           texlive-etexcmds
+           texlive-gettitlestring
+           texlive-graphics             ;for keyval
+           texlive-hycolor
+           texlive-intcalc
+           texlive-kvdefinekeys
+           texlive-kvsetkeys
+           texlive-letltxmacro
+           texlive-ltxcmds
+           texlive-pdfescape
+           texlive-refcount
+           texlive-rerunfilecheck
+           texlive-stringenc
+           texlive-url
+           texlive-zapfding))
+    (home-page "https://www.ctan.org/pkg/hyperref")
+    (synopsis "Extensive support for hypertext in LaTeX")
+    (description
+     "The @code{hyperref} package is used to handle cross-referencing commands
 in LaTeX to produce hypertext links in the document.  The package provides
 backends for the @code{\\special} set defined for HyperTeX DVI processors; for
 embedded @code{pdfmark} commands for processing by Acrobat
 Distiller (@code{dvips} and Y&Y's @code{dvipsone}); for Y&Y's @code{dviwindo};
 for PDF control within pdfTeX and @code{dvipdfm}; for TeX4ht; and for VTeX's
 pdf and HTML backends.  The package is distributed with the @code{backref} and
-@code{nameref} packages, which make use of the facilities of @code{hyperref}.")
-      (license license:lppl1.3+))))
+@code{nameref} packages, which make use of the facilities of
+@code{hyperref}.")
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-latex-hyperref texlive-hyperref)
 
-- 
cgit 1.4.1


From fbbb79acad1e22affbd1ca2d219eacba176e0db7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:27:46 +0200
Subject: gnu: texlive-oberdiek: Refresh package definition.

* gnu/packages/tex.scm (texlive-oberdiek): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 56 +++++++++++++++++++++++-----------------------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d53b999ae8..9ca6deced2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3941,39 +3941,33 @@ is compatible with pdfLaTeX, XeLaTeX, LaTeX+dvipdfm, and LaTeX+dvips+ps2pdf.")
     (license license:lppl1.3c)))
 
 (define-public texlive-oberdiek
-  (let ((template (simple-texlive-package
-                   "texlive-oberdiek"
-                   (list "bibtex/bib/oberdiek/"
-                         "doc/latex/oberdiek/"
-                         "source/latex/oberdiek/"
-                         "tex/generic/oberdiek/"
-                         "tex/latex/oberdiek/")
-                   (base32
-                    "00lp24fckawpy997j7zagsxv89jif40wgjq8fw502v06d225ikp3"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/oberdiek")
-         ((#:build-targets _ '())
-          #~(list "oberdiek.ins"))))
-      (propagated-inputs
-       (list texlive-auxhook
-             texlive-grfext
-             texlive-grffile
-             texlive-iftex
-             texlive-infwarerr
-             texlive-kvoptions
-             texlive-pdftexcmds))
-      (home-page "https://www.ctan.org/pkg/oberdiek")
-      (synopsis "Bundle of packages submitted by Heiko Oberdiek")
-      (description
-       "The bundle comprises various LaTeX packages, providing among others:
+  (package
+    (name "texlive-oberdiek")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/oberdiek/" "doc/latex/oberdiek/"
+                   "source/latex/oberdiek/"
+                   "tex/generic/oberdiek/" "tex/latex/oberdiek/")
+             (base32
+              "00lp24fckawpy997j7zagsxv89jif40wgjq8fw502v06d225ikp3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-auxhook
+           texlive-grfext
+           texlive-grffile
+           texlive-iftex
+           texlive-infwarerr
+           texlive-kvoptions
+           texlive-pdftexcmds))
+    (home-page "https://www.ctan.org/pkg/oberdiek")
+    (synopsis "Bundle of packages submitted by Heiko Oberdiek")
+    (description
+     "The bundle comprises various LaTeX packages, providing among others:
 better accessibility support for PDF files; extensible chemists reaction
 arrows; record information about document class(es) used; and many more.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-latex-oberdiek texlive-oberdiek)
 
-- 
cgit 1.4.1


From c8eaea2edcc0173ab0440ef4b49fe631f1b746a9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:28:21 +0200
Subject: gnu: texlive-rerunfilecheck: Refresh package definition.

* gnu/packages/tex.scm (texlive-rerunfilecheck): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 52 ++++++++++++++++++++++++----------------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9ca6deced2..9d9fc06def 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3998,34 +3998,30 @@ experimental packages.")
     (license license:lppl1.3c)))
 
 (define-public texlive-rerunfilecheck
-  (let ((template (simple-texlive-package
-                   "texlive-rerunfilecheck"
-                   (list "doc/latex/rerunfilecheck/"
-                         "source/latex/rerunfilecheck/"
-                         "tex/latex/rerunfilecheck/")
-                   (base32
-                    "0f53b6dlnlrxkzj7h7x750p0489i2gg3isfqn0dlpncpq23w1r36"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/rerunfilecheck")
-         ((#:build-targets _ '())
-          #~(list "rerunfilecheck.dtx"))))
-      (propagated-inputs
-       (list texlive-atveryend
-             texlive-infwarerr
-             texlive-kvoptions
-             texlive-pdftexcmds
-             texlive-uniquecounter))
-      (home-page "https://www.ctan.org/pkg/rerunfilecheck")
-      (synopsis "Checksum based rerun checks on auxiliary files")
-      (description
-       "This package provides additional rerun warnings if some auxiliary
-files have changed.  It is based on MD5 checksum, provided by pdfTeX.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-rerunfilecheck")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/rerunfilecheck/"
+                   "source/latex/rerunfilecheck/"
+                   "tex/latex/rerunfilecheck/")
+             (base32
+              "0f53b6dlnlrxkzj7h7x750p0489i2gg3isfqn0dlpncpq23w1r36")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-atveryend
+           texlive-infwarerr
+           texlive-kvoptions
+           texlive-pdftexcmds
+           texlive-uniquecounter))
+    (home-page "https://www.ctan.org/pkg/rerunfilecheck")
+    (synopsis "Checksum based rerun checks on auxiliary files")
+    (description
+     "This package provides additional rerun warnings if some auxiliary files
+have changed.  It is based on MD5 checksum, provided by pdfTeX.")
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-latex-rerunfilecheck texlive-rerunfilecheck)
 
-- 
cgit 1.4.1


From 971024acf6586e9315c53e14dfc3220710256e53 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 00:29:36 +0200
Subject: gnu: texlive-tools: Refresh package definition.

* gnu/packages/tex.scm (texlive-tools): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 74 +++++++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 39 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9d9fc06def..60df6b40a6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4026,52 +4026,48 @@ have changed.  It is based on MD5 checksum, provided by pdfTeX.")
 (define-deprecated-package texlive-latex-rerunfilecheck texlive-rerunfilecheck)
 
 (define-public texlive-onedown
-  (let ((template
-         (simple-texlive-package
-          "texlive-onedown"
-          (list "doc/latex/onedown/"
-                "source/latex/onedown/"
-                "tex/latex/onedown/")
-          (base32
-           "04ih7i4v96ggwk4k1mpfx3dzcpi2siqablv93wryg7dk4cks5wkl"))))
-    (package
-      (inherit template)
-      (outputs '("doc" "out"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t) "latex/onedown")))
-      (home-page "https://ctan.org/pkg/onedown")
-      (synopsis "Typeset bridge diagrams")
-      (description
-       "This is a comprehensive package to draw all sorts of bridge diagrams,
+  (package
+    (name "texlive-onedown")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/onedown/"
+                   "source/latex/onedown/"
+                   "tex/latex/onedown/")
+             (base32
+              "04ih7i4v96ggwk4k1mpfx3dzcpi2siqablv93wryg7dk4cks5wkl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/onedown")
+    (synopsis "Typeset bridge diagrams")
+    (description
+     "This is a comprehensive package to draw all sorts of bridge diagrams,
 including hands, bidding tables, trick tables, and expert quizzes.
 
 It works for all font sizes.  Different fonts for hands, bidding diagrams and
 compass are possible.  It also provides annotations to card and bidding
 diagrams, automated check on consistency of suit and hands, and multilingual
 output of bridge terms.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
 
 (define-public texlive-tools
-  (let ((template (simple-texlive-package
-                   "texlive-tools"
-                   (list "doc/latex/tools/"
-                         "source/latex/tools/"
-                         "tex/latex/tools/")
-                   (base32
-                    "0c0ixkcvrlzx6sdj25ak3bx0j65qghf51w66yg5wlnpg08d3awrs"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/tools")
-         ((#:build-targets _ '())
-          #~(list "tools.ins"))))
-      (home-page "https://www.ctan.org/tex-archive/macros/latex/required/tools/")
-      (synopsis "LaTeX standard tools bundle")
-      (description "This package provides a collection of simple tools that
+  (package
+    (name "texlive-tools")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tools/"
+                   "source/latex/tools/"
+                   "tex/latex/tools/")
+             (base32
+              "0c0ixkcvrlzx6sdj25ak3bx0j65qghf51w66yg5wlnpg08d3awrs")))
+    (outputs '("out" "doc"))
+    (arguments
+     (list #:build-targets #~(list "tools.ins")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tools")
+    (synopsis "The LaTeX standard tools bundle")
+    (description "This package provides a collection of simple tools that
 are part of the LaTeX required tools distribution, comprising the packages:
 @code{afterpage}, @code{array}, @code{bm}, @code{calc}, @code{dcolumn},
 @code{delarray}, @code{enumerate}, @code{fileerr}, @code{fontsmpl},
@@ -4079,7 +4075,7 @@ are part of the LaTeX required tools distribution, comprising the packages:
 @code{longtable}, @code{multicol}, @code{rawfonts}, @code{showkeys},
 @code{somedefs}, @code{tabularx}, @code{theorem}, @code{trace},
 @code{varioref}, @code{verbatim}, @code{xr}, and @code{xspace}.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-latex-tools texlive-tools)
 
-- 
cgit 1.4.1


From 077a52a9cd65024563c9c01c2adf6c92e65136c2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 14:53:44 +0200
Subject: gnu: texlive-amsfonts: Refresh package definition.

* gnu/packages/tex.scm (texlive-amsfonts): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[arguments]<#:phases>: Generate font metrics from source.
---
 gnu/packages/tex.scm | 126 ++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 100 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 60df6b40a6..135e2beb0f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1698,41 +1698,115 @@ Taco Hoekwater.")
 (define-deprecated-package texlive-fonts-mflogo-font texlive-mflogo-font)
 
 (define-public texlive-amsfonts
-  (let ((template (simple-texlive-package
-                   "texlive-amsfonts"
-                   (list "/source/latex/amsfonts/"
-                         "/fonts/source/public/amsfonts/"
-                         "/fonts/type1/public/amsfonts/"
-                         "/fonts/afm/public/amsfonts/"
-                         "/fonts/tfm/public/amsfonts/"
-                         "/fonts/map/dvips/amsfonts/"
-                         "/tex/plain/amsfonts/"
-                         "/doc/fonts/amsfonts/")
-                   (base32
-                    "1rpl87643q8v6gcqsz68mjha8wac6cqx7mr16ds8f0ccbw7a4w9b"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:build-targets _ #t)
-          '(list "amsfonts.ins"))))
-      (home-page "https://www.ctan.org/pkg/amsfonts")
-      (synopsis "TeX fonts from the American Mathematical Society")
-      (description
-       "This package provides an extended set of fonts for use in mathematics,
+  (package
+    (name "texlive-amsfonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/amsfonts/"
+                   "fonts/afm/public/amsfonts/cm/"
+                   "fonts/afm/public/amsfonts/cmextra/"
+                   "fonts/afm/public/amsfonts/cyrillic/"
+                   "fonts/afm/public/amsfonts/euler/"
+                   "fonts/afm/public/amsfonts/latxfont/"
+                   "fonts/afm/public/amsfonts/symbols/"
+                   "fonts/map/dvips/amsfonts/"
+                   "fonts/source/public/amsfonts/cmextra/"
+                   "fonts/source/public/amsfonts/cyrillic/"
+                   "fonts/source/public/amsfonts/dummy/"
+                   "fonts/source/public/amsfonts/symbols/"
+                   "fonts/tfm/public/amsfonts/cmextra/"
+                   "fonts/tfm/public/amsfonts/cyrillic/"
+                   "fonts/tfm/public/amsfonts/dummy/"
+                   "fonts/tfm/public/amsfonts/euler/"
+                   "fonts/tfm/public/amsfonts/symbols/"
+                   "fonts/type1/public/amsfonts/cm/"
+                   "fonts/type1/public/amsfonts/cmextra/"
+                   "fonts/type1/public/amsfonts/cyrillic/"
+                   "fonts/type1/public/amsfonts/euler/"
+                   "fonts/type1/public/amsfonts/latxfont/"
+                   "fonts/type1/public/amsfonts/symbols/"
+                   "source/latex/amsfonts/"
+                   "tex/latex/amsfonts/"
+                   "tex/plain/amsfonts/")
+             (base32
+              "0phhzcxapa5607pk37agr981rg90zw2p4rqv7sk7i19byr867a1b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:modules
+      '((guix build texlive-build-system)
+        (guix build utils)
+        (srfi srfi-1)
+        (srfi srfi-26))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'generate-fonts-metrics
+            (lambda _
+              (let ((cm #$(this-package-native-input "texlive-cm"))
+                    (metafont #$(this-package-native-input "texlive-metafont"))
+                    (fonts-directories
+                     (delete-duplicates
+                      (map (lambda (f)
+                             (string-drop (dirname f) (string-length "./")))
+                           (find-files "." "[0-9]+\\.mf$"))))
+                    (root (getcwd)))
+                (mkdir-p "build")
+                ;; Tell mf where to find mf.base.
+                (setenv "MFBASES"
+                        (string-append metafont "/share/texmf-dist/web2c/"))
+                (for-each
+                 (lambda (directory)
+                   ;; Tell mf where to look for source files.
+                   (setenv "MFINPUTS"
+                           (string-append
+                            (getcwd) "/" directory ":"
+                            metafont "/share/texmf-dist/metafont/base/:"
+                            cm "/share/texmf-dist/fonts/source/public/cm/"))
+                   ;; Build font metrics (tfm).
+                   (with-directory-excursion directory
+                     (for-each (lambda (font)
+                                 (format #t "building font ~a\n" font)
+                                 (invoke "mf" "-progname=mf"
+                                         (string-append "-output-directory="
+                                                        root "/build")
+                                         (string-append "\\"
+                                                        "mode:=ljfour; "
+                                                        "mag:=1; "
+                                                        "batchmode; "
+                                                        "input "
+                                                        (basename font ".mf"))))
+                               (find-files "." "[0-9]+\\.mf$")))
+                   ;; Install font metrics at the appropriate location.
+                   (let ((destination
+                          ;; fonts/source/xxx/yyy/... -> fonts/tfm/xxx/yyy/...
+                          (string-append "fonts/tfm"
+                                         (string-drop
+                                          directory
+                                          (string-length "fonts/source")))))
+                     (format #t "moving font metrics in ~a\n" destination)
+                     (for-each (cut install-file <> destination)
+                               (find-files "build/" "\\.tfm$"))))
+                 fonts-directories)))))))
+    (native-inputs
+     (list texlive-kpathsea texlive-cm texlive-metafont))
+    (home-page "https://ctan.org/pkg/amsfonts")
+    (synopsis "TeX fonts from the American Mathematical Society")
+    (description
+     "This package provides an extended set of fonts for use in mathematics,
 including: extra mathematical symbols; blackboard bold letters (uppercase
 only); fraktur letters; subscript sizes of bold math italic and bold Greek
 letters; subscript sizes of large symbols such as sum and product; added sizes
 of the Computer Modern small caps font; cyrillic fonts (from the University of
-Washington); Euler mathematical fonts.  All fonts are provided as Adobe Type 1
-files, and all except the Euler fonts are provided as Metafont source.  The
+Washington); Euler mathematical fonts.  All fonts are provided as Adobe Type
+1 files, and all except the Euler fonts are provided as METAFONT source.  The
 distribution also includes the canonical Type 1 versions of the Computer
 Modern family of fonts.  The Euler fonts are supported by separate packages;
 details can be found in the documentation.")
-      (license license:silofl1.1))))
+    (license license:silofl1.1)))
 
 (define-deprecated-package texlive-fonts-amsfonts texlive-amsfonts)
-
 (define-deprecated-package texlive-latex-amsfonts texlive-amsfonts)
 
 (define-public texlive-mkpattern
-- 
cgit 1.4.1


From d1eaabcf86d4b5e5d1379ebe077c47fe899dfef1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 14:57:34 +0200
Subject: gnu: texlive-jadetex: Refresh package definition.

* gnu/packages/tex.scm (texlive-jadetex): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[native-inputs]: Add TEXLIVE-AMSFONTS, TEXLIVE-CM, TEXLIVE-COLORTBL,
TEXLIVE-FANCYHDR, TEXLIVE-GRAPHICS, TEXLIVE-HYPERREF, TEXLIVE-JKNAPLTX,
TEXLIVE-LATEX-FONTS, TEXLIVE-LETLTXMACRO, TEXLIVE-MARVOSYM,
TEXLIVE-TEX-INI-FILES, TEXLIVE-TOOLS, TEXLIVE-ULEM.
[propagated-inputs]: Add TEXLIVE-AMSFONTS, TEXLIVE-ATBEGSHI,
TEXLIVE-ATVERYEND, TEXLIVE-AUXHOOK, TEXLIVE-BIGINTCALC, TEXLIVE-BITSET,
TEXLIVE-COLORTBL, TEXLIVE-DEHYPH, TEXLIVE-EC, TEXLIVE-ETEXCMDS,
TEXLIVE-EVERYSHI, TEXLIVE-FANCYHDR, TEXLIVE-FIRSTAID, TEXLIVE-HYCOLOR,
TEXLIVE-HYPERREF, TEXLIVE-HYPH-UTF8, TEXLIVE-HYPHEN-BASE, TEXLIVE-LATEXCONFIG,
TEXLIVE-IFTEX, TEXLIVE-INFWARERR, TEXLIVE-INTCALC, TEXLIVE-KVDEFINEKEYS,
TEXLIVE-KVOPTIONS, TEXLIVE-KVSETKEYS, TEXLIVE-L3BACKEND, TEXLIVE-L3KERNEL,
TEXLIVE-L3PACKAGES, TEXLIVE-LATEXCONFIG, TEXLIVE-LETLTXMACRO, TEXLIVE-LTXCMDS,
TEXLIVE-MARVOSYM, TEXLIVE-PASSIVETEX, TEXLIVE-PDFESCAPE, TEXLIVE-PDFTEX,
TEXLIVE-PDFTEXCMDS, TEXLIVE-RERUNFILECHECK, TEXLIVE-STMARYRD, TEXLIVE-SYMBOL,
TEXLIVE-TIPA, TEXLIVE-UNICODE-DATA, TEXLIVE-UNIQUECOUNTER, TEXLIVE-URL,
TEXLIVE-WASYSYM, TEXLIVE-XMLTEX, TEXLIVE-ZAPFDING.
---
 gnu/packages/tex.scm | 186 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 114 insertions(+), 72 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 135e2beb0f..b5a0775f3b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8097,87 +8097,129 @@ of ink traps which typify the Kurier font.")
 (define-deprecated-package texlive-fonts-iwona texlive-iwona)
 
 (define-public texlive-jadetex
-  (let ((template (simple-texlive-package
-                   "texlive-jadetex"
-                   (list "/doc/man/man1/jadetex.1"
-                         "/doc/man/man1/jadetex.man1.pdf"
-                         "/doc/man/man1/pdfjadetex.1"
-                         "/doc/man/man1/pdfjadetex.man1.pdf"
-                         "/source/jadetex/base/"
-                         ;; The following files are not generated from
-                         ;; sources.
-                         "/tex/jadetex/base/jadetex.ini"
-                         "/tex/jadetex/base/pdfjadetex.ini"
-                         "/tex/jadetex/base/uentities.sty")
-                   (base32
-                    "03chyc3vjqgxcj985gy4k0bd0lf1n4a6sgbhc7k84jparjk3hx4i"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "jadetex/base")
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'unify-source-directory
-               (lambda _
-                 (chdir "source/jadetex/base")
-                 (for-each (lambda (f)
-                             (copy-file f (basename f)))
-                           (find-files "../../../tex/jadetex/base"))
-                 #t))
-             (add-after 'build 'generate-formats
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (mkdir "web2c")
-                 (for-each (lambda (f)
-                             (symlink f (basename f)))
-                           (find-files "build"))
-                 (invoke "fmtutil-sys" "--byfmt" "jadetex"
-                         "--fmtdir=web2c")
-                 (invoke "fmtutil-sys" "--byfmt" "pdfjadetex"
-                         "--fmtdir=web2c")))
-             (add-after 'install 'install-formats-and-wrappers
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 (let* ((out (assoc-ref outputs "out"))
-                        (texlive-bin (assoc-ref inputs "texlive-bin"))
-                        (pdftex (string-append texlive-bin "/bin/pdftex"))
-                        (web2c (string-append out "/share/texmf-dist/web2c")))
-                   (mkdir-p web2c)
-                   (copy-recursively "web2c" web2c)
-                   ;; Create convenience command wrappers.
-                   (mkdir-p (string-append out "/bin"))
-                   (symlink pdftex (string-append out "/bin/jadetex"))
-                   (symlink pdftex (string-append out "/bin/pdfjadetex"))
-                   #t)))))))
-      (propagated-inputs
-       ;; Propagate the texlive-updmap.cfg input used by xmltex, which provides the
-       ;; required fonts for its use.
-       (list texlive-xmltex texlive-kpathsea)) ;for fmtutil.cnf template
-      (native-inputs
-       (list texlive-cm ;for cmex10 and others
-             texlive-latex-fonts        ;for lasy6
-             ;; The t1cmr.fd file of texlive-latex-base refers to the ecrm font,
-             ;; provided by the jknappen package collection.
-             texlive-jknapltx
-             texlive-hyperref
+  (package
+    (name "texlive-jadetex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/jadetex.1"
+                   "doc/man/man1/jadetex.man1.pdf"
+                   "doc/man/man1/pdfjadetex.1"
+                   "doc/man/man1/pdfjadetex.man1.pdf"
+                   "doc/otherformats/jadetex/base/"
+                   "source/jadetex/base/"
+                   "tex/jadetex/base/")
+             (base32
+              "0acan496ixymwjvygcd5rx5pmz4p5vffzkmazdryw1kpilhiixcx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'build 'bring-ini-files
+            (lambda _
+              (for-each (lambda (f) (install-file f "build"))
+                        (find-files "tex/jadetex/base"))))
+          (add-after 'bring-ini-files 'generate-formats
+            (lambda* (#:key inputs #:allow-other-keys)
+              (mkdir "web2c")
+              (with-directory-excursion "build"
+                (invoke "fmtutil-sys" "--byfmt" "jadetex"
+                        "--fmtdir=../web2c")
+                (invoke "fmtutil-sys" "--byfmt" "pdfjadetex"
+                        "--fmtdir=../web2c"))))
+          (add-after 'install 'install-formats-and-wrappers
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((pdftex (search-input-file inputs "/bin/pdftex"))
+                    (web2c (string-append #$output "/share/texmf-dist/web2c")))
+                (mkdir-p web2c)
+                (copy-recursively "web2c" web2c)
+                (for-each delete-file (find-files web2c "\\.log$"))
+                ;; Create convenience command wrappers.
+                (mkdir-p (string-append #$output "/bin"))
+                (symlink pdftex
+                         (string-append #$output "/bin/jadetex"))
+                (symlink pdftex
+                         (string-append #$output "/bin/pdfjadetex"))))))))
+    (native-inputs
+     (list texlive-amsfonts
+           texlive-cm                   ;for cmex10 and others
+           texlive-colortbl
+           texlive-fancyhdr
+           texlive-graphics             ;for color.sty
+           texlive-hyperref
+           ;; The t1cmr.fd file of texlive-latex-base refers to the ecrm font,
+           ;; provided by the jknapltx package collection.
+           texlive-jknapltx
+           texlive-latex-fonts          ;for lasy6
+           texlive-letltxmacro
+           texlive-marvosym
+           texlive-tex-ini-files        ;for pdftexconfig
+           texlive-tools                ;for array.sty
+           texlive-ulem))               ;for fmtutil.cnf template
+    (propagated-inputs
+     (list
+      (texlive-updmap.cfg
+       (list texlive-amsfonts
+             texlive-atbegshi
+             texlive-atveryend
+             texlive-auxhook
+             texlive-bigintcalc
+             texlive-bitset
              texlive-colortbl
+             texlive-dehyph
+             texlive-ec
+             texlive-etexcmds
+             texlive-everyshi
              texlive-fancyhdr
-             texlive-graphics ;for color.sty
-             texlive-tools ;for array.sty
+             texlive-firstaid
+             texlive-hycolor
+             texlive-hyperref
+             texlive-hyph-utf8
+             texlive-hyphen-base
+             texlive-latexconfig
+             texlive-iftex
+             texlive-infwarerr
+             texlive-intcalc
+             texlive-kvdefinekeys
+             texlive-kvoptions
+             texlive-kvsetkeys
+             texlive-l3backend
+             texlive-l3kernel
+             texlive-l3packages
+             texlive-latexconfig
+             texlive-letltxmacro
+             texlive-ltxcmds
              texlive-marvosym
-             texlive-tex-ini-files ;for pdftexconfig
-             texlive-ulem))
-      (home-page "https://www.ctan.org/pkg/jadetex/")
-      (synopsis "TeX macros to produce TeX output using OpenJade")
-      (description "JadeTeX is a companion package to the OpenJade DSSSL
+             texlive-passivetex
+             texlive-pdfescape
+             texlive-pdftex
+             texlive-pdftexcmds
+             texlive-rerunfilecheck
+             texlive-stmaryrd
+             texlive-symbol
+             texlive-tipa
+             texlive-ulem
+             texlive-unicode-data
+             texlive-uniquecounter
+             texlive-url
+             texlive-wasysym
+             ;; Propagate the texlive-updmap.cfg input used by xmltex,
+             ;; which provides the required fonts for its use.
+             texlive-xmltex
+             texlive-zapfding))))
+    (home-page "https://www.ctan.org/pkg/jadetex/")
+    (synopsis "TeX macros to produce TeX output using OpenJade")
+    (description "JadeTeX is a companion package to the OpenJade DSSSL
 processor.  OpenJade applies a DSSSL stylesheet to an SGML or XML document.
 The output of this process can be in a number of forms, including a set of
 high level LaTeX macros.  It is the task of the JadeTeX package to transform
 these macros into DVI/PostScript (using the @command{jadetex} command) or
 Portable Document Format (PDF) form (using the @command{pdfjadetex}
 command).")
-      ;; The license text is found at the header of the jadetex.dtx file.
-      (license license:expat))))
+    ;; The license text is found at the header of the jadetex.dtx file.
+    (license license:expat)))
 
 (define-public texlive-libertine
   (package
-- 
cgit 1.4.1


From 9bf503bef684f788dd8cbf6745b31561fdad7677 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:08:42 +0200
Subject: gnu: texlive-txfonts: Refresh package definition.

* gnu/packages/tex.scm (texlive-txfonts): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b5a0775f3b..ad5091ffed 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8029,22 +8029,23 @@ environment.")
 
 (define-public texlive-txfonts
   (package
-    (inherit (simple-texlive-package
-              "texlive-txfonts"
-              (list "/doc/fonts/txfonts/"
-
-                    "/fonts/afm/public/txfonts/"
-                    "/fonts/tfm/public/txfonts/"
-                    "/fonts/type1/public/txfonts/"
-                    "/fonts/vf/public/txfonts/"
-
-                    "/fonts/map/dvips/txfonts/"
-                    "/fonts/enc/dvips/txfonts/"
-                    "/tex/latex/txfonts/")
-              (base32
-               "017zjas5y1zlyq0iy4x6mv1qbz23xcy3y5xs0crj6zdnfvnccqgp")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/txfonts")
+    (name "texlive-txfonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/txfonts/"
+                   "fonts/afm/public/txfonts/"
+                   "fonts/enc/dvips/txfonts/"
+                   "fonts/map/dvips/txfonts/"
+                   "fonts/tfm/public/txfonts/"
+                   "fonts/type1/public/txfonts/"
+                   "fonts/vf/public/txfonts/"
+                   "tex/latex/txfonts/")
+             (base32
+              "017zjas5y1zlyq0iy4x6mv1qbz23xcy3y5xs0crj6zdnfvnccqgp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/txfonts")
     (synopsis "Times-like fonts in support of mathematics")
     (description
      "Txfonts supplies virtual text roman fonts using Adobe Times (or URW
-- 
cgit 1.4.1


From 5c8441a996e423be9d16e4829aebc8600911f2b2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:09:57 +0200
Subject: gnu: texlive-stix2-otf: Refresh package definition.

* gnu/packages/tex.scm (texlive-stix2-otf): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 53 ++++++++++++++++++++--------------------------------
 1 file changed, 20 insertions(+), 33 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ad5091ffed..74d617a0f9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7818,39 +7818,26 @@ use this package to insert PostScript files, in addition to PDF files.")
 (define-deprecated-package texlive-latex-pdfpages texlive-pdfpages)
 
 (define-public texlive-stix2-otf
-  (let ((base (simple-texlive-package
-               "texlive-stix2-otf"
-               (list "/doc/fonts/stix2-otf/"
-                     "/fonts/opentype/public/stix2-otf/")
-               (base32 "0i7rd1wn5jgm3gbi779gy78apz63w034ck4pn73xw6s10zgjzmgl")
-               ;; Building these fonts requires FontLab, which is nonfree.
-               #:trivial? #t)))
-    (package
-      (inherit base)
-      (arguments
-       (substitute-keyword-arguments (package-arguments base)
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'install 'symlink-fonts-to-system-fonts-prefix
-                ;; This is so that fontconfig can locate the fonts, such as
-                ;; when using xetex or xelatex.
-                (lambda _
-                  (let ((system-fonts-prefix (string-append #$output
-                                                            "/share/fonts")))
-                    (mkdir-p system-fonts-prefix)
-                    (symlink (string-append
-                              #$output "/share/texmf-dist/fonts/opentype"
-                              "/public/stix2-otf")
-                             (string-append system-fonts-prefix
-                                            "/stix2-otf")))))))))
-      (home-page "https://www.stixfonts.org/")
-      (synopsis "OpenType Unicode text and maths fonts")
-      (description "The Scientific and Technical Information eXchange (STIX)
-fonts are intended to satisfy the demanding needs of authors, publishers,
-printers, and others working in the scientific, medical, and technical fields.
-They combine a comprehensive Unicode-based collection of mathematical symbols
-and alphabets with a set of text faces suitable for professional publishing.")
-      (license license:silofl1.1))))
+  (package
+    (name "texlive-stix2-otf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/stix2-otf/"
+                   "fonts/opentype/public/stix2-otf/")
+             (base32
+              "0i7rd1wn5jgm3gbi779gy78apz63w034ck4pn73xw6s10zgjzmgl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/stix2-otf")
+    (synopsis "OpenType Unicode text and maths fonts")
+    (description
+     "The Scientific and Technical Information eXchange (STIX) fonts are
+intended to satisfy the demanding needs of authors, publishers, printers, and
+others working in the scientific, medical, and technical fields.  They combine
+a comprehensive Unicode-based collection of mathematical symbols and alphabets
+with a set of text faces suitable for professional publishing.")
+    (license license:silofl1.1)))
 
 (define-public texlive-sidecap
   (package
-- 
cgit 1.4.1


From f278a1f7160607556d756acf9edb3bbd1443c167 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:12:43 +0200
Subject: gnu: texlive-enumitem: Refresh package definition.

* gnu/packages/tex.scm (texlive-enumitem): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[license]: Set to EXPAT.
---
 gnu/packages/tex.scm | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 74d617a0f9..c564b05664 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7648,21 +7648,25 @@ the section, chapter or document.")
 
 (define-public texlive-enumitem
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-enumitem"
-      (list "doc/latex/enumitem/" "tex/latex/enumitem/")
-      (base32 "0qwbyjb4a82qjxrfmz06v3w5vly75id4ix4sw7lz2az68kz080dv")
-      #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/enumitem")
-    (synopsis "Customize basic list environments")
-    (description
-     "This package is intended to ease customizing the three basic list
-environments: @code{enumerate}, @code{itemize} and @code{description}.  It
-extends their syntax to allow an optional argument where a set of parameters
-in the form @code{key=value} are available, for example:
-@code{\\begin{itemize}[itemsep=1ex,leftmargin=1cm]}.")
-    (license license:lppl1.3+)))
+    (name "texlive-enumitem")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/enumitem/" "tex/latex/enumitem/")
+             (base32
+              "0qwbyjb4a82qjxrfmz06v3w5vly75id4ix4sw7lz2az68kz080dv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/enumitem")
+    (synopsis "Control layout of itemize, enumerate, description")
+    (description
+     "This package provides user control over the layout of the three basic
+list environments: enumerate, itemize and description.  It supersedes both
+@code{enumerate} and @code{mdwlist} (providing well-structured replacements
+for all their functionality), and in addition provides functions to compute
+the layout of labels, and to clone the standard environments, to create new
+environments with counters of their own.")
+    (license license:expat)))
 
 (define-deprecated-package texlive-latex-enumitem texlive-enumitem)
 
-- 
cgit 1.4.1


From 933b845d3a5174e6175014b6431d22ad5841db30 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:15:06 +0200
Subject: gnu: texlive-endnotes: Refresh package definition.

* gnu/packages/tex.scm (texlive-endnotes): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c564b05664..7bdf4a1674 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7631,20 +7631,23 @@ provides means for easy customization of the list of notes.")
 
 (define-public texlive-endnotes
   (package
-    (inherit (simple-texlive-package
-              "texlive-endnotes"
-              (list "doc/latex/endnotes/"
-                    "tex/latex/endnotes/")
-              (base32
-               "1s7j5sg8fbhifng0gfqnghbvalbbh0p7j9v06r660w089364ypwz")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/endnotes")
-    (synopsis "Deal with endnotesings in strings")
+    (name "texlive-endnotes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/endnotes/" "tex/latex/endnotes/")
+             (base32
+              "1s7j5sg8fbhifng0gfqnghbvalbbh0p7j9v06r660w089364ypwz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/endnotes")
+    (synopsis "Place footnotes at the end")
     (description
-     "Accumulates notes (using the @code{\\endnote} command, which can be used
-as a replacement for @code{\\footnote}), and places them at the end of
-the section, chapter or document.")
-    (license license:lppl1.0+)))
+     "The @code{endnotes} package can be used to accumulate notes (using the
+@code{\\endnote} command, which can be used as a replacement for
+@code{\\footnote}), and place them at the end of the section, chapter or
+document.")
+    (license license:lppl1.2+)))
 
 (define-public texlive-enumitem
   (package
-- 
cgit 1.4.1


From 8294ab6d28fc4b5aef748e0b984dd94a21cc5c6a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:16:04 +0200
Subject: gnu: texlive-zhspacing: Refresh package definition.

* gnu/packages/tex.scm (texlive-zhspacing): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7bdf4a1674..2fa7300880 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7433,16 +7433,19 @@ Adobe's basic set.")
 
 (define-public texlive-zhspacing
   (package
-    (inherit
-     (simple-texlive-package "texlive-zhspacing"
-                             (list "doc/generic/zhspacing/"
-                                   "tex/context/third/zhspacing/"
-                                   "tex/generic/zhspacing/"
-                                   "tex/xelatex/zhspacing/")
-                             (base32
-                              "02hwa7yjwb6wxkkib83mjdbara5zcsixbp5xlawri8n9ah54vxjm")
-                             #:trivial? #t))
-    (home-page "https://ctan.org/macros/xetex/generic/zhspacing")
+    (name "texlive-zhspacing")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/zhspacing/"
+                   "tex/context/third/zhspacing/"
+                   "tex/generic/zhspacing/"
+                   "tex/xelatex/zhspacing/")
+             (base32
+              "02hwa7yjwb6wxkkib83mjdbara5zcsixbp5xlawri8n9ah54vxjm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/zhspacing")
     (synopsis "Spacing for mixed CJK-English documents in XeTeX")
     (description
      "The package manages spacing in a CJK document; between consecutive Chinese
-- 
cgit 1.4.1


From b7d10431866c16cc88e69f1258e740c7a3164a4b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:18:04 +0200
Subject: gnu: texlive-zapfding: Refresh package definition.

* gnu/packages/tex.scm (texlive-zapfding): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2fa7300880..e02996dc25 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7410,19 +7410,21 @@ Adobe's basic set.")
 
 (define-public texlive-zapfding
   (package
-    (inherit (simple-texlive-package
-              "texlive-zapfding"
-              (list "/dvips/zapfding/"
-                    "/fonts/afm/adobe/zapfding/"
-                    "/fonts/afm/urw/zapfding/"
-                    "/fonts/tfm/adobe/zapfding/"
-                    "/fonts/tfm/urw35vf/zapfding/"
-                    "/fonts/type1/urw/zapfding/"
-                    "/fonts/map/dvips/zapfding/"
-                    "/tex/latex/zapfding/")
-              (base32
-               "17mls8wilz9api9ivsbcczpiqp1f39qy8wa6ajssi8zhnc5lq7zn")
-              #:trivial? #t))
+    (name "texlive-zapfding")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/zapfding/"
+                   "fonts/afm/adobe/zapfding/"
+                   "fonts/afm/urw/zapfding/"
+                   "fonts/map/dvips/zapfding/"
+                   "fonts/tfm/adobe/zapfding/"
+                   "fonts/tfm/urw35vf/zapfding/"
+                   "fonts/type1/urw/zapfding/"
+                   "tex/latex/zapfding/")
+             (base32
+              "17mls8wilz9api9ivsbcczpiqp1f39qy8wa6ajssi8zhnc5lq7zn")))
+    (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/urw-base35")
     (synopsis "URW Base 35 font pack for LaTeX")
     (description
-- 
cgit 1.4.1


From 7dc12f51f4a25fb92302842dce3d15c1109e9a32 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:19:26 +0200
Subject: gnu: texlive-palatino: Refresh package definition.

* gnu/packages/tex.scm (texlive-palatino): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e02996dc25..bb7e364ed9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7382,22 +7382,23 @@ Adobe's basic set.")
 
 (define-public texlive-palatino
   (package
-    (inherit (simple-texlive-package
-              "texlive-palatino"
-              (list "/dvips/palatino/"
-                    "/fonts/afm/adobe/palatino/"
-                    "/fonts/afm/urw/palatino/"
-                    "/fonts/tfm/adobe/palatino/"
-                    "/fonts/tfm/urw35vf/palatino/"
-                    "/fonts/type1/urw/palatino/"
-                    "/fonts/vf/adobe/palatino/"
-                    "/fonts/vf/urw35vf/palatino/"
-
-                    "/fonts/map/dvips/palatino/"
-                    "/tex/latex/palatino/")
-              (base32
-               "12jc0av7v99857jigmva47qaxyllhpzsnqis10n0qya2kz44xf22")
-              #:trivial? #t))
+    (name "texlive-palatino")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/palatino/"
+                   "fonts/afm/adobe/palatino/"
+                   "fonts/afm/urw/palatino/"
+                   "fonts/map/dvips/palatino/"
+                   "fonts/tfm/adobe/palatino/"
+                   "fonts/tfm/urw35vf/palatino/"
+                   "fonts/type1/urw/palatino/"
+                   "fonts/vf/adobe/palatino/"
+                   "fonts/vf/urw35vf/palatino/"
+                   "tex/latex/palatino/")
+             (base32
+              "12jc0av7v99857jigmva47qaxyllhpzsnqis10n0qya2kz44xf22")))
+    (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/urw-base35")
     (synopsis "URW Base 35 font pack for LaTeX")
     (description
-- 
cgit 1.4.1


From db6f59cf242be54c14bcc887fd193e7f2a4f8df5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:21:57 +0200
Subject: gnu: texlive-times: Refresh package definition.

* gnu/packages/tex.scm (texlive-times): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bb7e364ed9..69135a7895 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7355,21 +7355,23 @@ TeX, and LaTeX font definition and other relevant files.")
 
 (define-public texlive-times
   (package
-    (inherit (simple-texlive-package
-              "texlive-times"
-              (list "/dvips/times/"
-                    "/fonts/afm/adobe/times/"
-                    "/fonts/afm/urw/times/"
-                    "/fonts/tfm/adobe/times/"
-                    "/fonts/tfm/urw35vf/times/"
-                    "/fonts/type1/urw/times/"
-                    "/fonts/vf/adobe/times/"
-                    "/fonts/vf/urw35vf/times/"
-                    "/fonts/map/dvips/times/"
-                    "/tex/latex/times/")
-              (base32
-               "13g41a7vbkvsf7ki9dgl7qm100w382mnlqkcngwgl3axp6s5s8l0")
-              #:trivial? #t))
+    (name "texlive-times")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/times/"
+                   "fonts/afm/adobe/times/"
+                   "fonts/afm/urw/times/"
+                   "fonts/map/dvips/times/"
+                   "fonts/tfm/adobe/times/"
+                   "fonts/tfm/urw35vf/times/"
+                   "fonts/type1/urw/times/"
+                   "fonts/vf/adobe/times/"
+                   "fonts/vf/urw35vf/times/"
+                   "tex/latex/times/")
+             (base32
+              "13g41a7vbkvsf7ki9dgl7qm100w382mnlqkcngwgl3axp6s5s8l0")))
+    (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/urw-base35")
     (synopsis "URW Base 35 font pack for LaTeX")
     (description
-- 
cgit 1.4.1


From e7c0a7d49e7753b8bf8fbceb4b7e285628b3cbaa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:23:10 +0200
Subject: gnu: texlive-inconsolata: Refresh package definition.

* gnu/packages/tex.scm (texlive-inconsolata): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 69135a7895..3f4e12d7d4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7329,19 +7329,22 @@ that wraps @code{\\includegraphics}.")
 
 (define-public texlive-inconsolata
   (package
-    (inherit (simple-texlive-package
-              "texlive-inconsolata"
-              (list "/doc/fonts/inconsolata/"
-                    "/fonts/enc/dvips/inconsolata/"
-                    "/fonts/map/dvips/inconsolata/"
-                    "/fonts/opentype/public/inconsolata/"
-                    "/fonts/tfm/public/inconsolata/"
-                    "/fonts/type1/public/inconsolata/"
-                    "/tex/latex/inconsolata/")
-              (base32
-               "19lvma52vk7x8d7j4s9ymjwm3w2k08860fh6dkzn76scgpdm4wlb")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/inconsolata")
+    (name "texlive-inconsolata")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/inconsolata/"
+                   "fonts/enc/dvips/inconsolata/"
+                   "fonts/map/dvips/inconsolata/"
+                   "fonts/opentype/public/inconsolata/"
+                   "fonts/tfm/public/inconsolata/"
+                   "fonts/type1/public/inconsolata/"
+                   "tex/latex/inconsolata/")
+             (base32
+              "19lvma52vk7x8d7j4s9ymjwm3w2k08860fh6dkzn76scgpdm4wlb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/inconsolata")
     (synopsis "Monospaced font with support files for use with TeX")
     (description
      "Inconsolata is a monospaced font designed by Raph Levien.  This package
-- 
cgit 1.4.1


From 3569b9f8fdfea60fc7a176cfc910db22949dd829 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:27:43 +0200
Subject: gnu: texlive-ae: Refresh package definition.

* gnu/packages/tex.scm (texlive-ae): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3f4e12d7d4..1c38019c00 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7280,17 +7280,18 @@ texlive-2019.3/Master/texmf-dist/doc/fonts/ec/copyrite.txt"))))
 ;; fails with obscure TeX-typical error messages.
 (define-public texlive-ae
   (package
-    (inherit (simple-texlive-package
-              "texlive-ae"
-              (list "/doc/fonts/ae/"
-                    "/source/fonts/ae/"
-                    "/fonts/tfm/public/ae/"
-                    "/fonts/vf/public/ae/"
-                    "/tex/latex/ae/")
-              (base32
-               "1xkzg381y0avdq381r2m990wp27czkdff0qkvsp2n5q62yc0bdsw")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/ae")
+    (name "texlive-ae")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ae/" "fonts/tfm/public/ae/"
+                   "fonts/vf/public/ae/" "source/fonts/ae/"
+                   "tex/latex/ae/")
+             (base32
+              "1xkzg381y0avdq381r2m990wp27czkdff0qkvsp2n5q62yc0bdsw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ae")
     (synopsis "Virtual fonts for T1 encoded CMR-fonts")
     (description
      "This package provides a set of virtual fonts which emulates T1 coded
-- 
cgit 1.4.1


From e0e198fb7013ebfc145e2b66d543549e096d1f4f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:29:26 +0200
Subject: gnu: texlive-textcase: Refresh package definition.

* gnu/packages/tex.scm (texlive-textcase): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1c38019c00..2283f775ca 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6629,29 +6629,31 @@ hypertext linkages in some cases).")
 
 (define-public texlive-textcase
   (package
-    (inherit (simple-texlive-package
-              "texlive-textcase"
-              (list "doc/latex/textcase/"
-                    "tex/latex/textcase/"
-                    "source/latex/textcase/")
-              (base32
-               "185fibd41wd0v51gnai29ygi32snkk00p00110kcnk1bcnmpiw82")
-              #:trivial? #t))
-    (home-page "https://ctan.org/macros/latex/contrib/textcase")
+    (name "texlive-textcase")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/textcase/" "source/latex/textcase/"
+                   "tex/latex/textcase/")
+             (base32
+              "185fibd41wd0v51gnai29ygi32snkk00p00110kcnk1bcnmpiw82")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/textcase")
     (synopsis "Case conversion ignoring mathematics, etc")
     (description
-     "The textcase package offers commands @code{\\MakeTextUppercase} and
-@code{\\MakeTextLowercase} are similar to the standard @code{\\MakeUppercase}
-and @code{\\MakeLowercase}, but they do not change the case of any sections of
-mathematics, or the arguments of @code{\\cite}, @code{\\label} and
-@code{\\ref} commands within the argument.  A further command
-@code{\\NoCaseChange} does nothing but suppress case change within its
+     "The @code{textcase} package offers commands @code{\\MakeTextUppercase}
+and @code{\\MakeTextLowercase} are similar to the standard
+@code{\\MakeUppercase} and @code{\\MakeLowercase}, but they do not change the
+case of any sections of mathematics, or the arguments of @code{\\cite},
+@code{\\label} and @code{\\ref} commands within the argument.  A further
+command @code{\\NoCaseChange} does nothing but suppress case change within its
 argument, so to force uppercase of a section including an environment, one
 might say:
 
 @example
 \\MakeTextUppercase{...\\NoCaseChange{\\begin{foo}} ...\\NoCaseChange{\\end{foo}}...}
-@end example\n")
+@end example")
     (license license:lppl)))
 
 (define-public texlive-upquote
-- 
cgit 1.4.1


From e761f0a4756b8a8f58e0ac36345be9fb868ab05d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:31:53 +0200
Subject: gnu: texlive-etoolbox: Refresh package definition.

* gnu/packages/tex.scm (texlive-etoolbox): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-ETEX.
---
 gnu/packages/tex.scm | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2283f775ca..76a4256e2a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6182,24 +6182,28 @@ hyperlink to the target of the DOI.")
 
 (define-public texlive-etoolbox
   (package
-    (inherit (simple-texlive-package
-              "texlive-etoolbox"
-              (list "/doc/latex/etoolbox/"
-                    "/tex/latex/etoolbox/")
-              (base32
-               "070iaj540rglf0c80l0hjkwg6aa7qyskhh4iwyhf7n8vrg5cjjab")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/etoolbox")
+    (name "texlive-etoolbox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/etoolbox/" "tex/latex/etoolbox/")
+             (base32
+              "070iaj540rglf0c80l0hjkwg6aa7qyskhh4iwyhf7n8vrg5cjjab")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etex))
+    (home-page "https://ctan.org/pkg/etoolbox")
     (synopsis "e-TeX tools for LaTeX")
     (description
-     "This package is a toolbox of programming facilities geared primarily
+     "The package is a toolbox of programming facilities geared primarily
 towards LaTeX class and package authors.  It provides LaTeX frontends to some
 of the new primitives provided by e-TeX as well as some generic tools which
 are not strictly related to e-TeX but match the profile of this package.  The
 package provides functions that seem to offer alternative ways of implementing
 some LaTeX kernel commands; nevertheless, the package will not modify any part
 of the LaTeX kernel.")
-    (license license:lppl1.3+)))
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-latex-etoolbox texlive-etoolbox)
 
-- 
cgit 1.4.1


From 17aae478f75eda4618406781a6310737eb6808a6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:33:11 +0200
Subject: gnu: texlive-doi: Refresh package definition.

* gnu/packages/tex.scm (texlive-doi): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-HYPERREF.
---
 gnu/packages/tex.scm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 76a4256e2a..d541fe1def 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6159,14 +6159,18 @@ sequence, of variable length.")
 
 (define-public texlive-doi
   (package
-    (inherit (simple-texlive-package
-              "texlive-doi"
-              (list "/doc/latex/doi/README.md"
-                    "/tex/latex/doi/")
-              (base32
-               "18z9922lqb3hliqn95h883fndqs4lgyi5yqbnq2932ya0imc3j7h")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/doi")
+    (name "texlive-doi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/doi/" "tex/latex/doi/")
+             (base32
+              "18z9922lqb3hliqn95h883fndqs4lgyi5yqbnq2932ya0imc3j7h")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-hyperref))
+    (home-page "https://ctan.org/pkg/doi")
     (synopsis "Create correct hyperlinks for DOI numbers")
     (description
      "You can hyperlink DOI numbers to doi.org.  However, some publishers have
-- 
cgit 1.4.1


From b8cd24eebd1bde52872bd2bbf71532e2e1e23a4f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:34:07 +0200
Subject: gnu: texlive-ddphonism: Refresh package definition.

* gnu/packages/tex.scm (texlive-ddphonism): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d541fe1def..fb3b058589 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6134,12 +6134,15 @@ in LaTeX documents; a jiffy to create slashed characters for physicists.")
 
 (define-public texlive-ddphonism
   (package
-    (inherit (simple-texlive-package
-              "texlive-ddphonism"
-              (list "doc/latex/ddphonism/"
-                    "tex/latex/ddphonism/")
-              (base32 "1p02ai76nnh6042pnmqv4n30z6yxsvyyk2nb9jk7xlyyc87zzbdd")
-              #:trivial? #t))
+    (name "texlive-ddphonism")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ddphonism/" "tex/latex/ddphonism/")
+             (base32
+              "1p02ai76nnh6042pnmqv4n30z6yxsvyyk2nb9jk7xlyyc87zzbdd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (propagated-inputs
      (list texlive-etoolbox
            texlive-hyperref
@@ -6148,7 +6151,7 @@ in LaTeX documents; a jiffy to create slashed characters for physicists.")
            texlive-pgf
            texlive-tools
            texlive-xstring))
-    (home-page "https://www.ctan.org/pkg/ddphonism")
+    (home-page "https://ctan.org/pkg/ddphonism")
     (synopsis "Dodecaphonic diagrams for LaTeX")
     (description
      "This is a music-related package which is focused on notation from the
-- 
cgit 1.4.1


From b1554676a0af15b4eca217a4f7e5fbba47691cf5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 15:36:44 +0200
Subject: gnu: texlive-carlisle: Refresh package definition.

* gnu/packages/tex.scm (texlive-carlisle): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-GRAPHICS, TEXLIVE-TOOLS.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fb3b058589..5a63a77925 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6095,21 +6095,28 @@ to something that's not a float.")
 
 (define-public texlive-carlisle
   (package
-    (inherit (simple-texlive-package
-              "texlive-carlisle"
-              (list "doc/latex/carlisle/"
-                    "source/latex/carlisle/"
-                    "tex/latex/carlisle/")
-              (base32 "139k4n8dv6pbal1mx4m8b239x3i9cw61f6digk9mxscbxwvxfngb")
-              #:trivial? #t))
-    (home-page "https://ctan.org/macros/latex/contrib/carlisle")
+    (name "texlive-carlisle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/carlisle/" "source/latex/carlisle/"
+                   "tex/latex/carlisle/")
+             (base32
+              "139k4n8dv6pbal1mx4m8b239x3i9cw61f6digk9mxscbxwvxfngb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-graphics
+           texlive-tools))
+    (home-page "https://ctan.org/pkg/carlisle")
     (synopsis "David Carlisle's small packages")
     (description
      "Many of David Carlisle's more substantial packages stand on their own,
 or as part of the LaTeX latex-tools set; this set contains: making dotless
 @emph{j} characters for fonts that don't have them; a method for combining the
-capabilities of longtable and tabularx; an environment for including plain TeX
-in LaTeX documents; a jiffy to create slashed characters for physicists.")
+capabilities of @code{longtable} and @code{tabularx}; an environment for
+including plain TeX in LaTeX documents; a jiffy to create slashed characters
+for physicists.")
     (license license:lppl)))
 
 (define-public texlive-catchfile
-- 
cgit 1.4.1


From 4d76be518813bd1ec27d7e29df57ec51497ce6e2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 17:30:44 +0200
Subject: gnu: texlive-calrsfs: Refresh package definition.

* gnu/packages/tex.scm (texlive-calrsfs): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5a63a77925..bc3b1cab4b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6061,15 +6061,19 @@ including files to the root of the tree).  The package supersedes FiNK.")
 
 (define-public texlive-calrsfs
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-calrsfs"
-      (list "doc/latex/calrsfs/" "tex/latex/calrsfs/")
-      (base32 "0aqa0k0zzzicx5nynd29i9pdb7a4j6fvf1xwrbm4qg64pl55i6xa")
-      #:trivial? #t))
-    (home-page "https://ctan.org/macros/latex/contrib/calrsfs")
+    (name "texlive-calrsfs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/calrsfs/" "tex/latex/calrsfs/")
+             (base32
+              "0aqa0k0zzzicx5nynd29i9pdb7a4j6fvf1xwrbm4qg64pl55i6xa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/calrsfs")
     (synopsis "Copperplate calligraphic letters in LaTeX")
-    (description "This package provides a math interface to the Rsfs fonts.")
+    (description "This package provides a maths interface to the @code{rsfs}
+fonts.")
     (license license:public-domain)))
 
 (define-public texlive-capt-of
-- 
cgit 1.4.1


From a54cbb111f1bc1e658c37b80fb28900d9bb98cb7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 17:33:52 +0200
Subject: gnu: texlive-seminar: Refresh package definition.

* gnu/packages/tex.scm (texlive-seminar): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: TEXLIVE-GEOMETRY, TEXLIVE-HYPERREF, TEXLIVE-PSTRICKS.
---
 gnu/packages/tex.scm | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bc3b1cab4b..6c9a939c69 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5871,22 +5871,27 @@ characters and their glyph names.")
 
 (define-public texlive-seminar
   (package
-    (inherit (simple-texlive-package
-              "texlive-seminar"
-              (list "/doc/latex/seminar/"
-                    "/tex/latex/seminar/")
-              (base32
-               "1clgw5xy867khzfn8d210rc5hsw5s7r0pznhk84niybvw4zc7r3f")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/seminar")
+    (name "texlive-seminar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/seminar/" "tex/latex/seminar/")
+             (base32
+              "1clgw5xy867khzfn8d210rc5hsw5s7r0pznhk84niybvw4zc7r3f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-geometry
+           texlive-hyperref
+           texlive-pstricks))
+    (home-page "https://ctan.org/pkg/seminar")
     (synopsis "Make overhead slides")
-    ;; TODO: This package may need fancybox and xcomment at runtime.
     (description
      "This package provides a class that produces overhead
 slides (transparencies), with many facilities.  Seminar is not nowadays
 reckoned a good basis for a presentation — users are advised to use more
-recent classes such as powerdot or beamer, both of which are tuned to
-21st-century presentation styles.")
+recent classes such as @code{powerdot} or @code{beamer}, both of which are
+tuned to 21st-century presentation styles.")
     (license license:lppl1.2+)))
 
 (define-deprecated-package texlive-latex-seminar texlive-seminar)
-- 
cgit 1.4.1


From 0a35ea08ce53a1192ce82db1a78d22f5dd48590a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 17:36:40 +0200
Subject: gnu: texlive-pstool: Refresh package definition.

* gnu/packages/tex.scm (texlive-pstool): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6c9a939c69..e7f6dc4d7e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5791,32 +5791,34 @@ rotated.")
 
 (define-public texlive-pstool
   (package
-    (inherit (simple-texlive-package
-              "texlive-pstool"
-              (list "/doc/latex/pstool/"
-                    "/tex/latex/pstool/")
-              (base32
-               "12clzcw2cl7g2chr2phgmmiwxw4859cln1gbx1wgp8bl9iw590nc")
-              #:trivial? #t))
+    (name "texlive-pstool")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pstool/" "tex/latex/pstool/")
+             (base32
+              "12clzcw2cl7g2chr2phgmmiwxw4859cln1gbx1wgp8bl9iw590nc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (propagated-inputs
-     (list texlive-bigfoot ; for suffix
+     (list texlive-bigfoot              ; for suffix
            texlive-filemod
            texlive-graphics
            texlive-ifplatform
-           texlive-l3kernel ; for expl3
+           texlive-l3kernel             ; for expl3
            texlive-oberdiek
            texlive-psfrag
            texlive-tools                ; for shellesc
            texlive-trimspaces
            texlive-xkeyval))
-    (home-page "https://www.ctan.org/pkg/pstool")
-    (synopsis "Process PostScript graphics within pdfLaTeX documents")
+    (home-page "https://ctan.org/pkg/pstool")
+    (synopsis "Support for @code{psfrag} within pdfLaTeX")
     (description
      "This is a package for processing PostScript graphics with @code{psfrag}
 labels within pdfLaTeX documents.  Every graphic is compiled individually,
 drastically speeding up compilation time when only a single figure needs
 re-processing.")
-    (license license:lppl)))
+    (license license:lppl1.3c)))
 
 (define-deprecated-package texlive-latex-pstool texlive-pstool)
 
-- 
cgit 1.4.1


From becefcb96c12d389d3b6af2d86c68dec3da8de14 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 17:43:08 +0200
Subject: gnu: texlive-fira: Refresh package definition.

* gnu/packages/tex.scm (texlive-fira): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-FONTAXES, TEXLIVE-FONTSPEC, TEXLIVE-IFTEX,
TEXLIVE-MWEIGHTS, TEXLIVE-XKEYVAL.
---
 gnu/packages/tex.scm | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e7f6dc4d7e..5605bd26c4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5557,20 +5557,29 @@ by making punctuation characters active.")
 
 (define-public texlive-fira
   (package
-    (inherit (simple-texlive-package
-              "texlive-fira"
-              (list "doc/fonts/fira/"
-                    "tex/latex/fira/"
-                    "fonts/vf/public/fira/"
-                    "fonts/type1/public/fira/"
-                    "fonts/tfm/public/fira/"
-                    "fonts/opentype/public/fira/"
-                    "fonts/map/dvips/fira/"
-                    "fonts/enc/dvips/fira/")
-              (base32 "1v3688hziqz4jywfysiv19vsdzfkknrf83zfbi7lhiqpgkpsfsm2")
-              #:trivial? #t))
+    (name "texlive-fira")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fira/"
+                   "fonts/enc/dvips/fira/"
+                   "fonts/map/dvips/fira/"
+                   "fonts/opentype/public/fira/"
+                   "fonts/tfm/public/fira/"
+                   "fonts/type1/public/fira/"
+                   "fonts/vf/public/fira/"
+                   "tex/latex/fira/")
+             (base32
+              "1v3688hziqz4jywfysiv19vsdzfkknrf83zfbi7lhiqpgkpsfsm2")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (home-page "https://ctan.org/fonts/fira")
+    (propagated-inputs
+     (list texlive-fontaxes
+           texlive-fontspec
+           texlive-iftex
+           texlive-mweights
+           texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/fira")
     (synopsis "Fira fonts with LaTeX support")
     (description
      "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
-- 
cgit 1.4.1


From 4d85716c5eff7fcb46d38c184e73386e4717c473 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 20:25:23 +0200
Subject: gnu: texlive-tipa: Refresh package definition.

* gnu/packages/tex.scm (texlive-tipa): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[arguments]<#:phases>: Build font metrics.
---
 gnu/packages/tex.scm | 101 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 83 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5605bd26c4..2e996479fe 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5191,25 +5191,90 @@ It includes little more than the required set of LaTeX packages.")))
 
 (define-public texlive-tipa
   (package
-    (inherit (simple-texlive-package
-              "texlive-tipa"
-              (list "/tex4ht/ht-fonts/alias/tipa/"
-                    "/doc/fonts/tipa/"
-                    "/fonts/map/dvips/tipa/"
-                    "/fonts/source/public/tipa/"
-                    "/fonts/tfm/public/tipa/"
-                    "/fonts/type1/public/tipa/"
-                    "/tex/latex/tipa/")
-              (base32
-               "0cqzf8vb10b8jw99m9gflskxa4c3rpiznxglix6chl5lai5sgw44")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/tipa")
+    (name "texlive-tipa")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/tipa/"
+                   "fonts/map/dvips/tipa/"
+                   "fonts/source/public/tipa/"
+                   "fonts/tfm/public/tipa/"
+                   "fonts/type1/public/tipa/"
+                   "tex/latex/tipa/")
+             (base32
+              "11gi7yhq2lnfgvqa29i0sidi5mwkzpja5ggdcpvqwv4xljf4vpvh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:modules
+      '((guix build texlive-build-system)
+        (guix build utils)
+        (ice-9 regex)
+        (srfi srfi-1)
+        (srfi srfi-26))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'generate-fonts-metrics
+            (lambda _
+              (let ((mf #$(this-package-native-input "texlive-metafont"))
+                    (cm #$(this-package-native-input "texlive-cm"))
+                    (fonts-directories
+                     (delete-duplicates
+                      (map dirname
+                           (find-files "." "[0-9]+\\.mf$"))))
+                    (root (getcwd)))
+                (mkdir-p "build")
+                ;; Tell mf where to find mf.base.
+                (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c"))
+                (for-each
+                 (lambda (directory)
+                   ;; Tell mf where to look for source files.
+                   (setenv "MFINPUTS"
+                           (string-append
+                            (getcwd) "/" directory ":"
+                            mf "/share/texmf-dist/metafont/base:"
+                            cm "/share/texmf-dist/fonts/source/public/cm"))
+                   ;; Build font metrics (tfm).
+                   (with-directory-excursion directory
+                     (for-each (lambda (font)
+                                 (format #t "building font ~a\n" font)
+                                 (invoke "mf" "-progname=mf"
+                                         (string-append "-output-directory="
+                                                        root "/build")
+                                         (string-append "\\"
+                                                        "mode:=ljfour; "
+                                                        "mag:=1; "
+                                                        "batchmode; "
+                                                        "input "
+                                                        (basename font ".mf"))))
+                               ;; "tipasym[1-4].mf are files to be included in
+                               ;; other ".mf" files and should not be compiled
+                               ;; by themselves.
+                               (filter
+                                (negate
+                                 (cut string-match "tipasym[0-9]\\.mf$" <>))
+                                (find-files "." "[0-9]+\\.mf$"))))
+                   ;; Install font metrics at the appropriate location.
+                   (let ((destination
+                          ;; fonts/source/xxx/yyy/... -> fonts/tfm/xxx/yyy/...
+                          (string-append "fonts/tfm"
+                                         (string-drop
+                                          directory
+                                          (string-length "fonts/source")))))
+                     (format #t "moving font metrics in ~a\n" destination)
+                     (for-each (cut install-file <> destination)
+                               (find-files "build/" "\\.tfm$"))))
+                 fonts-directories)))))))
+    (native-inputs
+     (list texlive-cm texlive-metafont))
+    (home-page "https://ctan.org/pkg/tipa")
     (synopsis "Fonts and macros for IPA phonetics characters")
-    (description "These fonts are considered the \"ultimate answer\" to IPA
-typesetting.  The encoding of these 8-bit fonts has been registered as LaTeX
-standard encoding T3, and the set of addendum symbols as encoding
-TS3. \"Times-like\" Adobe Type 1 versions are provided for both the T3 and the
-TS3 fonts.")
+    (description
+     "These fonts are considered the ultimate answer to IPA typesetting.  The
+encoding of these 8-bit fonts has been registered as LaTeX standard encoding
+T3, and the set of addendum symbols as encoding TS3.  Times-like Adobe Type
+1 versions are provided for both the T3 and the TS3 fonts.")
     (license license:lppl)))
 
 (define-public texlive-amsrefs
-- 
cgit 1.4.1


From a84395f2d34187e23b1e04dd558a460053f884db Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 21:02:57 +0200
Subject: gnu: Add texlive-cmexb.

* gnu/packages/tex.scm (texlive-cmexb): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2e996479fe..fb1165106b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4763,6 +4763,26 @@ polyglossia package rather than Babel.")
 
 (define-deprecated-package texlive-latex-babel texlive-babel)
 
+(define-public texlive-cmexb
+  (package
+    (name "texlive-cmexb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cmexb/" "fonts/map/dvips/cmexb/"
+                   "fonts/tfm/public/cmexb/"
+                   "fonts/type1/public/cmexb/")
+             (base32
+              "1fwnxzlkcf58n1f91vz8xbcp8nmhqmhjqhswgkzvyrd6lnp5gzdk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cmexb")
+    (synopsis "@code{cmexb10} metrics and Type 1")
+    (description
+     "This package provides Computer Modern Math Extension bold, metrics and
+@file{.pfb} file.")
+    (license license:public-domain)))   ;see "README-cmexb"
+
 (define-public texlive-cs
   (package
     (inherit (simple-texlive-package
-- 
cgit 1.4.1


From 267ffd0a045da071578e802313dfe7121958cf91 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 21:58:47 +0200
Subject: gnu: texlive-cs: Refresh package definition.

* gnu/packages/tex.scm (texlive-cs): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fb1165106b..453f871969 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4785,29 +4785,25 @@ polyglossia package rather than Babel.")
 
 (define-public texlive-cs
   (package
-    (inherit (simple-texlive-package
-              "texlive-cs"
-              (list
-               "fonts/enc/dvips/cs/"
-               "fonts/map/dvips/cs/"
-               "fonts/source/public/cs/"
-               ;; TODO: Remove these pre-built files after the manual
-               ;; build below is fixed.
-               ;; The font fails to build from the Metafont sources, with
-               ;; errors such as:
-               ;; This is METAFONT, Version 2.71828182 (TeX Live 2021/GNU Guix) [...]
-               ;; (./csaccent.mf
-               ;; >> cap_curve#-dot_size#
-               ;; ! Unknown relation will be considered false.
-               ;; <to be read again>
-               "fonts/tfm/cs/cs-a35/"
-               "fonts/tfm/cs/cs-charter/"
-               "fonts/tfm/public/cs/"
-               "fonts/type1/public/cs/"
-               "fonts/vf/cs/cs-a35/")
-              (base32 "1ww5lrqja051fh0ygmfdyy5a6bhwq9k5zv857vwiqf5syvw5djps")
-              #:trivial? #t))
-    (home-page "https://petr.olsak.net/cstex/")
+    (name "texlive-cs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             ;; FIXME: Cannot build font metrics: "cannot find cmb12".
+             (list "fonts/enc/dvips/cs/"
+                   "fonts/map/dvips/cs/"
+                   "fonts/source/public/cs/"
+                   "fonts/tfm/cs/cs-a35/"
+                   "fonts/tfm/cs/cs-charter/"
+                   "fonts/tfm/public/cs/"
+                   "fonts/type1/public/cs/"
+                   "fonts/vf/cs/cs-a35/"
+                   "fonts/vf/cs/cs-charter/")
+             (base32
+              "0nzzcg1yvbslhqm5lsfcpqh6sbzkmnmmgyakg9l8855qpa8g9bf3")))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-cmexb))
+    (home-page "https://ctan.org/pkg/csfonts")
     (synopsis "Czech/Slovak-tuned Computer Modern fonts")
     (description "This package provides Czech/Slovak-tuned Computer Modern
 fonts in the Metafont format; Type 1 format versions (csfonts-t1) are also
-- 
cgit 1.4.1


From a535f29c42e5a49be6230b892fcd786e7eee499d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:01:07 +0200
Subject: gnu: texlive-luaotfload: Refresh package definition.

* gnu/packages/tex.scm (texlive-luaotfload): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-LM.
---
 gnu/packages/tex.scm | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 453f871969..e9452612b1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4601,33 +4601,33 @@ upgrade smoothly to the new support structure.")
 ;; TODO: We should be able to build this from the sources on Github with
 ;; texlive-l3build, but I haven't been able to get it to work.
 (define-public texlive-luaotfload
-  (let ((template (simple-texlive-package
-                   "texlive-luaotfload"
-                   (list "/doc/luatex/luaotfload/"
-                         "/doc/man/man1/luaotfload-tool.1"
-                         "/doc/man/man5/luaotfload.conf.5"
-                         "/source/luatex/luaotfload/fontloader-reference-load-order.lua"
-                         "/source/luatex/luaotfload/fontloader-reference-load-order.tex"
-                         "/scripts/luaotfload/luaotfload-tool.lua"
-                         "/tex/luatex/luaotfload/")
-                   (base32
-                    "10wznvxx3qsl88n560py5vyx5r3a3914anbqfhwcmhmwg097xxl4")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (propagated-inputs
-       (list texlive-lua-alt-getopt ;for luaotfload-tool
-             texlive-lualibs))
-      (home-page "https://github.com/lualatex/luaotfload")
-      (synopsis "OpenType font loader for LuaTeX")
-      (description
-       "Luaotfload is an adaptation of the ConTeXt font loading system for the
+  (package
+    (name "texlive-luaotfload")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/luaotfload/"
+                   "doc/man/man1/luaotfload-tool.1"
+                   "doc/man/man1/luaotfload-tool.man1.pdf"
+                   "doc/man/man5/luaotfload.conf.5"
+                   "doc/man/man5/luaotfload.conf.man5.pdf"
+                   "scripts/luaotfload/"
+                   "source/luatex/luaotfload/"
+                   "tex/luatex/luaotfload/")
+             (base32
+              "15xhnb4kyzmr11lj0md1d502cqrxyq6zdcq738z9394k6bas377f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-lm texlive-lua-alt-getopt texlive-lualibs))
+    (home-page "https://ctan.org/pkg/luaotfload")
+    (synopsis "OpenType font loader for LuaTeX")
+    (description
+     "Luaotfload is an adaptation of the ConTeXt font loading system for the
 Plain and LaTeX formats.  It allows OpenType fonts to be loaded with font
 features accessible using an extended font request syntax while providing
 compatibilitywith XeTeX.  By indexing metadata in a database it facilitates
 loading fonts by their proper names instead of file names.")
-      ;; GPL version 2 only
-      (license license:gpl2))))
+    (license license:gpl2)))
 
 (define-deprecated-package texlive-luatex-luaotfload texlive-luaotfload)
 
-- 
cgit 1.4.1


From 046971c319b31ef1d16aae1cf97d336d322bc7cb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:02:48 +0200
Subject: gnu: texlive-lua-alt-getopt: Refresh package definition.

* gnu/packages/tex.scm (texlive-lua-alt-getopt): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e9452612b1..569f43153a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4558,14 +4558,18 @@ this bundle for use independent of ConTeXt.")
 
 (define-public texlive-lua-alt-getopt
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-lua-alt-getopt"
-      (list "doc/support/lua-alt-getopt/" "scripts/lua-alt-getopt/")
-      (base32 "0cizxzn33n3pn98xkqnxb8s6vdwkar3xrwhraqrs05pjfdn9d4wz")
-      #:trivial? #t))
-    (home-page "https://ctan.org/support/lualibs/lua-alt-getopt")
-    (synopsis "Process application arguments the same way as getopt_long")
+    (name "texlive-lua-alt-getopt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/lua-alt-getopt/"
+                   "scripts/lua-alt-getopt/")
+             (base32
+              "0cizxzn33n3pn98xkqnxb8s6vdwkar3xrwhraqrs05pjfdn9d4wz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lua-alt-getopt")
+    (synopsis "Process application arguments as @code{getopt_long}")
     (description
      "This package provides a Lua module for processing application arguments
 in the same way as BSD/GNU @code{getopt_long(3)} functions do.")
-- 
cgit 1.4.1


From 7881695e1bad2552716bbb666bdac2688065a56f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:04:02 +0200
Subject: gnu: texlive-lualibs: Refresh package definition.

* gnu/packages/tex.scm (texlive-lualibs): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 569f43153a..77b8afcb0c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4534,24 +4534,22 @@ they are not directly related to Unicode mathematics typesetting.")
 
 (define-public texlive-lualibs
   (package
-    (inherit
-     (simple-texlive-package
-      "texlive-lualibs"
-      (list "doc/luatex/lualibs/"
-            "source/luatex/lualibs/"
-            "tex/luatex/lualibs/")
-      (base32 "0gf60vj9y75a7dlrmpbyqgsa00s1717r6if3lm5ldm41i9fm8ywz")
-      ;; The source dtx file only unpacks three files.  This is why we
-      ;; install all the files as they are, because there is no clear
-      ;; way to generate them all.
-      #:trivial? #true))
-    (home-page "https://ctan.org/macros/luatex/generic/lualibs")
+    (name "texlive-lualibs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/lualibs/" "source/luatex/lualibs/"
+                   "tex/luatex/lualibs/")
+             (base32
+              "0gf60vj9y75a7dlrmpbyqgsa00s1717r6if3lm5ldm41i9fm8ywz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lualibs")
     (synopsis "Additional Lua functions for LuaTeX macro programmers")
     (description
      "Lualibs is a collection of Lua modules useful for general programming.
-The bundle is based on Lua modules shipped with ConTeXt, and made available in
+The bundle is based on lua modules shipped with ConTeXt, and made available in
 this bundle for use independent of ConTeXt.")
-    ;; GPL version 2 only
     (license license:gpl2)))
 
 (define-deprecated-package texlive-luatex-lualibs texlive-lualibs)
-- 
cgit 1.4.1


From cabe400c5ae9ad63361ca0e857445693b6071712 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:07:00 +0200
Subject: gnu: texlive-l3build: Refresh package definition.

* gnu/packages/tex.scm (texlive-l3build): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 64 ++++++++++++++++++----------------------------------
 1 file changed, 22 insertions(+), 42 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 77b8afcb0c..b64a08eaa0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4413,50 +4413,30 @@ file name may also be given explicitly as an optional argument.")
     (license license:lppl)))
 
 (define-public texlive-l3build
-  (let ((template (simple-texlive-package
-                   "texlive-l3build"
-                   (list "/doc/latex/l3build/"
-                         "/doc/man/man1/l3build.1"
-                         "/scripts/l3build/"
-                         "/tex/latex/l3build/"
-                         ;; TODO: The dtx file builds only the documentation.
-                         ;; We avoid this for a simpler package definition,
-                         ;; but it may be possible to exclude
-                         ;; /doc/latex/l3build and the man page in the future.
-                         "/source/latex/l3build/")
-                   (base32
-                    "1fcay05jj53qgp2b98jpawi0id298fs5xc4y1r5krrfr4sp4hd59")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'install 'patch-shebangs-again
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 ;; XXX: Since the 'patch-shebangs' phase cannot change the
-                 ;; original source files patch the shebangs again here.
-                 (let* ((coreutils (assoc-ref inputs "coreutils"))
-                        (texlive-bin (assoc-ref inputs "texlive-bin"))
-                        (path (list (string-append coreutils "/bin")
-                                    (string-append texlive-bin "/bin"))))
-                   (for-each (lambda (file)
-                               (format #t "~a~%" file)
-                               (patch-shebang file path))
-                             (find-files (assoc-ref outputs "out")))
-                   #t)))))))
-      (inputs
-       (list coreutils texlive-bin))
-      (home-page "https://github.com/latex3/luaotfload")
-      (synopsis "Testing and building system for LaTeX")
-      (description
-       "The l3build module is designed to support the development of
+  (package
+    (name "texlive-l3build")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/l3build/"
+                   "doc/man/man1/l3build.1"
+                   "doc/man/man1/l3build.man1.pdf"
+                   "scripts/l3build/"
+                   "source/latex/l3build/"
+                   "tex/latex/l3build/")
+             (base32
+              "0xxzy3xnq71z3sbkdq8glgnqydvr9g11ih2jmg68fmn5m145w8pi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/l3build")
+    (synopsis "Testing and building system for LaTeX")
+    (description
+     "The @code{l3build} module is designed to support the development of
 high-quality LaTeX code by providing: a unit testing system, automated
 typesetting of code sources, and a reliable packaging system for CTAN
-releases.  The bundle consists of a Lua script to run the tasks and a
-@code{.tex} file which provides the testing environment.")
-      (license license:lppl1.3c+))))
+releases.  The bundle consists of a Lua script to run the tasks and
+a @file{.tex} file which provides the testing environment.")
+    (license license:lppl1.3c+)))
 
 (define-public texlive-luabidi
   (package
-- 
cgit 1.4.1


From 1d0ded385ecadc8be4d8c222cd614a4ca4ea5b2d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:09:59 +0200
Subject: gnu: texlive-url: Refresh package definition.

* gnu/packages/tex.scm (texlive-url): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b64a08eaa0..40615d3d87 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4155,14 +4155,16 @@ are part of the LaTeX required tools distribution, comprising the packages:
 
 (define-public texlive-url
   (package
-    (inherit (simple-texlive-package
-              "texlive-url"
-              (list "/doc/latex/url/"
-                    "/tex/latex/url/")
-              (base32
-               "184m40wgnx939ky2hbxnj0v9aak023ldrhgffp0lgyk9wdqpxlqg")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/url")
+    (name "texlive-url")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/url/" "tex/latex/url/")
+             (base32
+              "184m40wgnx939ky2hbxnj0v9aak023ldrhgffp0lgyk9wdqpxlqg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/url")
     (synopsis "Verbatim with URL-sensitive line breaks")
     (description "The command @code{\\url} is a form of verbatim command that
 allows linebreaks at certain characters or combinations of characters, accepts
-- 
cgit 1.4.1


From c5ec7db831b88ec9047ea89d2d20571e9cd72cc7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:11:46 +0200
Subject: gnu: texlive-greek-fontenc: Refresh package definition.

* gnu/packages/tex.scm (texlive-greek-fontenc): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 40615d3d87..8dbffa831d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3755,19 +3755,22 @@ documents.  It comprises the packages @code{color}, @code{graphics},
 
 (define-public texlive-greek-fontenc
   (package
-    (inherit (simple-texlive-package
-              "texlive-greek-fontenc"
-              (list "doc/latex/greek-fontenc/"
-                    "tex/latex/greek-fontenc/"
-                    "source/latex/greek-fontenc/")
-              (base32
-               "1ncsvj5mlnkgllrvqdnbkv0qwpv2y7jkq3x2wdmm7d3daqq0ka5h")
-              #:trivial? #t))
-    (home-page "https://ctan.org/language/greek/greek-fontenc")
+    (name "texlive-greek-fontenc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/greek-fontenc/"
+                   "source/latex/greek-fontenc/"
+                   "tex/latex/greek-fontenc/")
+             (base32
+              "1ncsvj5mlnkgllrvqdnbkv0qwpv2y7jkq3x2wdmm7d3daqq0ka5h")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/greek-fontenc")
     (synopsis "LICR macros and encoding definition files for Greek")
     (description
-     "The package provides Greek LICR macro definitions and encoding definition files
-for Greek text font encodings for use with fontenc.")
+     "The package provides Greek LICR macro definitions and encoding
+definition files for Greek text font encodings for use with @code{fontenc}.")
     (license license:lppl1.3+)))
 
 (define-public texlive-hycolor
-- 
cgit 1.4.1


From 95e66036b18c3f951f90977f53b5dd6ad74e5be5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:24:04 +0200
Subject: gnu: texlive-graphics-cfg: Refresh package definition.

* gnu/packages/tex.scm (texlive-graphics-cfg): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8dbffa831d..08b137ab1a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3712,14 +3712,17 @@ packages.")
 
 (define-public texlive-graphics-cfg
   (package
-    (inherit (simple-texlive-package
-              "texlive-graphics-cfg"
-              (list "/doc/latex/graphics-cfg/README.md"
-                    "/tex/latex/graphics-cfg/")
-              (base32
-               "00n63adb2laf43lzix39xl68aq0k5k80mmrw602w99w5n7f96gsf")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/latex-graphics")
+    (name "texlive-graphics-cfg")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/graphics-cfg/"
+                   "tex/latex/graphics-cfg/")
+             (base32
+              "00n63adb2laf43lzix39xl68aq0k5k80mmrw602w99w5n7f96gsf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/graphics-cfg")
     (synopsis "Sample configuration files for LaTeX color and graphics")
     (description
      "This bundle includes @file{color.cfg} and @file{graphics.cfg} files that
-- 
cgit 1.4.1


From a9fd178710614e46761c8a7547954345ca0d484d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:25:37 +0200
Subject: gnu: texlive-graphics-def: Refresh package definition.

* gnu/packages/tex.scm (texlive-graphics-def): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 08b137ab1a..2d91577633 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3692,17 +3692,18 @@ Unicode points; it is maintained by Adobe.  The additional
 
 (define-public texlive-graphics-def
   (package
-    (inherit (simple-texlive-package
-              "texlive-graphics-def"
-              (list "/doc/latex/graphics-def/README.md"
-                    "/tex/latex/graphics-def/")
-              (base32
-               "0b66fy06safyrd717rfr476g1gz6nqfv1vqvam7ac2yy0g0djb17")
-              #:trivial? #t))
-    (propagated-inputs
-     (list texlive-epstopdf-pkg))
-    (home-page "https://www.ctan.org/pkg/latex-graphics")
-    (synopsis "Color and graphics option files")
+    (name "texlive-graphics-def")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/graphics-def/"
+                   "tex/latex/graphics-def/")
+             (base32
+              "0b66fy06safyrd717rfr476g1gz6nqfv1vqvam7ac2yy0g0djb17")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/graphics-def")
+    (synopsis "Colour and graphics option files")
     (description
      "This bundle is a combined distribution consisting of @file{dvips.def},
 @file{pdftex.def}, @file{luatex.def}, @file{xetex.def}, @file{dvipdfmx.def},
-- 
cgit 1.4.1


From 8ba050da8b0c690270666403333e7bdd764fe73c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:31:41 +0200
Subject: gnu: texlive-glyphlist: Refresh package definition.

* gnu/packages/tex.scm (texlive-glyphlist): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2d91577633..738307fafd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3676,18 +3676,20 @@ the @file{.tex} extension.")
 
 (define-public texlive-glyphlist
   (package
-    (inherit (simple-texlive-package
-              "texlive-glyphlist"
-              (list "fonts/map/glyphlist/")
-              (base32
-               "12nmmyh77vr2622lzi11nm1z1k2bxs7jz018yl4rwjlpg0sxg1ja")
-              #:trivial? #t))
-    (home-page "https://www.tug.org/texlive/")
-    (synopsis "Adobe glyph list and TeX extensions")
+    (name "texlive-glyphlist")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/map/glyphlist/")
+             (base32
+              "12nmmyh77vr2622lzi11nm1z1k2bxs7jz018yl4rwjlpg0sxg1ja")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/glyphlist")
+    (synopsis "Adobe Glyph List and TeX extensions")
     (description
      "This package provides a map between traditional Adobe glyph names and
 Unicode points; it is maintained by Adobe.  The additional
-@file{texglyphlist.txt} is maintained as part of lcdf-typetools.")
+@file{texglyphlist.txt} is maintained as part of @code{lcdf-typetools}.")
     (license license:asl2.0)))
 
 (define-public texlive-graphics-def
-- 
cgit 1.4.1


From 30c25477b6f66cfb0725995a010e606edc2809f6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:33:26 +0200
Subject: gnu: texlive-fancyvrb: Refresh package definition.

* gnu/packages/tex.scm (texlive-fancyvrb): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 738307fafd..e4ec634358 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3630,14 +3630,16 @@ users, via its Plain TeX version.)")
 
 (define-public texlive-fancyvrb
   (package
-    (inherit (simple-texlive-package
-              "texlive-fancyvrb"
-              (list "/doc/latex/fancyvrb/README"
-                    "/tex/latex/fancyvrb/")
-              (base32
-               "0pdilgpw4zc0ipp4z9kdi61nymifyjy2mfpk74xk2cw9vhynkk3w")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/fancyvrb")
+    (name "texlive-fancyvrb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fancyvrb/" "tex/latex/fancyvrb/")
+             (base32
+              "0c7y3hfhsvn3qipkq0g5zl9r6aa7bhjvrafxn0w29rpxgs3mc4jj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fancyvrb")
     (synopsis "Sophisticated verbatim text")
     (description
      "This package provides tools for the flexible handling of verbatim text
@@ -3646,7 +3648,7 @@ with many parameters; ability to define new customized verbatim environments;
 save and restore verbatim text and environments; write and read files in
 verbatim mode; build \"example\" environments (showing both result and
 verbatim source).")
-    (license license:lppl1.0+)))
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-latex-fancyvrb texlive-fancyvrb)
 
-- 
cgit 1.4.1


From e393e20b8298c333061d8da1e0e52fafa8a64e3e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:34:42 +0200
Subject: gnu: texlive-epsf: Refresh package definition.

* gnu/packages/tex.scm (texlive-epsf): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e4ec634358..ef80981185 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3608,14 +3608,16 @@ one before, and one after the final @code{\\clearpage}.")
 
 (define-public texlive-epsf
   (package
-    (inherit (simple-texlive-package
-              "texlive-epsf"
-              (list "/doc/generic/epsf/"
-                    "/tex/generic/epsf/")
-              (base32
-               "03jcf0kqh47is965d2590miwj7d5kif3c4mgsnvkyl664jzjkh92")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/epsf")
+    (name "texlive-epsf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/epsf/" "tex/generic/epsf/")
+             (base32
+              "03jcf0kqh47is965d2590miwj7d5kif3c4mgsnvkyl664jzjkh92")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/epsf")
     (synopsis "Simple macros for EPS inclusion")
     (description
      "This package provides the original (and now obsolescent) graphics
-- 
cgit 1.4.1


From 5bc81da921dee4cd057970481eb026a110018a32 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:36:21 +0200
Subject: gnu: texlive-latexconfig: Refresh package definition.

* gnu/packages/tex.scm (texlive-latexconfig): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ef80981185..86833f764e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3175,13 +3175,16 @@ default and narrow versions of multiple integrals.")
 
 (define-public texlive-latexconfig
   (package
-    (inherit (simple-texlive-package
-              "texlive-latexconfig"
-              (list "/tex/latex/latexconfig/")
-              (base32
-               "1x5fyr2185nx3qlyariykdz44hcy5azimrk9db2p707dg08bjhsd")
-              #:trivial? #t))
-    (home-page "https://www.tug.org/")
+    (name "texlive-latexconfig")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/latex/latexconfig/")
+             (base32
+              "1x5fyr2185nx3qlyariykdz44hcy5azimrk9db2p707dg08bjhsd")))
+    (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-base #f))
+    (home-page "https://ctan.org/pkg/latexconfig")
     (synopsis "Configuration files for LaTeX-related formats")
     (description "The package provides configuration files for LaTeX-related
 formats.")
-- 
cgit 1.4.1


From 7985be834b03cd2e8e672883dc794184486a7903 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:44:57 +0200
Subject: gnu: texlive-kpfonts: Refresh package definition.

* gnu/packages/tex.scm (texlive-kpfonts): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 86833f764e..cd703158ae 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3146,19 +3146,23 @@ mechanism.  This package provides supporting files.")
 
 (define-public texlive-kpfonts
   (package
-    (inherit (simple-texlive-package
-              "texlive-kpfonts"
-              (list "doc/fonts/kpfonts/"
-                    "fonts/enc/dvips/kpfonts/"
-                    "fonts/map/dvips/kpfonts/"
-                    "fonts/tfm/public/kpfonts/"
-                    "fonts/type1/public/kpfonts/"
-                    "fonts/vf/public/kpfonts/"
-                    "source/fonts/kpfonts/"
-                    "tex/latex/kpfonts/")
-              (base32 "0inai1p9bbjd5x790nsamakjaj0imvwv21mp9f98dwvdlj58vkqb")
-              #:trivial? #t))
-    (home-page "https://ctan.org/fonts/kpfonts")
+    (name "texlive-kpfonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/kpfonts/"
+                   "fonts/enc/dvips/kpfonts/"
+                   "fonts/map/dvips/kpfonts/"
+                   "fonts/tfm/public/kpfonts/"
+                   "fonts/type1/public/kpfonts/"
+                   "fonts/vf/public/kpfonts/"
+                   "source/fonts/kpfonts/"
+                   "tex/latex/kpfonts/")
+             (base32
+              "0inai1p9bbjd5x790nsamakjaj0imvwv21mp9f98dwvdlj58vkqb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/kpfonts")
     (synopsis "Complete set of fonts for text and mathematics")
     (description
      "The family contains text fonts in roman, sans-serif and monospaced
-- 
cgit 1.4.1


From 2ff9e2eadc18bd4447d8c346e303f5a43fb59a24 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:48:50 +0200
Subject: gnu: texlive-kpathsea: Refresh package definition.

* gnu/packages/tex.scm (texlive-kpathsea): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 137 +++++++++++++++++++++++++++++----------------------
 1 file changed, 78 insertions(+), 59 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cd703158ae..35161f56c0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3084,65 +3084,84 @@ package.")
     (license license:lppl1.3+)))
 
 (define-public texlive-kpathsea
-  (let ((template (simple-texlive-package
-                   "texlive-kpathsea"
-                   (list "/web2c/amiga-pl.tcx"
-                         "/web2c/cp1250cs.tcx"
-                         "/web2c/cp1250pl.tcx"
-                         "/web2c/cp1250t1.tcx"
-                         "/web2c/cp227.tcx"
-                         "/web2c/cp852-cs.tcx"
-                         "/web2c/cp852-pl.tcx"
-                         "/web2c/cp8bit.tcx"
-                         "/web2c/empty.tcx"
-                         "/web2c/fmtutil.cnf"
-                         "/web2c/il1-t1.tcx"
-                         "/web2c/il2-cs.tcx"
-                         "/web2c/il2-pl.tcx"
-                         "/web2c/il2-t1.tcx"
-                         "/web2c/kam-cs.tcx"
-                         "/web2c/kam-t1.tcx"
-                         "/web2c/macce-pl.tcx"
-                         "/web2c/macce-t1.tcx"
-                         "/web2c/maz-pl.tcx"
-                         "/web2c/mktex.cnf"
-                         "/web2c/mktex.opt"
-                         "/web2c/mktexdir"
-                         "/web2c/mktexdir.opt"
-                         "/web2c/mktexnam"
-                         "/web2c/mktexnam.opt"
-                         "/web2c/mktexupd"
-                         "/web2c/natural.tcx"
-                         "/web2c/tcvn-t5.tcx"
-                         "/web2c/viscii-t5.tcx")
-                   (base32
-                    "08nfk5hicqbvnz73rjbxi97lcakd9i1k2cy4qi2cwghan92650jq")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:phases phases '%standard-phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'patch-references
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (let ((dirs (map dirname (list (which "sed")
-                                                (which "awk")))))
-                   (substitute* '("web2c/mktexdir"
-                                  "web2c/mktexnam"
-                                  "web2c/mktexupd")
-                     (("^version=" m)
-                      (format #false "PATH=\"~{~a:~}$PATH\"; export PATH~%~a"
-                              dirs m))))))))))
-      (inputs
-       (list sed gawk))
-      (home-page "https://www.tug.org/texlive/")
-      (synopsis "Files related to the path searching library for TeX")
-      (description "Kpathsea is a library and utility programs which provide
-path searching facilities for TeX file types, including the self-locating
-feature required for movable installations, layered on top of a general search
-mechanism.  This package provides supporting files.")
-      (license license:lgpl3+))))
+  (package
+    (name "texlive-kpathsea")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/info/dir"
+                   "doc/info/kpathsea.info"
+                   "doc/info/tds.info"
+                   "doc/info/web2c.info"
+                   "doc/kpathsea/"
+                   "doc/man/man1/kpseaccess.1"
+                   "doc/man/man1/kpseaccess.man1.pdf"
+                   "doc/man/man1/kpsereadlink.1"
+                   "doc/man/man1/kpsereadlink.man1.pdf"
+                   "doc/man/man1/kpsestat.1"
+                   "doc/man/man1/kpsestat.man1.pdf"
+                   "doc/man/man1/kpsewhich.1"
+                   "doc/man/man1/kpsewhich.man1.pdf"
+                   "doc/web2c/web2c.html"
+                   "doc/web2c/web2c.pdf"
+                   "web2c/amiga-pl.tcx"
+                   "web2c/cp1250cs.tcx"
+                   "web2c/cp1250pl.tcx"
+                   "web2c/cp1250t1.tcx"
+                   "web2c/cp227.tcx"
+                   "web2c/cp852-cs.tcx"
+                   "web2c/cp852-pl.tcx"
+                   "web2c/cp8bit.tcx"
+                   "web2c/empty.tcx"
+                   "web2c/fmtutil.cnf"
+                   "web2c/il1-t1.tcx"
+                   "web2c/il2-cs.tcx"
+                   "web2c/il2-pl.tcx"
+                   "web2c/il2-t1.tcx"
+                   "web2c/kam-cs.tcx"
+                   "web2c/kam-t1.tcx"
+                   "web2c/macce-pl.tcx"
+                   "web2c/macce-t1.tcx"
+                   "web2c/maz-pl.tcx"
+                   "web2c/mktex.cnf"
+                   "web2c/mktex.opt"
+                   "web2c/mktexdir"
+                   "web2c/mktexdir.opt"
+                   "web2c/mktexnam"
+                   "web2c/mktexnam.opt"
+                   "web2c/mktexupd"
+                   "web2c/natural.tcx"
+                   "web2c/tcvn-t5.tcx"
+                   "web2c/texmf.cnf"
+                   "web2c/viscii-t5.tcx")
+             (base32
+              "0wfixvszpmri2j19wbg69fqw2iiqmn7blrbxhq17qddbwinm1dbq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:texlive-latex-base #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-references
+            (lambda _
+              (let ((dirs (map dirname (list (which "sed")
+                                             (which "awk")))))
+                (substitute* '("web2c/mktexdir"
+                               "web2c/mktexnam"
+                               "web2c/mktexupd")
+                  (("^version=" m)
+                   (format #false "PATH=\"~{~a:~}$PATH\"; export PATH~%~a"
+                           dirs m)))))))))
+    (inputs (list sed gawk))
+    (home-page "https://ctan.org/pkg/kpathsea")
+    (synopsis "Files related to the path searching library for TeX")
+    (description
+     "Kpathsea is a library and utility programs which provide path searching
+facilities for TeX file types, including the self-locating feature required
+for movable installations, layered on top of a general search mechanism.  This
+package provides supporting files.")
+    (license license:lgpl3+)))
 
 (define-public texlive-kpfonts
   (package
-- 
cgit 1.4.1


From 606f33421d4d481cbdc6013599a1354a5ea6aa3b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 22:55:45 +0200
Subject: gnu: texlive-inputenx: Refresh package definition.

* gnu/packages/tex.scm (texlive-inputenx): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 35161f56c0..cd3b5fd22f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3066,21 +3066,23 @@ UCY (Omega Unicode Cyrillic), LCY, LWN (OT2), and koi8-r.")
 
 (define-public texlive-inputenx
   (package
-    (inherit (simple-texlive-package
-              "texlive-inputenx"
-              (list "doc/latex/inputenx/"
-                    "tex/latex/inputenx/"
-                    "source/latex/inputenx/")
-              (base32
-               "0snjndrcynm4w8m9iq8gmadzhrbwvsdy4y1ak24ia0hpsicdi4aj")
-              #:trivial? #t))
-    (home-page "https://ctan.org/macros/latex/contrib/inputenx")
+    (name "texlive-inputenx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/inputenx/" "source/latex/inputenx/"
+                   "tex/latex/inputenx/")
+             (base32
+              "0snjndrcynm4w8m9iq8gmadzhrbwvsdy4y1ak24ia0hpsicdi4aj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/inputenx")
     (synopsis "Enhanced input encoding handling")
     (description
-     "This package deals with input encodings.  It provides a wider range of input
-encodings using standard mappings, than does inputenc.  It also covers nearly all
-slots.  In this way, it serves as more up to date replacement for the inputenc
-package.")
+     "This package deals with input encodings.  It provides a wider range of
+input encodings using standard mappings, than does @code{inputenc}.  It also
+covers nearly all slots.  In this way, it serves as more up to date
+replacement for the @code{inputenc} package.")
     (license license:lppl1.3+)))
 
 (define-public texlive-kpathsea
-- 
cgit 1.4.1


From fd4fae6620cb857538782326569c9eb8459a775c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 23:35:16 +0200
Subject: gnu: texlive-ruhyphen: Refresh package definition.

* gnu/packages/tex.scm (texlive-ruhyphen): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[arguments]<#:phases>: Remove buggy phase generating only empty files.
[native-inputs]: Remove COREUTILS, GAWK, SED, GREP, PERL.
---
 gnu/packages/tex.scm | 46 +++++++++++++++-------------------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cd3b5fd22f..f54934437d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3030,39 +3030,23 @@ T2A.")
     (license license:lppl)))
 
 (define-public texlive-ruhyphen
-  (let ((template (simple-texlive-package
-                   "texlive-ruhyphen"
-                   (list "/source/generic/ruhyphen/"
-                         "/tex/generic/ruhyphen/")
-                   (base32
-                    "18n1bqhh8jv765vz3a3fjwffy7m71vhwx9yq8zl0p5j7p72q9qcn")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (replace 'build
-               (lambda _
-                 (let ((cwd (getcwd)))
-                   ;; Remove generated files.
-                   (for-each delete-file
-                             (find-files "tex/generic/ruhyphen/"
-                                         "^cyry.*.tex$"))
-                   (substitute* "source/generic/ruhyphen/Makefile"
-                     (("./mkcyryo") (string-append cwd "/source/generic/ruhyphen/mkcyryo")))
-                   (with-directory-excursion "tex/generic/ruhyphen"
-                     (invoke "make" "-f"
-                             (string-append cwd "/source/generic/ruhyphen/Makefile"))))))))))
-      (native-inputs
-       (list coreutils gawk sed grep perl))
-      (home-page "https://www.ctan.org/pkg/ruhyphen")
-      (synopsis "Hyphenation patterns for Russian")
-      (description "The package provides a collection of Russian hyphenation
+  (package
+    (name "texlive-ruhyphen")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "source/generic/ruhyphen/"
+                   "tex/generic/ruhyphen/")
+             (base32
+              "18n1bqhh8jv765vz3a3fjwffy7m71vhwx9yq8zl0p5j7p72q9qcn")))
+    (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-base #f))
+    (home-page "https://ctan.org/pkg/ruhyphen")
+    (synopsis "Hyphenation patterns for Russian")
+    (description "The package provides a collection of Russian hyphenation
 patterns supporting a number of Cyrillic font encodings, including T2,
 UCY (Omega Unicode Cyrillic), LCY, LWN (OT2), and koi8-r.")
-      (license license:lppl))))
+    (license license:lppl)))
 
 (define-public texlive-inputenx
   (package
-- 
cgit 1.4.1


From 2efc69ca6b7a9c1eb0d7c906dfc187d96c5f978f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 23:36:49 +0200
Subject: gnu: texlive-ukrhyph: Refresh package definition.

* gnu/packages/tex.scm (texlive-ukrhyph): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f54934437d..d3b988d0f6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3015,15 +3015,18 @@ bundle.")
 
 (define-public texlive-ukrhyph
   (package
-    (inherit (simple-texlive-package
-              "texlive-ukrhyph"
-              (list "/doc/generic/ukrhyph/"
-                    "/tex/generic/ukrhyph/")
-              (base32
-               "01ma274sixcrbpb7fpqkxwfvrnzfj2srv9b4a42rfnph1pdql74z")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/ukrhyph")
-    (synopsis "Hyphenation patterns for Ukrainian")
+    (name "texlive-ukrhyph")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/ukrhyph/" "tex/generic/ukrhyph/")
+             (base32
+              "01ma274sixcrbpb7fpqkxwfvrnzfj2srv9b4a42rfnph1pdql74z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-base #f))
+    (home-page "https://ctan.org/pkg/ukrhyph")
+    (synopsis "Hyphenation Patterns for Ukrainian")
     (description "The package provides a range of hyphenation patterns for
 Ukrainian, depending on the encoding of the output font including the standard
 T2A.")
-- 
cgit 1.4.1


From 6092f24536962ef8e66f7942c16ae5fb3983a2e4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 23:39:07 +0200
Subject: gnu: texlive-dehyph-exptl: Refresh package definition.

* gnu/packages/tex.scm (texlive-dehyph-exptl): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d3b988d0f6..7a7bc79038 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2992,20 +2992,24 @@ patterns as well.")
 
 (define-public texlive-dehyph-exptl
   (package
-    (inherit (simple-texlive-package
-              "texlive-dehyph-exptl"
-              (list "/tex/generic/dehyph-exptl/"
-                    "/doc/generic/dehyph-exptl/")
-              (base32
-               "0l57a0r4gycp94kz6lrxqvh9m57j2shmbr2laf5zjb0qnrisq46d")
-              #:trivial? #t))
-    (propagated-inputs
-     (list texlive-hyphen-base texlive-hyph-utf8))
-    (home-page "http://projekte.dante.de/Trennmuster/WebHome")
+    (name "texlive-dehyph-exptl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/dehyph-exptl/"
+                   "tex/generic/dehyph-exptl/")
+             (base32
+              "0l57a0r4gycp94kz6lrxqvh9m57j2shmbr2laf5zjb0qnrisq46d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-base #f))
+    (propagated-inputs (list texlive-hyph-utf8 texlive-hyphen-base))
+    (home-page "https://ctan.org/pkg/dehyph-exptl")
     (synopsis "Hyphenation patterns for German")
-    (description "The package provides experimental hyphenation patterns for
-the German language, covering both traditional and reformed orthography.  The
-patterns can be used with packages Babel and hyphsubst from the Oberdiek
+    (description
+     "The package provides experimental hyphenation patterns for the German
+language, covering both traditional and reformed orthography.  The patterns
+can be used with packages Babel and @code{hyphsubst} from the Oberdiek
 bundle.")
     ;; Hyphenation patterns are under the Expat license; documentation is
     ;; under LPPL.
-- 
cgit 1.4.1


From b5279feb7e9e15f98ca798d85c39df4d8f7261be Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 23:40:24 +0200
Subject: gnu: texlive-helvetic: Refresh package definition.

* gnu/packages/tex.scm (texlive-helvetic): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7a7bc79038..ef2fef4def 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1973,27 +1973,30 @@ this useful when writing out arbitrary text to an external file.")
 
 (define-public texlive-helvetic
   (package
-    (inherit (simple-texlive-package
-              "texlive-helvetic"
-              (list "/dvips/helvetic/"
-                    "/fonts/afm/adobe/helvetic/"
-                    "/fonts/afm/urw/helvetic/"
-                    "/fonts/map/dvips/helvetic/"
-                    "/fonts/tfm/adobe/helvetic/"
-                    "/fonts/tfm/monotype/helvetic/"
-                    "/fonts/tfm/urw35vf/helvetic/"
-                    "/fonts/type1/urw/helvetic/"
-                    "/fonts/vf/adobe/helvetic/"
-                    "/fonts/vf/monotype/helvetic/"
-                    "/fonts/vf/urw35vf/helvetic/"
-                    "/tex/latex/helvetic/")
-              (base32
-               "0c3f1ly7y6404z0akbfbbfql13sz717v0n0g69qjpr69hi4n0nsl")
-              #:trivial? #t))
+    (name "texlive-helvetic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/helvetic/"
+                   "fonts/afm/adobe/helvetic/"
+                   "fonts/afm/urw/helvetic/"
+                   "fonts/map/dvips/helvetic/"
+                   "fonts/tfm/adobe/helvetic/"
+                   "fonts/tfm/monotype/helvetic/"
+                   "fonts/tfm/urw35vf/helvetic/"
+                   "fonts/type1/urw/helvetic/"
+                   "fonts/vf/adobe/helvetic/"
+                   "fonts/vf/monotype/helvetic/"
+                   "fonts/vf/urw35vf/helvetic/"
+                   "tex/latex/helvetic/")
+             (base32
+              "0c3f1ly7y6404z0akbfbbfql13sz717v0n0g69qjpr69hi4n0nsl")))
+    (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/urw-base35")
     (synopsis "URW Base 35 font pack for LaTeX")
-    (description "This package provides a drop-in replacements for the Helvetica
-font from Adobe's basic set.")
+    (description
+     "This package provides a drop-in replacements for the Helvetica font from
+Adobe's basic set.")
     ;; No license version specified.
     (license license:gpl3+)))
 
-- 
cgit 1.4.1


From 7f19818e4e90a1079f29cd577107bf5431e9326a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 23:45:16 +0200
Subject: gnu: texlive-hardwrap: Refresh package definition.

* gnu/packages/tex.scm (texlive-hardwrap): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-IFPLATFORM, TEXLIVE-IFTEX, TEXLIVE-PDFTEXCMDS.
---
 gnu/packages/tex.scm | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ef2fef4def..9e90bb0ca1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1953,22 +1953,29 @@ rest of the mathematics produced by (AmS-)LaTeX.")
 
 (define-public texlive-hardwrap
   (package
-    (inherit (simple-texlive-package
-              "texlive-hardwrap"
-              (list "doc/latex/hardwrap/"
-                    "tex/latex/hardwrap/"
-                    "source/latex/hardwrap/")
-              (base32
-               "0ql3xml1ccll44q945n7w72p6d51y5wcrkawi7cg621gy5d6wzx5")
-              #:trivial? #t))
-    (home-page "https://ctan.org/macros/latex/contrib/hardwrap")
+    (name "texlive-hardwrap")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hardwrap/" "source/latex/hardwrap/"
+                   "tex/latex/hardwrap/")
+             (base32
+              "0ql3xml1ccll44q945n7w72p6d51y5wcrkawi7cg621gy5d6wzx5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-ifplatform
+           texlive-iftex
+           texlive-pdftexcmds))
+    (home-page "https://ctan.org/pkg/hardwrap")
     (synopsis "Hard wrap text to a certain character length")
     (description
-     "The package facilitates wrapping text to a specific character width, breaking
-lines by words rather than, as done by TeX, by characters.  The primary use for
-these facilities is to aid the generation of messages sent to the log file or
-console output to display messages to the user.  Package authors may also find
-this useful when writing out arbitrary text to an external file.")
+     "The package facilitates wrapping text to a specific character width,
+breaking lines by words rather than, as done by TeX, by characters.  The
+primary use for these facilities is to aid the generation of messages sent to
+the log file or console output to display messages to the user.  Package
+authors may also find this useful when writing out arbitrary text to an
+external file.")
     (license license:lppl1.3+)))
 
 (define-public texlive-helvetic
-- 
cgit 1.4.1


From 02277f9213b8ad25c9adccdfef9f246e09622eb0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 23:53:29 +0200
Subject: gnu: texlive-etex: Refresh package definition.

* gnu/packages/tex.scm (texlive-etex): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[native-inputs]: Remove TEXLIVE-BIN.
---
 gnu/packages/tex.scm | 126 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 77 insertions(+), 49 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9e90bb0ca1..14e24b3060 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1832,60 +1832,88 @@ output encodings, and features generation of clean UTF-8 patterns.")
 ;; This provides etex.src which is needed to build various formats, including
 ;; luatex.fmt and pdflatex.fmt
 (define-public texlive-etex
-  (let ((template (simple-texlive-package
-                   "texlive-etex"
-                   (list "/doc/etex/base/"
-                         "/doc/man/man1/etex.1"
-                         "/doc/man/man1/etex.man1.pdf"
-                         "/tex/plain/etex/"
-                         "/fonts/source/public/etex/")
-                   (base32
-                    "1qv6vxm5a8pw38gas3i69ivmsn79zj2yq5n5vdmh0rzic5hw2hmc")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:phases phases)
-          `(modify-phases ,phases
-             ;; Build tfm font.
-             (replace 'build
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (let ((mf (assoc-ref inputs "texlive-metafont")))
-                   ;; Tell mf where to find mf.base
-                   (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c"))
-                   ;; Tell mf where to look for source files
+  (package
+    (name "texlive-etex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/etex/base/"
+                   "doc/man/man1/etex.1"
+                   "doc/man/man1/etex.man1.pdf"
+                   "fonts/source/public/etex/"
+                   "fonts/tfm/public/etex/"
+                   "tex/plain/etex/")
+             (base32
+              "17pvh7i9zw8qa5hr53kci7di64fqzx4j35gsn28s36b74x6xj4bc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:texlive-latex-base #f
+      #:modules
+      '((guix build texlive-build-system)
+        (guix build utils)
+        (srfi srfi-1)
+        (srfi srfi-26))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'generate-fonts-metrics
+            (lambda _
+              (let ((cm #$(this-package-native-input "texlive-cm"))
+                    (metafont #$(this-package-native-input "texlive-metafont"))
+                    (fonts-directories
+                     (delete-duplicates
+                      (map (lambda (f)
+                             (string-drop (dirname f) (string-length "./")))
+                           (find-files "." "[0-9]+\\.mf$"))))
+                    (root (getcwd)))
+                (mkdir-p "build")
+                ;; Tell mf where to find mf.base.
+                (setenv "MFBASES"
+                        (string-append metafont "/share/texmf-dist/web2c/"))
+                (for-each
+                 (lambda (directory)
+                   ;; Tell mf where to look for source files.
                    (setenv "MFINPUTS"
-                           (string-append (getcwd)
-                                          "/fonts/source/public/etex/:"
-                                          mf "/share/texmf-dist/metafont/base:"
-                                          (assoc-ref inputs "texlive-cm")
-                                          "/share/texmf-dist/fonts/source/public/cm")))
-                 (invoke "mf" "-progname=mf"
-                         (string-append "\\"
-                                        "mode:=ljfour; "
-                                        "mag:=1; "
-                                        "scrollmode; "
-                                        "input xbmc10"))
-                 #t))
-             (add-after 'install 'install-font
-               (lambda* (#:key outputs #:allow-other-keys)
-                 (install-file
-                  "xbmc10.tfm"
-                  (string-append (assoc-ref outputs "out")
-                                 "/share/texmf-dist/fonts/tfm/public/etex/"))
-                 #t))))))
-      (native-inputs
-       (list texlive-bin texlive-metafont texlive-cm))
-      (home-page "https://www.ctan.org/pkg/etex")
-      (synopsis "Extended version of TeX")
-      (description
-       "This package provides an extended version of TeX (which is capable of
+                           (string-append
+                            (getcwd) "/" directory ":"
+                            metafont "/share/texmf-dist/metafont/base/:"
+                            cm "/share/texmf-dist/fonts/source/public/cm/"))
+                   ;; Build font metrics (tfm).
+                   (with-directory-excursion directory
+                     (for-each (lambda (font)
+                                 (format #t "building font ~a\n" font)
+                                 (invoke "mf" "-progname=mf"
+                                         (string-append "-output-directory="
+                                                        root "/build")
+                                         (string-append "\\"
+                                                        "mode:=ljfour; "
+                                                        "mag:=1; "
+                                                        "batchmode; "
+                                                        "input "
+                                                        (basename font ".mf"))))
+                               (find-files "." "[0-9]+\\.mf$")))
+                   ;; Install font metrics at the appropriate location.
+                   (let ((destination
+                          ;; fonts/source/xxx/yyy/... -> fonts/tfm/xxx/yyy/...
+                          (string-append "fonts/tfm"
+                                         (string-drop
+                                          directory
+                                          (string-length "fonts/source")))))
+                     (format #t "moving font metrics in ~a\n" destination)
+                     (for-each (cut install-file <> destination)
+                               (find-files "build/" "\\.tfm$"))))
+                 fonts-directories)))))))
+    (native-inputs (list texlive-cm texlive-metafont))
+    (home-page "https://www.ctan.org/pkg/etex")
+    (synopsis "Extended version of TeX")
+    (description
+     "This package provides an extended version of TeX (which is capable of
 running as if it were TeX unmodified).  E-TeX has been specified by the LaTeX
 team as the engine for the development of LaTeX2e; as a result, LaTeX
 programmers may assume e-TeX functionality.  The pdftex engine directly
 incorporates the e-TeX extensions.")
-      (license license:knuth))))
+    (license license:knuth)))
 
 (define-public texlive-plain
   (package
-- 
cgit 1.4.1


From 2fe780d14dc79122e0d45aa1fe578794e38ad73c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 23:56:12 +0200
Subject: gnu: texlive-mkpattern: Refresh package definition.

* gnu/packages/tex.scm (texlive-mkpattern): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 14e24b3060..7f8822c0cf 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1811,22 +1811,22 @@ details can be found in the documentation.")
 
 (define-public texlive-mkpattern
   (package
-    (inherit (simple-texlive-package
-              "texlive-mkpattern"
-              (list "/doc/plain/mkpattern/README"
-                    "/doc/plain/mkpattern/mkpatdoc.tex"
-                    "/doc/plain/mkpattern/mkpatter.pdf"
-                    "/doc/plain/mkpattern/mkpattern-exmpl.tex"
-                    "/tex/plain/mkpattern/mkpatter.tex")
-              (base32
-               "0sxnkbcc802jl3fj56x9hvg978bpv15lhrwj0aykb4syq29l47ga")
-              #:trivial? #t))
+    (name "texlive-mkpattern")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/mkpattern/" "tex/plain/mkpattern/")
+             (base32
+              "0sxnkbcc802jl3fj56x9hvg978bpv15lhrwj0aykb4syq29l47ga")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/mkpattern")
     (synopsis "Utility for making hyphenation patterns")
-    (description "Mkpattern is a general purpose program for the generation of
-hyphenation patterns, with definition of letter sets and template-like
-constructions.  It also provides an easy way to handle different input and
-output encodings, and features generation of clean UTF-8 patterns.")
+    (description
+     "Mkpattern is a general purpose program for the generation of hyphenation
+patterns, with definition of letter sets and template-like constructions.  It
+also provides an easy way to handle different input and output encodings, and
+features generation of clean UTF-8 patterns.")
     (license license:lppl)))
 
 ;; This provides etex.src which is needed to build various formats, including
-- 
cgit 1.4.1


From 743373c12568073c53406e57676868c7ae8ba500 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 16 May 2023 23:58:06 +0200
Subject: gnu: texlive-mflogo-font: Refresh package definition.

* gnu/packages/tex.scm (texlive-mflogo-font): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7f8822c0cf..91f28574d5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1676,17 +1676,20 @@ logos in LaTeX documents.")
 
 (define-public texlive-mflogo-font
   (package
-    (inherit (simple-texlive-package
-              "texlive-mflogo-font"
-              (list "/doc/fonts/mflogo-font/README"
-                    "/fonts/afm/hoekwater/mflogo-font/"
-                    "/fonts/map/dvips/mflogo-font/"
-                    "/fonts/type1/hoekwater/mflogo-font/")
-              (base32
-               "094mknjv8ki2pvj1zin0f1z4f1w12g0cfqjiqcsawjsry4yfrmbg")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/mflogo-font")
-    (synopsis "Metafont logo font")
+    (name "texlive-mflogo-font")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/mflogo-font/"
+                   "fonts/afm/hoekwater/mflogo-font/"
+                   "fonts/map/dvips/mflogo-font/"
+                   "fonts/type1/hoekwater/mflogo-font/")
+             (base32
+              "094mknjv8ki2pvj1zin0f1z4f1w12g0cfqjiqcsawjsry4yfrmbg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mflogo-font")
+    (synopsis "METAFONT logo font")
     (description
      "These fonts were created in METAFONT by Knuth, for his own publications.
 At some stage, the letters P and S were added, so that the METAPOST logo could
-- 
cgit 1.4.1


From 3a38961b11536d45cdf6d662c3ddb5f7d2e4054e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 00:04:47 +0200
Subject: gnu: texlive-knuth-lib: Refresh package definition.

* gnu/packages/tex.scm (texlive-knuth-lib): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[native-inputs]: Remove TEXLIVE-BIN.  Add TEXLIVE-CM.
---
 gnu/packages/tex.scm | 134 +++++++++++++++++++++++++++++----------------------
 1 file changed, 76 insertions(+), 58 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 91f28574d5..31c7bcdea6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1473,64 +1473,82 @@ conversion software and word processors.")
     (license license:lppl1.3+)))
 
 (define-public texlive-knuth-lib
-  (let ((template (simple-texlive-package
-                   "texlive-knuth-lib"
-                   (list "/fonts/source/public/knuth-lib/"
-                         "/tex/generic/knuth-lib/"
-                         "/tex/plain/knuth-lib/")
-                   (base32
-                    "1cxyqqprp8sj2j4zp9l0wry8cq2awpz3a8i5alzpc4ndg7a6pgdf")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:modules _ '())
-          '((guix build gnu-build-system)
-            (guix build utils)
-            (srfi srfi-26)))
-         ((#:phases phases '())
-          `(modify-phases ,phases
-             (replace 'build
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (with-directory-excursion "fonts/source/public/knuth-lib"
-                   (let ((mf (assoc-ref inputs "texlive-metafont")))
-                     ;; Tell mf where to find mf.base
-                     (setenv "MFBASES"
-                             (string-append mf "/share/texmf-dist/web2c"))
-                     ;; Tell mf where to look for source files
-                     (setenv "MFINPUTS"
-                             (string-append (getcwd) ":"
-                                            mf "/share/texmf-dist/metafont/base")))
-                   (mkdir "build")
-                   (for-each (lambda (font)
-                               (format #t "building font ~a\n" font)
-                               (invoke "mf" "-progname=mf"
-                                       "-output-directory=build"
-                                       (string-append "\\"
-                                                      "mode:=ljfour; "
-                                                      "mag:=1; "
-                                                      "batchmode; "
-                                                      "input " font)))
-                             (find-files "." "(manfnt|logo.+)\\.mf$")))
-                 #t))
-             (add-after 'install 'install-fonts
-               (lambda* (#:key outputs #:allow-other-keys)
-                 (with-directory-excursion "fonts/source/public/knuth-lib"
-                   (let* ((out (assoc-ref outputs "out"))
-                          (tfm (string-append
-                                out "/share/texmf-dist/fonts/tfm/public/knuth-lib")))
-                     (for-each (cut install-file <> tfm)
-                               (find-files "build" "\\.tfm"))
-                     #t))))))))
-      (native-inputs
-       (list texlive-bin texlive-metafont))
-      (home-page "https://www.ctan.org/pkg/knuth-lib")
-      (synopsis "Small library of METAFONT sources")
-      (description "This is a collection of core TeX and METAFONT macro files
-from Donald Knuth, including the plain format, plain base, and the MF logo
-fonts.")
-      (license license:knuth))))
+  (package
+    (name "texlive-knuth-lib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/source/public/knuth-lib/"
+                   "fonts/tfm/public/knuth-lib/"
+                   "tex/generic/knuth-lib/"
+                   "tex/plain/knuth-lib/")
+             (base32
+              "0dl8z340n6m6xn7wari4hir0syxqi0kl2fhnf0bvnmkqhqwyzpca")))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:texlive-latex-base #f
+      #:modules
+      '((guix build texlive-build-system)
+        (guix build utils)
+        (srfi srfi-1)
+        (srfi srfi-26))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'generate-fonts-metrics
+            (lambda _
+              (let ((cm #$(this-package-native-input "texlive-cm"))
+                    (metafont #$(this-package-native-input "texlive-metafont"))
+                    (fonts-directories
+                     (delete-duplicates
+                      (map (lambda (f)
+                             (string-drop (dirname f) (string-length "./")))
+                           (find-files "." "[0-9]+\\.mf$"))))
+                    (root (getcwd)))
+                (mkdir-p "build")
+                ;; Tell mf where to find mf.base.
+                (setenv "MFBASES"
+                        (string-append metafont "/share/texmf-dist/web2c/"))
+                (for-each
+                 (lambda (directory)
+                   ;; Tell mf where to look for source files.
+                   (setenv "MFINPUTS"
+                           (string-append
+                            (getcwd) "/" directory ":"
+                            metafont "/share/texmf-dist/metafont/base/:"
+                            cm "/share/texmf-dist/fonts/source/public/cm/"))
+                   ;; Build font metrics (tfm).
+                   (with-directory-excursion directory
+                     (for-each (lambda (font)
+                                 (format #t "building font ~a\n" font)
+                                 (invoke "mf" "-progname=mf"
+                                         (string-append "-output-directory="
+                                                        root "/build")
+                                         (string-append "\\"
+                                                        "mode:=ljfour; "
+                                                        "mag:=1; "
+                                                        "batchmode; "
+                                                        "input "
+                                                        (basename font ".mf"))))
+                               (find-files "." "[0-9]+\\.mf$")))
+                   ;; Install font metrics at the appropriate location.
+                   (let ((destination
+                          ;; fonts/source/xxx/yyy/... -> fonts/tfm/xxx/yyy/...
+                          (string-append "fonts/tfm"
+                                         (string-drop
+                                          directory
+                                          (string-length "fonts/source")))))
+                     (format #t "moving font metrics in ~a\n" destination)
+                     (for-each (cut install-file <> destination)
+                               (find-files "build/" "\\.tfm$"))))
+                 fonts-directories)))))))
+    (native-inputs (list texlive-cm texlive-metafont))
+    (home-page "https://ctan.org/pkg/knuth-lib")
+    (synopsis "Small library of METAFONT sources")
+    (description
+     "This is a collection of core TeX and METAFONT macro files from Donald
+Knuth, including the plain format, plain base, and the MF logo fonts.")
+    (license license:knuth)))
 
 (define-deprecated-package texlive-fonts-knuth-lib texlive-knuth-lib)
 
-- 
cgit 1.4.1


From 5c7346c2345c48558c5b559c55c6b18cb6f07635 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 00:09:03 +0200
Subject: gnu: texlive-lm-math: Refresh package definition.

* gnu/packages/tex.scm (texlive-lm-math): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 31c7bcdea6..66e1a3b3fb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1426,18 +1426,22 @@ Computers & Typesetting series.")
 
 (define-public texlive-lm-math
   (package
-    (inherit (simple-texlive-package
-              "texlive-lm-math"
-              (list "/doc/fonts/lm-math/"
-                    "/fonts/opentype/public/lm-math/")
-              (base32
-               "0gqdk8x3r1iz4n8j6r3pcqbwalxvkihayvmjfq4iv6hwb0pvys8z")
-              #:trivial? #t))
-    (home-page "https://www.gust.org.pl/projects/e-foundry/latin-modern")
+    (name "texlive-lm-math")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/lm-math/"
+                   "fonts/opentype/public/lm-math/")
+             (base32
+              "0gqdk8x3r1iz4n8j6r3pcqbwalxvkihayvmjfq4iv6hwb0pvys8z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lm-math")
     (synopsis "OpenType maths fonts for Latin Modern")
-    (description "Latin Modern Math is a maths companion for the Latin Modern
-family of fonts, in OpenType format.  For use with LuaLaTeX or XeLaTeX,
-support is available from the @code{unicode-math} package.")
+    (description
+     "Latin Modern Math is a maths companion for the Latin Modern family of
+fonts, in OpenType format.  For use with LuaLaTeX or XeLaTeX, support is
+available from the @code{unicode-math} package.")
     (license license:gfl1.0)))
 
 (define-public texlive-lwarp
-- 
cgit 1.4.1


From 176f5439fba5f90505810c4ef9abd379e9895e4d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 00:10:47 +0200
Subject: gnu: texlive-lm: Refresh package definition.

* gnu/packages/tex.scm (texlive-lm): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[home-page]: Update URL.
---
 gnu/packages/tex.scm | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 66e1a3b3fb..43156bf7f2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1398,21 +1398,24 @@ in LuaTeX.  It is required by the @code{luatexbase} package which uses
 
 (define-public texlive-lm
   (package
-    (inherit (simple-texlive-package
-              "texlive-lm"
-              (list "/doc/fonts/lm/"
-                    "/fonts/afm/public/lm/"
-                    "/fonts/enc/dvips/lm/"
-                    "/fonts/map/dvipdfm/lm/"
-                    "/fonts/map/dvips/lm/"
-                    "/fonts/opentype/public/lm/"
-                    "/fonts/tfm/public/lm/"
-                    "/fonts/type1/public/lm/"
-                    "/tex/latex/lm/")
-              (base32
-               "0yyk0dr4yms82mwy4dc03zf5igyhgcb65icdah042rk23rlpxygv")
-              #:trivial? #t))
-    (home-page "https://www.gust.org.pl/projects/e-foundry/latin-modern/")
+    (name "texlive-lm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/lm/"
+                   "fonts/afm/public/lm/"
+                   "fonts/enc/dvips/lm/"
+                   "fonts/map/dvipdfm/lm/"
+                   "fonts/map/dvips/lm/"
+                   "fonts/opentype/public/lm/"
+                   "fonts/tfm/public/lm/"
+                   "fonts/type1/public/lm/"
+                   "tex/latex/lm/")
+             (base32
+              "0yyk0dr4yms82mwy4dc03zf5igyhgcb65icdah042rk23rlpxygv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lm")
     (synopsis "Latin Modern family of fonts")
     (description "The Latin Modern fonts are derived from the famous Computer
 Modern fonts designed by Donald E. Knuth and described in Volume E of his
-- 
cgit 1.4.1


From 3d6607d5182354158cd8cc09077bfbb78baff438 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 00:13:28 +0200
Subject: gnu: texlive-tex-gyre: Refresh package definition.

* gnu/packages/tex.scm (texlive-tex-gyre): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-KVOPTIONS.
---
 gnu/packages/tex.scm | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 43156bf7f2..53241ad941 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1338,19 +1338,24 @@ font from Adobe's basic set.")
 
 (define-public texlive-tex-gyre
   (package
-    (inherit (simple-texlive-package
-              "texlive-tex-gyre"
-              '("/doc/fonts/tex-gyre/GUST-FONT-LICENSE.txt"
-                "/fonts/afm/public/tex-gyre/"
-                "/fonts/enc/dvips/tex-gyre/"
-                "/fonts/map/dvips/tex-gyre/"
-                "/fonts/opentype/public/tex-gyre/"
-                "/fonts/tfm/public/tex-gyre/"
-                "/fonts/type1/public/tex-gyre/"
-                "/tex/latex/tex-gyre/")
-              (base32
-               "1ldnlmclghm3gnyv02r8a6cqybygz2ifq07mhykhf43h1pw3aq7k")
-              #:trivial? #t))
+    (name "texlive-tex-gyre")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/tex-gyre/"
+                   "fonts/afm/public/tex-gyre/"
+                   "fonts/enc/dvips/tex-gyre/"
+                   "fonts/map/dvips/tex-gyre/"
+                   "fonts/opentype/public/tex-gyre/"
+                   "fonts/tfm/public/tex-gyre/"
+                   "fonts/type1/public/tex-gyre/"
+                   "source/fonts/tex-gyre/"
+                   "tex/latex/tex-gyre/")
+             (base32
+              "0229aa7cgw614zlc2n589fi4hfdfnv7dd83f5mfa358zdb8iw54j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-kvoptions))
     (home-page "https://ctan.org/pkg/tex-gyre")
     (synopsis "TeX fonts extending URW fonts")
     (description
-- 
cgit 1.4.1


From c630edbefe579c863c6985133ab648a1a96f235f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 00:14:43 +0200
Subject: gnu: texlive-courier: Refresh package definition.

* gnu/packages/tex.scm (texlive-courier): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 53241ad941..afc3711ebb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1311,24 +1311,24 @@ originals.")
 
 (define-public texlive-courier
   (package
-    (inherit (simple-texlive-package
-              "texlive-courier"
-              (list "/dvips/courier/"
-                    "/fonts/afm/adobe/courier/"
-                    "/fonts/afm/urw/courier/"
-                    "/fonts/map/dvips/courier/"
-                    "/fonts/tfm/adobe/courier/"
-                    "/fonts/tfm/urw35vf/courier/"
-                    "/fonts/type1/adobe/courier/"
-                    "/fonts/type1/urw/courier/"
-                    "/fonts/vf/adobe/courier/"
-                    "/fonts/vf/urw35vf/courier/"
-                    "/tex/latex/courier/"
-                    "/tex4ht/ht-fonts/alias/adobe/courier/"
-                    "/tex4ht/ht-fonts/unicode/adobe/courier/")
-              (base32
-               "05lglavi073glj26k9966351hka5ac22g4vim61dkfy001vz4i7r")
-              #:trivial? #t))
+    (name "texlive-courier")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/courier/"
+                   "fonts/afm/adobe/courier/"
+                   "fonts/afm/urw/courier/"
+                   "fonts/map/dvips/courier/"
+                   "fonts/tfm/adobe/courier/"
+                   "fonts/tfm/urw35vf/courier/"
+                   "fonts/type1/adobe/courier/"
+                   "fonts/type1/urw/courier/"
+                   "fonts/vf/adobe/courier/"
+                   "fonts/vf/urw35vf/courier/"
+                   "tex/latex/courier/")
+             (base32
+              "08g6lm12b0k6333pxcaqdf67v87fz5mrqp3jgal8qhrls5ym8q6r")))
+    (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/urw-base35")
     (synopsis "URW Base 35 font pack for LaTeX")
     (description "This package provides a drop-in replacements for the Courier
-- 
cgit 1.4.1


From 1f26a78e161517e8c4a44bffca95321870458c6f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 00:16:33 +0200
Subject: gnu: texlive-cm-super: Refresh package definition.

* gnu/packages/tex.scm (texlive-cm-super): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 50 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index afc3711ebb..866fa15e5b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1276,36 +1276,34 @@ provided for use with TeX.")
     (license license:gpl2+)))
 
 (define-public texlive-cm-super
-  (let ((template (simple-texlive-package
-                   "texlive-cm-super"
-                   (list "/doc/fonts/cm-super/"
-                         "/dvips/cm-super/"
-                         "/fonts/afm/public/cm-super/"
-                         "/fonts/enc/dvips/cm-super/"
-                         "/fonts/map/dvips/cm-super/"
-                         "/fonts/map/vtex/cm-super/"
-                         "/fonts/type1/public/cm-super/"
-                         "/tex/latex/cm-super/")
-                   (base32
-                    "1k3afl0x0bqbr5mnawbnp7rr2126dwn0vwnxzibm9ggvzqilnkm6")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (delete 'reset-gzip-timestamps)))))
-      (home-page "https://www.ctan.org/pkg/cm-super")
-      (synopsis "Computer Modern Super family of fonts")
-      (description "The CM-Super family provides Adobe Type 1 fonts that replace
-the T1/TS1-encoded Computer Modern (EC/TC), T1/TS1-encoded Concrete,
+  (package
+    (name "texlive-cm-super")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cm-super/"
+                   "dvips/cm-super/"
+                   "fonts/afm/public/cm-super/"
+                   "fonts/enc/dvips/cm-super/"
+                   "fonts/map/dvips/cm-super/"
+                   "fonts/map/vtex/cm-super/"
+                   "fonts/type1/public/cm-super/"
+                   "tex/latex/cm-super/")
+             (base32
+              "1k3afl0x0bqbr5mnawbnp7rr2126dwn0vwnxzibm9ggvzqilnkm6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cm-super")
+    (synopsis "Computer Modern Super family of fonts")
+    (description
+     "The CM-Super family provides Adobe Type 1 fonts that replace the
+T1/TS1-encoded Computer Modern (EC/TC), T1/TS1-encoded Concrete,
 T1/TS1-encoded CM bright and LH Cyrillic fonts (thus supporting all European
 languages except Greek), and bringing many ameliorations in typesetting
 quality.  The fonts exhibit the same metrics as the METAFONT-encoded
 originals.")
-      ;; With font exception
-      (license license:gpl2+))))
+    ;; With font exception
+    (license license:gpl2+)))
 
 (define-deprecated-package texlive-fonts-cm-super texlive-cm-super)
 
-- 
cgit 1.4.1


From a04232538c06b0b6c619bc0965af15d2ebd363a3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 00:18:18 +0200
Subject: gnu: texlive-cm-lgc: Refresh package definition.

* gnu/packages/tex.scm (texlive-cm-lgc): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 49 +++++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 866fa15e5b..f8d7c0b7ac 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1252,27 +1252,36 @@ display, and mathematical fonts in a range of styles, based on Monotype Modern
 
 (define-public texlive-cm-lgc
   (package
-    (inherit (simple-texlive-package
-              "texlive-cm-lgc"
-              (list "/doc/fonts/cm-lgc/"
-                    "/fonts/afm/public/cm-lgc/"
-                    "/fonts/type1/public/cm-lgc/"
-                    "/fonts/vf/public/cm-lgc/"
-                    "/tex/latex/cm-lgc/")
-              (base32
-               "0rm7wgyb07y8h6vbvc2xzsqnxy322d4j9ly2p67z84b81c8i3zpc")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/cm-lgc")
+    (name "texlive-cm-lgc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cm-lgc/"
+                   "fonts/afm/public/cm-lgc/"
+                   "fonts/enc/dvips/cm-lgc/"
+                   "fonts/map/dvips/cm-lgc/"
+                   "fonts/ofm/public/cm-lgc/"
+                   "fonts/ovf/public/cm-lgc/"
+                   "fonts/tfm/public/cm-lgc/"
+                   "fonts/type1/public/cm-lgc/"
+                   "fonts/vf/public/cm-lgc/"
+                   "tex/latex/cm-lgc/")
+             (base32
+              "1nj3gp0kpzlqkm22lj2ym9c95xw323xc5z91gsyv8xs716868gp2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cm-lgc")
     (synopsis "Type 1 CM-based fonts for Latin, Greek and Cyrillic")
-    (description "The fonts are converted from Metafont sources of the
-Computer Modern font families, using @command{textrace}.  Supported encodings
-are: T1 (Latin), T2A (Cyrillic), LGR (Greek) and TS1.  The package also
-includes Unicode virtual fonts for use with Omega.  The font set is not a
-replacement for any of the other Computer Modern-based font sets (for example,
-cm-super for Latin and Cyrillic, or cbgreek for Greek), since it is available
-at a single size only; it offers a compact set for @i{general} working.  The
-fonts themselves are encoded to external standards, and virtual fonts are
-provided for use with TeX.")
+    (description
+     "The fonts are converted from METAFONT sources of the Computer Modern
+font families, using @command{textrace}.  Supported encodings are: T1 (Latin),
+T2A (Cyrillic), LGR (Greek) and TS1.  The package also includes Unicode
+virtual fonts for use with Omega.  The font set is not a replacement for any
+of the other Computer Modern-based font sets (for example, cm-super for Latin
+and Cyrillic, or cbgreek for Greek), since it is available at a single size
+only; it offers a compact set for general working.  The fonts themselves are
+encoded to external standards, and virtual fonts are provided for use with
+TeX.")
     (license license:gpl2+)))
 
 (define-public texlive-cm-super
-- 
cgit 1.4.1


From 6dc6577330e99c29f41d22d3c48e66da383b04b7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 00:24:37 +0200
Subject: gnu: texlive-cm: Refresh package definition.

* gnu/packages/tex.scm (texlive-cm): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[native-inputs]: Remove TEXLIVE-BIN.
---
 gnu/packages/tex.scm | 128 ++++++++++++++++++++++++---------------------------
 1 file changed, 60 insertions(+), 68 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f8d7c0b7ac..79621a6f8e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1176,77 +1176,69 @@ cite bundle of the author's citation-related packages.")
               "/share/texmf-dist/doc/latex/cite/README"))))
 
 (define-public texlive-cm
-  (let ((template (simple-texlive-package
-                   "texlive-cm"
-                   (list "/fonts/source/public/cm/"
-                         "/fonts/map/dvips/cm/cmtext-bsr-interpolated.map"
-                         "/doc/fonts/cm/")
-                   (base32
-                    "0mfslqs9saqkb3z3xdhsqnklxk858nmipgj1y93by2791jzkma1d")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:modules modules '())
-          '((guix build gnu-build-system)
-            (guix build utils)
-            (srfi srfi-26)))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (replace 'build
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (let ((mf (assoc-ref inputs "texlive-metafont")))
-                   ;; Tell mf where to find mf.base
-                   (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c"))
-                   ;; Tell mf where to look for source files
-                   (setenv "MFINPUTS"
-                           (string-append (getcwd) "/fonts/source/public/cm/:"
-                                          mf "/share/texmf-dist/metafont/base")))
-                 (for-each make-file-writable
-                           (cons "fonts/source/public/cm/"
-                                 (find-files "fonts/source/public/cm/" ".*")))
-                 (let ((build (string-append (getcwd) "/build"))
-                       (pkdir (string-append (getcwd) "/pk/ljfour/public/cm/dpi600")))
-                   (mkdir-p pkdir)
-                   (mkdir-p build)
-                   (with-directory-excursion "fonts/source/public/cm/"
-                     (for-each (lambda (font)
-                                 (format #t "building font ~a\n" font)
-                                 (invoke "mf" "-progname=mf"
-                                         (string-append "-output-directory=" build)
-                                         (string-append "\\"
-                                                        "mode:=ljfour; "
-                                                        "mag:=1+0/600; "
-                                                        "scrollmode; "
-                                                        "input "
-                                                        (basename font ".mf")))
-                                 (invoke "gftopk"
-                                         (string-append build "/"
-                                                        (basename font ".mf") ".600gf")
-                                         (string-append pkdir "/"
-                                                        (basename font ".mf") ".pk")))
-                               (find-files "." "cm(.*[0-9]+.*|inch)\\.mf$"))))
-                 #t))
-             (add-after 'install 'install-generated-fonts
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 (let* ((out    (assoc-ref outputs "out"))
-                        (fonts  (string-append out "/share/texmf-dist/fonts/"))
-                        (pk     (string-append fonts "pk"))
-                        (tfm    (string-append fonts "tfm/public/cm")))
-                   (for-each (cut install-file <> tfm)
-                             (find-files "build" "\\.*"))
-                   (copy-recursively "pk" pk)
-                   #t)))))))
-      (native-inputs
-       (list texlive-bin texlive-metafont))
-      (home-page "https://www.ctan.org/pkg/cm")
-      (synopsis "Computer Modern fonts for TeX")
-      (description "This package provides the Computer Modern fonts by Donald
+  (package
+    (name "texlive-cm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cm/" "fonts/map/dvips/cm/"
+                   "fonts/pk/ljfour/public/cm/dpi600/"
+                   "fonts/source/public/cm/"
+                   "fonts/tfm/public/cm/")
+             (base32
+              "10adgjc3lkj2z50jp1f9n83bdrx8bqxd76rl605d0d5pb435k97m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:texlive-latex-base #f
+      #:modules
+      '((guix build texlive-build-system)
+        (guix build utils)
+        (srfi srfi-26))
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'build
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((mf (assoc-ref inputs "texlive-metafont")))
+                ;; Tell mf where to find mf.base
+                (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c"))
+                ;; Tell mf where to look for source files
+                (setenv "MFINPUTS"
+                        (string-append (getcwd) "/fonts/source/public/cm/:"
+                                       mf "/share/texmf-dist/metafont/base")))
+              (for-each make-file-writable
+                        (cons "fonts/source/public/cm/"
+                              (find-files "fonts/source/public/cm/" ".*")))
+              (let ((build (string-append (getcwd) "/build"))
+                    (pkdir (string-append (getcwd) "/pk/ljfour/public/cm/dpi600")))
+                (mkdir-p pkdir)
+                (mkdir-p build)
+                (with-directory-excursion "fonts/source/public/cm/"
+                  (for-each (lambda (font)
+                              (format #t "building font ~a\n" font)
+                              (invoke "mf" "-progname=mf"
+                                      (string-append "-output-directory=" build)
+                                      (string-append "\\"
+                                                     "mode:=ljfour; "
+                                                     "mag:=1+0/600; "
+                                                     "scrollmode; "
+                                                     "input "
+                                                     (basename font ".mf")))
+                              (invoke "gftopk"
+                                      (string-append build "/"
+                                                     (basename font ".mf") ".600gf")
+                                      (string-append pkdir "/"
+                                                     (basename font ".mf") ".pk")))
+                            (find-files "." "cm(.*[0-9]+.*|inch)\\.mf$")))))))))
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/cm")
+    (synopsis "Computer Modern fonts for TeX")
+    (description "This package provides the Computer Modern fonts by Donald
 Knuth.  The Computer Modern font family is a large collection of text,
 display, and mathematical fonts in a range of styles, based on Monotype Modern
 8A.")
-      (license license:knuth))))
+    (license license:knuth)))
 
 (define-deprecated-package texlive-fonts-cm texlive-cm)
 
-- 
cgit 1.4.1


From cf5411ecb0bd26f9814a481ffbdf1203d2a597e2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 00:29:51 +0200
Subject: gnu: texlive-cbfonts-fd: Refresh package definition.

* gnu/packages/tex.scbfonts-fd (texlive-cbfonts-fd): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 50 ++++++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 79621a6f8e..57c3e01830 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1138,42 +1138,48 @@ sizes as are such font sets as the EC fonts.")
 
 (define-public texlive-cbfonts-fd
   (package
-    (inherit (simple-texlive-package
-              "texlive-cbfonts-fd"
-              (list "/doc/fonts/cbfonts/"
-                    "/tex/latex/cbfonts-fd/")
-              (base32
-               "0g91p2qcgqn916vgf777h45dabv2r6l6f9xkcq0b3gpir3qsj3d4")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/cbfonts-fd")
+    (name "texlive-cbfonts-fd")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cbfonts-fd/"
+                   "source/fonts/cbfonts-fd/"
+                   "tex/latex/cbfonts-fd/")
+             (base32
+              "1r2kmnccvrq181ac7gyff9y3wn7dydx50jy8f9n6qhnb824pdn78")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cbfonts-fd")
     (synopsis "LaTeX font description files for the CB Greek fonts")
-    (description "The package provides font description files for all the many
-shapes available from the cbfonts collection.  The files provide the means
-whereby the @acronym{NFSS, New Font Selection Scheme} knows which fonts a
-LaTeX user is requesting.
+    (description
+     "The package provides font description files for all the many shapes
+available from the @code{cbfonts} collection.  The files provide the means
+whereby the @acronym{NFSS, New Font Selection Scheme} knows which fonts
+a LaTeX user is requesting.
 
 Tip: installing @code{texlive-cbfonts} will automatically propagate this one.")
     (license license:lppl1.3c+)))
 
 (define-public texlive-cite
   (package
-    (inherit (simple-texlive-package
-              "texlive-cite"
-              (list "doc/latex/cite/" "tex/latex/cite/")
-              (base32
-               "0b1amznayxj80dmqbzcysmj7q8aksbyz98k6djsqi0mhwp1cd0fd")
-              #:trivial? #t))
+    (name "texlive-cite")
     (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cite/" "tex/latex/cite/")
+             (base32
+              "0b1amznayxj80dmqbzcysmj7q8aksbyz98k6djsqi0mhwp1cd0fd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/cite")
     (synopsis "Improved citation handling in LaTeX")
     (description
      "The package supports compressed, sorted lists of numerical citations,
 and also deals with various punctuation and other issues of representation,
 including comprehensive management of break points.  The package is compatible
-with both hyperref and backref.  The package is (unsurprisingly) part of the
-cite bundle of the author's citation-related packages.")
-    (license (license:fsf-free
-              "/share/texmf-dist/doc/latex/cite/README"))))
+with both @code{hyperref} and @code{backref}.  The package is (unsurprisingly)
+part of the cite bundle of the author's citation-related packages.")
+    (license (license:fsf-free "/share/texmf-dist/doc/latex/cite/README"))))
 
 (define-public texlive-cm
   (package
-- 
cgit 1.4.1


From 12dcf8f384f7ca78251cc8714ce734b06548469b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 00:43:22 +0200
Subject: gnu: texlive-cbfonts: Refresh package definition.

* gnu/packages/tex.scbfonts (texlive-cbfonts): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 57c3e01830..8a454cfa6a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1119,21 +1119,30 @@ documents.")
 
 (define-public texlive-cbfonts          ;71 MiB of greek fonts
   (package
-    (inherit (simple-texlive-package
-              "texlive-cbfonts"
-              (list "/doc/fonts/cbfonts/"
-                    "/fonts/type1/public/cbfonts/")
-              (base32
-               "01j22cbwq9jkni5vvrpz2mg1799cbx3aq801sni74i8wb1zcf6y1")
-              #:trivial? #t))
+    (name "texlive-cbfonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cbfonts/"
+                   "fonts/enc/dvips/cbfonts/"
+                   "fonts/map/dvips/cbfonts/"
+                   "fonts/source/public/cbfonts/"
+                   "fonts/tfm/public/cbfonts/"
+                   "fonts/type1/public/cbfonts/")
+             (base32
+              "0l0dpgvngah227snzk6j5hf3kxs5cz5jvlpkv8pbapw6jx084np6")))
+    (outputs '("out" "doc"))
+    ;; FIXME: Font metrics cannot be generated due to "bad pos" errors.
+    (build-system texlive-build-system)
     (propagated-inputs (list texlive-cbfonts-fd))
-    (home-page "https://www.ctan.org/pkg/cbgreek-complete")
+    (home-page "https://ctan.org/pkg/cbgreek-complete")
     (synopsis "Complete set of Greek fonts")
-    (description "This bundle presents the whole of Beccari's original Greek
-font set, which use the @i{Lispiakos} font shape derived from the shape of the
-fonts used in printers' shops in Lispia.  The fonts are available both as
-Metafont source and in Adobe Type 1 format, and at the same wide set of design
-sizes as are such font sets as the EC fonts.")
+    (description
+     "This bundle presents the whole of Beccari's original Greek font set,
+which use the @i{Lispiakos} font shape derived from the shape of the fonts
+used in printers' shops in Lispia.  The fonts are available both as Metafont
+source and in Adobe Type 1 format, and at the same wide set of design sizes as
+are such font sets as the EC fonts.")
     (license license:lppl1.3c+)))
 
 (define-public texlive-cbfonts-fd
-- 
cgit 1.4.1


From 9f6188727b4f6e3a462a3456e996555dce243ab5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 00:44:50 +0200
Subject: gnu: texlive-fontname: Refresh package definition.

* gnu/packages/tex.sfontname (texlive-fontname): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8a454cfa6a..f632266a10 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1102,20 +1102,23 @@ typesetting in these fonts.")
 
 (define-public texlive-fontname
   (package
-    (inherit (simple-texlive-package
-              "texlive-fontname"
-              (list "/doc/fonts/fontname/fontname.texi"
-                    "/fonts/map/fontname/")
-              (base32
-               "009qvjpw48lajp0gxpvdk10n5qw3q41cpq05ycns67mxwkcaywq6")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/fontname")
+    (name "texlive-fontname")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fontname/" "doc/info/fontname.info"
+                   "fonts/map/fontname/")
+             (base32
+              "014kiwbqz77yn8w58cb6fzqj0vlfmgyq09mxdj15ipjfgxjyvcbj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fontname")
     (synopsis "Scheme for naming fonts in TeX")
-    (description "This is Fontname, a naming scheme for (the base part of)
-external TeX font filenames.  This makes at most eight-character names
-from (almost) arbitrarily complex font names, thus helping portability of TeX
-documents.")
-    (license license:public-domain)))
+    (description
+     "This is Fontname, a naming scheme for (the base part of) external TeX
+font filenames.  This makes at most eight-character names from (almost)
+arbitrarily complex font names, thus helping portability of TeX documents.")
+    (license license:gpl3+)))
 
 (define-public texlive-cbfonts          ;71 MiB of greek fonts
   (package
-- 
cgit 1.4.1


From 301f9e533e38580bb838061d845d9b9ee71ea91f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 01:17:37 +0200
Subject: gnu: texlive-fontinst: Refresh package definition.

* gnu/packages/tex.sfontinst (texlive-fontinst): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[native-inputs]: Remove TEXLIVE-BIN and TEXLIVE-DOCSTRIP.
---
 gnu/packages/tex.scm | 119 +++++++++++++++------------------------------------
 1 file changed, 34 insertions(+), 85 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f632266a10..e078e6c84c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1012,91 +1012,40 @@ information in the TFM file.")
     (license license:public-domain)))
 
 (define-public texlive-fontinst
-  (let ((template (simple-texlive-package
-                   "texlive-fontinst"
-                   (list "/doc/fonts/fontinst/"
-                         "/doc/man/man1/fontinst.1"
-                         "/doc/man/man1/fontinst.man1.pdf"
-
-                         ;; This is used to build parts of
-                         ;; /tex/fontinst/{base,misc}/ and
-                         ;; /tex/latex/fontinst/fontdoc.sty.
-                         "/source/fontinst/base/"
-
-                         ;; These are not generated.
-                         "/tex/fontinst/base/bbox.sty"
-                         "/tex/fontinst/base/multislot.sty"
-                         "/tex/fontinst/misc/glyphbox.mtx"
-                         "/tex/fontinst/misc/glyphoff.mtx"
-                         "/tex/fontinst/misc/glyphon.mtx"
-                         "/tex/fontinst/misc/kernoff.mtx"
-                         "/tex/fontinst/misc/kernon.mtx"
-
-                         "/tex/fontinst/latinetx/"
-                         "/tex/fontinst/latinmtx/"
-                         "/tex/fontinst/mathmtx/"
-                         "/tex/fontinst/smblmtx/")
-                   (base32
-                    "195jsijrpv828pqy99gm13j31nsc8bsa58zlbln2r0h5j9l44b5g")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:modules _ '())
-          '((guix build gnu-build-system)
-            (guix build utils)
-            (ice-9 match)))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (replace 'build
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (setenv "TEXINPUTS"
-                         (string-append (getcwd) "//:"
-                                        (getcwd) "/source/fontinst/base//:"
-                                        (assoc-ref inputs "texlive-docstrip") "//"))
-                 (mkdir "build")
-                 (invoke "tex" "-ini" "-interaction=scrollmode"
-                         "-output-directory=build"
-                         "fontinst.ins")))
-             ;; Since we're using docstrip without LaTeX we can't set \UseTDS
-             ;; or \BaseDirectory, so the generated files are just dumped in
-             ;; the "build" directory.
-             (add-after 'install 'install-generated-files
-               (lambda* (#:key outputs #:allow-other-keys)
-                 (let* ((out (assoc-ref outputs "out"))
-                        (root (string-append out "/share/texmf-dist")))
-                   (for-each (match-lambda
-                               ((dir files ...)
-                                (for-each (lambda (file)
-                                            (install-file
-                                             (string-append "build/" file)
-                                             (string-append root dir)))
-                                          files)))
-                             '(("/tex/fontinst/base"
-                                "fontinst.sty"
-                                "cfntinst.sty"
-                                "xfntinst.sty"
-                                "finstmsc.sty"
-                                "fontinst.ini")
-                               ("/tex/fontinst/misc"
-                                "csc2x.tex"
-                                "csckrn2x.tex"
-                                "osf2x.tex")
-                               ("/tex/latex/fontinst"
-                                "fontdoc.sty")))
-                   #t)))))))
-      (native-inputs
-       (list texlive-bin texlive-docstrip))
-      (home-page "https://www.ctan.org/pkg/fontinst")
-      (synopsis "Tools for converting and installing fonts for TeX and LaTeX")
-      (description "This package provides TeX macros for converting Adobe Font
-Metric files to TeX metric and virtual font format.  Fontinst helps mainly
-with the number crunching and shovelling parts of font installation.  This
-means in practice that it creates a number of files which give the TeX
-metrics (and related information) for a font family that TeX needs to do any
-typesetting in these fonts.")
-      (license license:lppl1.1+))))
+  (package
+    (name "texlive-fontinst")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fontinst/"
+                   "doc/man/man1/fontinst.1"
+                   "doc/man/man1/fontinst.man1.pdf"
+                   ;; Extract the sole script expected in the package.
+                   "scripts/texlive-extra/fontinst.sh"
+                   "source/fontinst/base/"
+                   "tex/fontinst/base/"
+                   "tex/fontinst/latinetx/"
+                   "tex/fontinst/latinmtx/"
+                   "tex/fontinst/mathetx/"
+                   "tex/fontinst/mathmtx/"
+                   "tex/fontinst/misc/"
+                   "tex/fontinst/smbletx/"
+                   "tex/fontinst/smblmtx/"
+                   "tex/latex/fontinst/")
+             (base32
+              "0fbfhjbp7gxbwsbybbb8gm4l6za17nrm2mx2i2xa66lmpqcjbgg7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fontinst")
+    (synopsis "Tools for converting and installing fonts for TeX and LaTeX")
+    (description
+     "This package provides TeX macros for converting Adobe Font Metric files
+to TeX metric and virtual font format.  Fontinst helps mainly with the number
+crunching and shovelling parts of font installation.  This means in practice
+that it creates a number of files which give the TeX metrics (and related
+information) for a font family that TeX needs to do any typesetting in these
+fonts.")
+    (license license:lppl1.1+)))
 
 (define-deprecated-package texlive-tex-fontinst-base texlive-fontinst)
 
-- 
cgit 1.4.1


From 44ee4ec5562350d41abde65e2f509e4fdd222f45 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 08:20:03 +0200
Subject: gnu: texlive-tex-ini-files: Refresh package definition.

* gnu/packages/tex.stex-ini-files (texlive-tex-ini-files): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e078e6c84c..b6491801b5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -882,19 +882,24 @@ to PostScript.")
 
 (define-public texlive-tex-ini-files
   (package
-    (inherit (simple-texlive-package
-              "texlive-tex-ini-files"
-              (list "/tex/generic/tex-ini-files/")
-              (base32
-               "0q1g62jg0qiqslm93ycvm30bw8ydmssjdshzsnzl7n2vpd62qfi2")
-              #:trivial? #t))
+    (name "texlive-tex-ini-files")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/tex-ini-files/" "tex/generic/tex-ini-files/")
+             (base32
+              "0a18k27fz1vjha5blwskxpnd715k08hmfm7d1yc2f7adaf0rwl3m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-base #f))
     (home-page "https://www.ctan.org/pkg/tex-ini-files")
     (synopsis "Files for creating TeX formats")
-    (description "This bundle provides a collection of model \".ini\" files
-for creating TeX formats.  These files are commonly used to introduced
-distribution-dependent variations in formats.  They are also used to
-allow existing format source files to be used with newer engines, for example
-to adapt the plain e-TeX source file to work with XeTeX and LuaTeX.")
+    (description
+     "This bundle provides a collection of model @file{.ini} files for
+creating TeX formats.  These files are commonly used to introduced
+distribution-dependent variations in formats.  They are also used to allow
+existing format source files to be used with newer engines, for example to
+adapt the plain e-TeX source file to work with XeTeX and LuaTeX.")
     (license license:public-domain)))
 
 (define-deprecated-package texlive-generic-tex-ini-files texlive-tex-ini-files)
-- 
cgit 1.4.1


From 809e704d94a1ba0e90ad1750716505c1657ad421 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 08:35:43 +0200
Subject: gnu: texlive-hyphen-base: Refresh package definition.

* gnu/packages/hyphen-base (texlive-hyphen-base): Remove
SIMPLE-TEXLIVE-PACKAGE call.
---
 gnu/packages/tex.scm | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b6491801b5..9bba168074 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -807,21 +807,24 @@ until the package appears.")
 
 (define-public texlive-hyphen-base
   (package
-    (inherit (simple-texlive-package
-              "texlive-hyphen-base"
-              (list "/tex/generic/config/language.dat"
-                    "/tex/generic/config/language.dat.lua"
-                    "/tex/generic/config/language.def"
-                    "/tex/generic/config/language.us"
-                    "/tex/generic/config/language.us.def"
-                    "/tex/generic/config/language.us.lua"
-                    "/tex/generic/hyphen/dumyhyph.tex"
-                    "/tex/generic/hyphen/hyphen.tex"
-                    "/tex/generic/hyphen/hypht1.tex"
-                    "/tex/generic/hyphen/zerohyph.tex")
-              (base32
-               "1nad1bqpjsywm49hlv7d75mqvgha3j5vayvkvfhv8wwzgdb3mk84")
-              #:trivial? #t))
+    (name "texlive-hyphen-base")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "/tex/generic/config/language.dat"
+                   "/tex/generic/config/language.dat.lua"
+                   "/tex/generic/config/language.def"
+                   "/tex/generic/config/language.us"
+                   "/tex/generic/config/language.us.def"
+                   "/tex/generic/config/language.us.lua"
+                   "/tex/generic/hyphen/dumyhyph.tex"
+                   "/tex/generic/hyphen/hyphen.tex"
+                   "/tex/generic/hyphen/hypht1.tex"
+                   "/tex/generic/hyphen/zerohyph.tex")
+             (base32
+              "1nad1bqpjsywm49hlv7d75mqvgha3j5vayvkvfhv8wwzgdb3mk84")))
+    (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-base #f))
     (home-page "https://tug.org/texlive/")
     (synopsis "Core hyphenation support files")
     (description "This package includes Knuth's original @file{hyphen.tex},
-- 
cgit 1.4.1


From 0687343d01543642a273d9b0041e4f0d0b187174 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 08:40:02 +0200
Subject: gnu: texlive-underscore: Refresh package definition.

* gnu/packages/underscore (texlive-underscore): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9bba168074..c2aaaa045b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -736,16 +736,19 @@ documentation from TeX files.  It is part of the LaTeX base.")
 
 (define-public texlive-underscore
   (package
-    (inherit (simple-texlive-package
-              "texlive-underscore"
-              (list "/doc/latex/underscore/"
-                    "/tex/latex/underscore/")
-              (base32
-               "0slxsxc9azmv3gsm55jkhkv8a06wafankp55hhsdd6k4prp8szrb")
-              #:trivial? #t))
+    (name "texlive-underscore")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/underscore/" "tex/latex/underscore/")
+             (base32
+              "0slxsxc9azmv3gsm55jkhkv8a06wafankp55hhsdd6k4prp8szrb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (home-page "https://www.ctan.org/pkg/underscore")
     (synopsis "Control the behaviour of @samp{_} in text")
-    (description "This package causes @code{\\_} in text mode (i.e.,
+    (description
+     "This package causes @code{\\_} in text mode (i.e.,
 @code{\\textunderscore}) to print an underscore so that hyphenation of words
 either side of it is not affected; a package option controls whether an actual
 hyphenation point appears after the underscore, or merely a break point.  The
-- 
cgit 1.4.1


From f51751bb3dc9869b1f8e4da8b870ce5f3b802f94 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 08:47:34 +0200
Subject: gnu: texlive-dvips: Refresh package definition.

* gnu/packages/dvips (texlive-dvips): Remove SIMPLE-TEXLIVE-PACKAGE call.
---
 gnu/packages/tex.scm | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c2aaaa045b..1a61593b8b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -869,21 +869,29 @@ features as does pdfTeX.")
 
 (define-public texlive-dvips
   (package
-    (inherit (simple-texlive-package
-              "texlive-dvips"
-              (list "/doc/man/man1/afm2tfm.1"
-                    "/doc/man/man1/dvips.1"
-                    "/dvips/base/"
-                    "/dvips/config/"
-                    "/fonts/enc/dvips/base/"
-                    "/tex/generic/dvips/")
-              (base32
-               "1fb73mfw9mp4ylp6sfc0465rbdb7k830aq0qf3c085c3n0zyrin8")
-              #:trivial? #t))
-    (home-page "https://www.ctan.org/pkg/dvips")
+    (name "texlive-dvips")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/dvips/"
+                   "doc/info/dvips.info"
+                   "doc/man/man1/afm2tfm.1"
+                   "doc/man/man1/afm2tfm.man1.pdf"
+                   "doc/man/man1/dvips.1"
+                   "doc/man/man1/dvips.man1.pdf"
+                   "dvips/base/"
+                   "dvips/config/"
+                   "fonts/enc/dvips/base/"
+                   "tex/generic/dvips/")
+             (base32
+              "0l4rvnb0m5y9rqibrdlbg3dijdzixjdx0nf69qjncvng5694p48m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dvips")
     (synopsis "DVI to PostScript drivers")
-    (description "This package provides files needed for converting DVI files
-to PostScript.")
+    (description
+     "This package provides files needed for converting DVI files to
+PostScript.")
     (license license:lppl)))
 
 (define-public texlive-tex-ini-files
-- 
cgit 1.4.1


From 021d0216e0c6939ce45bb8814160a591e4634228 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 08:53:31 +0200
Subject: gnu: texlive-dvipdfmx: Refresh package definition.

* gnu/packages/dvipdfmx (texlive-dvipdfmx): Remove SIMPLE-TEXLIVE-PACKAGE call.
---
 gnu/packages/tex.scm | 72 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1a61593b8b..02bab3a348 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -837,35 +837,51 @@ default versions of those), etc.")
     (license license:knuth)))
 
 (define-public texlive-dvipdfmx
-  (let ((template (simple-texlive-package
-                   "texlive-dvipdfmx"
-                   (list "doc/dvipdfm/"
-                         "doc/dvipdfmx/"
-                         "doc/man/man1/"
-                         "dvipdfmx/"
-                         "fonts/cmap/dvipdfmx/"
-                         "fonts/map/dvipdfmx/")
-                   (base32
-                    "08i81hciksh0sm9pw6lw8v8s2rj92p58wd5j2mq1mzqbp171wjmr")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (source
-       (origin
-         (inherit (package-source template))
-         ;; This map file is supposed to be generated in a profile hook.
-         (snippet '(delete-file "fonts/map/dvipdfmx/updmap/kanjix.map"))))
-      (propagated-inputs (list texlive-glyphlist))
-      (home-page "https://www.tug.org/texlive/")
-      (synopsis "Extended version of dvipdfm")
-      (description
-       "Dvipdfmx (formerly dvipdfm-cjk) is a development of dvipdfm created to
+  (package
+    (name "texlive-dvipdfmx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/dvipdfm/"
+                   "doc/dvipdfmx/"
+                   "doc/man/man1/dvipdfm.1"
+                   "doc/man/man1/dvipdfm.man1.pdf"
+                   "doc/man/man1/dvipdfmx.1"
+                   "doc/man/man1/dvipdfmx.man1.pdf"
+                   "doc/man/man1/dvipdft.1"
+                   "doc/man/man1/dvipdft.man1.pdf"
+                   "doc/man/man1/ebb.1"
+                   "doc/man/man1/ebb.man1.pdf"
+                   "doc/man/man1/extractbb.1"
+                   "doc/man/man1/extractbb.man1.pdf"
+                   "doc/man/man1/xdvipdfmx.1"
+                   "doc/man/man1/xdvipdfmx.man1.pdf"
+                   "dvipdfmx/"
+                   "fonts/cmap/dvipdfmx/"
+                   "fonts/map/dvipdfmx/")
+             (base32
+              "16qvi1id9qb8l337kl182qkl1di7wf16qbjw5k67x38g3p18qqna")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'delete-map-file
+            ;; This map file is supposed to be generated in a profile hook.
+            (lambda _
+              (delete-file "fonts/map/dvipdfmx/updmap/kanjix.map"))))))
+    (propagated-inputs (list texlive-glyphlist))
+    (home-page "https://ctan.org/pkg/dvipdfmx")
+    (synopsis "Extended version of dvipdfm")
+    (description
+     "Dvipdfmx (formerly dvipdfm-cjk) is a development of dvipdfm created to
 support multi-byte character encodings and large character sets for East Asian
-languages.  Dvipdfmx, if \"called\" with the name dvipdfm, operates in a
-\"dvipdfm compatibility\" mode, so that users of the both packages need only
-keep one executable.  A secondary design goal is to support as many \"PDF\"
-features as does pdfTeX.")
-      (license license:gpl3+))))
+languages.  Dvipdfmx, if called with the name dvipdfm, operates in a dvipdfm
+compatibility mode, so that users of the both packages need only keep one
+executable.  A secondary design goal is to support as many PDF features as
+does pdfTeX.")
+    (license license:gpl3+)))
 
 (define-public texlive-dvips
   (package
-- 
cgit 1.4.1


From 124d6cf6c93da5690a92c17b4244298f4d196fda Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 11:28:48 +0200
Subject: gnu: Add texlive-manfnt.

* gnu/packages/tex.scm (texlive-manfnt): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 02bab3a348..6b5082af24 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4756,6 +4756,25 @@ definitions.")
 
 (define-deprecated-package texlive-latex-amsmath texlive-amsmath)
 
+(define-public texlive-manfnt
+  (package
+    (name "texlive-manfnt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/manfnt/" "source/latex/manfnt/"
+                   "tex/latex/manfnt/")
+             (base32
+              "0iwka406hkxb85yqg4kwr81483s3h250way1pmbfb67vl3x4p60x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/manfnt")
+    (synopsis "LaTeX support for the TeX book symbols")
+    (description
+     "This package provides a LaTeX package for easy access to the symbols of
+the Knuth's manual font, such as the Dangerous Bend and Manual-errata Arrow.")
+    (license license:lppl)))
+
 (define-public texlive-mathdots
   (package
     (name "texlive-mathdots")
-- 
cgit 1.4.1


From ccca8fbac616e3d1a02cc6909d3375fbdf0a0df6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 11:29:06 +0200
Subject: gnu: Add texlive-manfnt-font.

* gnu/packages/tex.scm (texlive-manfnt-font): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6b5082af24..41b130b8dd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4775,6 +4775,26 @@ definitions.")
 the Knuth's manual font, such as the Dangerous Bend and Manual-errata Arrow.")
     (license license:lppl)))
 
+(define-public texlive-manfnt-font
+  (package
+    (name "texlive-manfnt-font")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/afm/hoekwater/manfnt-font/"
+                   "fonts/map/dvips/manfnt-font/"
+                   "fonts/type1/hoekwater/manfnt-font/")
+             (base32
+              "1cdd2a3xj00bwsby9z5iz5f2iy2iwsjl35gcack9q83hacbf3ssb")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/manual")
+    (synopsis "Knuth's manual fonts")
+    (description
+     "This package provides METAFONT (by Donald Knuth) and Adobe Type 1 (by
+Taco Hoekwater) versions of the font containing the odd symbols Knuth uses in
+his books.  LaTeX support is available using the @code{manfnt} package.")
+    (license license:knuth)))
+
 (define-public texlive-mathdots
   (package
     (name "texlive-mathdots")
-- 
cgit 1.4.1


From b2b27f63c49f57adab42b0742c1c8b628be84176 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 11:35:28 +0200
Subject: gnu: Add texlive-mptopdf.

* gnu/packages/tex.scm (texlive-mptopdf): New variable.
---
 gnu/packages/tex.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 41b130b8dd..8257c87e66 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1046,6 +1046,38 @@ Metafont's GF output, and put coding information and other Xerox-world
 information in the TFM file.")
     (license license:public-domain)))
 
+(define-public texlive-mptopdf
+  (package
+    (name "texlive-mptopdf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             ;; The first location prevents from downloading all ConTeXt
+             ;; "doc/context/scripts/mkii" directory.
+             (list "doc/context/scripts/mkii/mptopdf.man"
+                   "doc/man/man1/mptopdf.1"
+                   "doc/man/man1/mptopdf.man1.pdf"
+                   "scripts/context/perl/"
+                   "scripts/context/stubs/mswin/"
+                   "tex/context/base/mkii/"
+                   "tex/generic/context/mptopdf/")
+             (base32
+              "0gbc6si5i7pgh37lnh5fpgnjs9180vz0nxpj6qkz8z2yb84ikq7l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-plain))
+    (home-page "https://ctan.org/pkg/mptopdf")
+    (synopsis "mpost to PDF, native MetaPost graphics inclusion")
+    (description
+     "The @code{mptopdf} script does standalone conversion from mpost to PDF,
+using the @file{supp-*} and @file{syst-*} files.  They also allow native
+MetaPost graphics inclusion in LaTeX (via pdftex.def) and ConTeXt.  They can
+be used independently of the rest of ConTeXt.")
+    ;; Use the same licensing as ConTeXt.
+    (license (list license:lppl1.3c+
+                   license:gpl2+
+                   license:cc-by-sa4.0))))
+
 (define-public texlive-fontinst
   (package
     (name "texlive-fontinst")
-- 
cgit 1.4.1


From 0976af1e4081e92ebde620a4d05c4815190a2bb8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 11:40:40 +0200
Subject: gnu: Add texlive-luatex.

* gnu/packages/tex.scm (texlive-luatex): New variable.
---
 gnu/packages/tex.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8257c87e66..8f568b6a61 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4691,6 +4691,50 @@ this bundle for use independent of ConTeXt.")
 in the same way as BSD/GNU @code{getopt_long(3)} functions do.")
     (license license:expat)))
 
+(define-public texlive-luatex
+  (package
+    (name "texlive-luatex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/base/graphics/"
+                   "doc/man/man1/dviluatex.1"
+                   "doc/man/man1/dviluatex.man1.pdf"
+                   "doc/man/man1/luatex.1"
+                   "doc/man/man1/luatex.man1.pdf"
+                   "doc/man/man1/texlua.1"
+                   "doc/man/man1/texlua.man1.pdf"
+                   "doc/man/man1/texluac.1"
+                   "doc/man/man1/texluac.man1.pdf"
+                   "tex/generic/config/"
+                   "web2c/texmfcnf.lua")
+             (base32
+              "1g5z1mjfclb85ppcxclwndmkkgjmczrq1547vhg4kl3cclg8348q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-base #f))
+    (propagated-inputs
+     (list texlive-cm
+           texlive-etex
+           texlive-hyph-utf8
+           texlive-hyphen-base
+           texlive-knuth-lib
+           texlive-plain
+           texlive-tex-ini-files
+           texlive-unicode-data))
+    (home-page "https://ctan.org/pkg/luatex")
+    (synopsis "Extended version of pdfTeX using Lua")
+    (description
+     "LuaTeX is an extended version of pdfTeX using Lua as an embedded
+scripting language.  The LuaTeX project's main objective is to provide an open
+and configurable variant of TeX while at the same time offering downward
+compatibility.  LuaTeX uses Unicode (as UTF-8) as its default input encoding,
+and is able to use modern (OpenType) fonts (for both text and mathematics).
+It should be noted that LuaTeX is still under development; its specification
+has been declared stable, but absolute stability may not in practice be
+assumed.")
+    (license license:gpl2)))
+
 (define-public texlive-luatexbase
   (package
     (name "texlive-luatexbase")
-- 
cgit 1.4.1


From 62b54b22b81269ad64029d16860cea8e1dd5199b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 28 May 2023 00:23:04 +0200
Subject: gnu: texlive-siunitx: Refresh package definition.

* gnu/packages/tex.scm (texlive-siunitx)[source]: Add missing locations.
[outputs]: Add a "doc" output.
[arguments]: Remove unnecessary #:TEX-DIRECTORY and #:BUILD-TARGETS
arguments.
[home-page]: Use HTTPS.
---
 gnu/packages/tex.scm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8f568b6a61..7d0c0c5242 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11014,17 +11014,14 @@ without margins.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "/source/latex/siunitx/siunitx.dtx"
-                   "/doc/latex/siunitx/README.md")
+             (list "doc/latex/siunitx/" "source/latex/siunitx/"
+                   "tex/latex/siunitx/")
              (base32
-              "05kl7yid2npp2gbfshnv2xd08w81fkh5h2n5wd9xcpbhlqjzx9sj")))
+              "05gpl318mpm5gxb9665080yd5qiirmh3hwixg9p4wgydk8wfllnl")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     '(#:tex-directory "latex/siunitx"
-       #:build-targets '("siunitx.dtx")))
-    (propagated-inputs
-     (list texlive-l3kernel texlive-l3packages))
-    (home-page "http://www.ctan.org/pkg/siunitx")
+    (propagated-inputs (list texlive-l3kernel texlive-l3packages))
+    (home-page "https://www.ctan.org/pkg/siunitx")
     (synopsis "Comprehensive SI units package")
     (description
      "Typesetting values with units requires care to ensure that the combined
-- 
cgit 1.4.1


From b741baa6ee671fde3d4835eb71baab25121eac89 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 11:41:17 +0200
Subject: gnu: texlive-context: Refresh package definition.

* gnu/packages/tex.scm (texlive-context): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-LM-MATH, TEXLIVE-LUATEX, TEXLIVE-MANFNT-FONT,
TEXLIVE-MPTOPDF, TEXLIVE-XETEX.
---
 gnu/packages/tex.scm | 338 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 252 insertions(+), 86 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7d0c0c5242..381f7061c0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10512,96 +10512,262 @@ a counter to be reset when another is incremented) and
 
 (define-public texlive-context
   (package
-    (inherit (simple-texlive-package
-              "texlive-context"
-              (list "/doc/context/"
-                    "/doc/man/man1/context.1"
-                    "/doc/man/man1/luatools.1"
-                    "/doc/man/man1/mtx-babel.1"
-                    "/doc/man/man1/mtx-base.1"
-                    "/doc/man/man1/mtx-bibtex.1"
-                    "/doc/man/man1/mtx-cache.1"
-                    "/doc/man/man1/mtx-chars.1"
-                    "/doc/man/man1/mtx-check.1"
-                    "/doc/man/man1/mtx-colors.1"
-                    "/doc/man/man1/mtx-context.1"
-                    "/doc/man/man1/mtx-dvi.1"
-                    "/doc/man/man1/mtx-epub.1"
-                    "/doc/man/man1/mtx-evohome.1"
-                    "/doc/man/man1/mtx-fcd.1"
-                    "/doc/man/man1/mtx-flac.1"
-                    "/doc/man/man1/mtx-fonts.1"
-                    "/doc/man/man1/mtx-grep.1"
-                    "/doc/man/man1/mtx-interface.1"
-                    "/doc/man/man1/mtx-metapost.1"
-                    "/doc/man/man1/mtx-modules.1"
-                    "/doc/man/man1/mtx-package.1"
-                    "/doc/man/man1/mtx-pdf.1"
-                    "/doc/man/man1/mtx-plain.1"
-                    "/doc/man/man1/mtx-profile.1"
-                    "/doc/man/man1/mtx-rsync.1"
-                    "/doc/man/man1/mtx-scite.1"
-                    "/doc/man/man1/mtx-server.1"
-                    "/doc/man/man1/mtx-texworks.1"
-                    "/doc/man/man1/mtx-timing.1"
-                    "/doc/man/man1/mtx-tools.1"
-                    "/doc/man/man1/mtx-unicode.1"
-                    "/doc/man/man1/mtx-unzip.1"
-                    "/doc/man/man1/mtx-update.1"
-                    "/doc/man/man1/mtx-watch.1"
-                    "/doc/man/man1/mtx-youless.1"
-
-                    "/bibtex/bst/context/"
-                    "/context/"
-
-                    "/fonts/afm/hoekwater/context/contnav.afm"
-                    "/fonts/cid/fontforge/Adobe-CNS1-4.cidmap"
-                    "/fonts/cid/fontforge/Adobe-GB1-4.cidmap"
-                    "/fonts/cid/fontforge/Adobe-Identity-0.cidmap"
-                    "/fonts/cid/fontforge/Adobe-Japan1-5.cidmap"
-                    "/fonts/cid/fontforge/Adobe-Japan1-6.cidmap"
-                    "/fonts/cid/fontforge/Adobe-Japan2-0.cidmap"
-                    "/fonts/cid/fontforge/Adobe-Korea1-2.cidmap"
-                    "/fonts/enc/dvips/context/"
-                    "/fonts/map/dvips/context/"
-                    "/fonts/map/luatex/context/"
-                    "/fonts/map/pdftex/context/"
-                    "/fonts/misc/xetex/fontmapping/context/"
-                    "/fonts/tfm/hoekwater/context/"
-                    "/fonts/type1/hoekwater/context/"
-                    "/metapost/context/"
-                    "/scripts/context/"
-                    "/tex/context/base/"
-                    "/tex/context/bib/"
-                    "/tex/context/colors/"
-                    "/tex/context/fonts/"
-                    "/tex/context/interface/"
-                    "/tex/context/modules/"
-                    "/tex/context/patterns/"
-                    "/tex/context/sample/"
-                    "/tex/context/test/"
-                    "/tex/context/user/"
-                    "/tex/generic/context/"
-                    "/tex/latex/context/")
-              (base32
-               "1rsw760f52rj62i7ms89xgxdi0qw6hag5fs5hb667nclr4kdkam8")
-              #:trivial? #t))
-    ;; TODO: add these missing packages:
-    ;; xetex, luatex, lm-math, manfnt-font, and mptopdf
-    (propagated-inputs
-     (list texlive-amsfonts
-           texlive-lm
-           texlive-pdftex
-           texlive-metapost
-           texlive-stmaryrd
-           texlive-mflogo-font))
-    (home-page "https://www.ctan.org/pkg/context")
+    (name "texlive-context")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/context/mkii/"
+                   "context/data/scite/context/documents/"
+                   "context/data/scite/context/lexers/data/"
+                   "context/data/scite/context/lexers/themes/"
+                   "context/data/texfont/"
+                   "context/data/textadept/context/data/"
+                   "context/data/textadept/context/lexers/"
+                   "context/data/textadept/context/modules/"
+                   "context/data/textadept/context/themes/"
+                   "context/data/texworks/TUG/"
+                   "context/data/texworks/completion/"
+                   "context/data/texworks/configuration/"
+                   "context/data/vscode/extensions/context/keybindings/"
+                   "context/data/vscode/extensions/context/settings/"
+                   "context/data/vscode/extensions/context/syntaxes/"
+                   "context/data/vscode/extensions/context/tasks/"
+                   "context/data/vscode/extensions/context/themes/"
+                   "doc/context/documents/general/leaflets/"
+                   "doc/context/documents/general/magazines/"
+                   "doc/context/documents/general/manuals/"
+                   "doc/context/documents/general/qrcs/"
+                   "doc/context/examples/calculator/"
+                   "doc/context/examples/clock/"
+                   "doc/context/presentations/bachotex/2005/"
+                   "doc/context/presentations/bachotex/2009/"
+                   "doc/context/presentations/bachotex/2010/"
+                   "doc/context/presentations/bachotex/2011/"
+                   "doc/context/presentations/bachotex/2012/"
+                   "doc/context/presentations/bachotex/2013/"
+                   "doc/context/presentations/bachotex/2014/"
+                   "doc/context/presentations/bachotex/2015/"
+                   "doc/context/presentations/bachotex/2016/"
+                   "doc/context/presentations/bachotex/2017/"
+                   "doc/context/presentations/bachotex/2018/"
+                   "doc/context/presentations/bachotex/2019/"
+                   "doc/context/presentations/context/2007/"
+                   "doc/context/presentations/context/2010/"
+                   "doc/context/presentations/context/2011/"
+                   "doc/context/presentations/context/2012/"
+                   "doc/context/presentations/context/2013/"
+                   "doc/context/presentations/context/2015/"
+                   "doc/context/presentations/context/2016/"
+                   "doc/context/presentations/context/2017/"
+                   "doc/context/presentations/context/2019/"
+                   "doc/context/presentations/context/2020/"
+                   "doc/context/presentations/examples/"
+                   "doc/context/presentations/tug/2001/"
+                   "doc/context/presentations/tug/2007/"
+                   "doc/context/scripts/mkii/"
+                   "doc/context/scripts/mkiv/"
+                   "doc/context/sources/general/leaflets/"
+                   "doc/context/sources/general/magazines/"
+                   "doc/context/sources/general/manuals/about/"
+                   "doc/context/sources/general/manuals/bidi/"
+                   "doc/context/sources/general/manuals/charts/"
+                   "doc/context/sources/general/manuals/cld/"
+                   "doc/context/sources/general/manuals/colors/"
+                   "doc/context/sources/general/manuals/columnsets/"
+                   "doc/context/sources/general/manuals/details/"
+                   "doc/context/sources/general/manuals/epub/"
+                   "doc/context/sources/general/manuals/evenmore/"
+                   "doc/context/sources/general/manuals/followingup/"
+                   "doc/context/sources/general/manuals/fonts/"
+                   "doc/context/sources/general/manuals/graphics/"
+                   "doc/context/sources/general/manuals/hybrid/"
+                   "doc/context/sources/general/manuals/interaction/"
+                   "doc/context/sources/general/manuals/languages/"
+                   "doc/context/sources/general/manuals/libraries/"
+                   "doc/context/sources/general/manuals/lowlevel/"
+                   "doc/context/sources/general/manuals/lua/"
+                   "doc/context/sources/general/manuals/luametafun/"
+                   "doc/context/sources/general/manuals/luametatex/"
+                   "doc/context/sources/general/manuals/luatex/"
+                   "doc/context/sources/general/manuals/math/"
+                   "doc/context/sources/general/manuals/mathml/"
+                   "doc/context/sources/general/manuals/metafun/"
+                   "doc/context/sources/general/manuals/mk/"
+                   "doc/context/sources/general/manuals/musings/"
+                   "doc/context/sources/general/manuals/nodes/"
+                   "doc/context/sources/general/manuals/notnow/"
+                   "doc/context/sources/general/manuals/onandon/"
+                   "doc/context/sources/general/manuals/pagecolumns/"
+                   "doc/context/sources/general/manuals/primitives/"
+                   "doc/context/sources/general/manuals/publications/"
+                   "doc/context/sources/general/manuals/readme/"
+                   "doc/context/sources/general/manuals/rules/"
+                   "doc/context/sources/general/manuals/spacing/"
+                   "doc/context/sources/general/manuals/spreadsheets/"
+                   "doc/context/sources/general/manuals/sql/"
+                   "doc/context/sources/general/manuals/start/en/"
+                   "doc/context/sources/general/manuals/start/graphics/"
+                   "doc/context/sources/general/manuals/steps/"
+                   "doc/context/sources/general/manuals/still/"
+                   "doc/context/sources/general/manuals/svg/"
+                   "doc/context/sources/general/manuals/swiglib/"
+                   "doc/context/sources/general/manuals/templates/"
+                   "doc/context/sources/general/manuals/texit/"
+                   "doc/context/sources/general/manuals/tiptrick/"
+                   "doc/context/sources/general/manuals/tools/"
+                   "doc/context/sources/general/manuals/units/"
+                   "doc/context/sources/general/manuals/workflows/"
+                   "doc/context/sources/general/manuals/xml/"
+                   "doc/context/sources/general/manuals/xtables/"
+                   "doc/man/man1/context.1"
+                   "doc/man/man1/context.man1.pdf"
+                   "doc/man/man1/luatools.1"
+                   "doc/man/man1/luatools.man1.pdf"
+                   "doc/man/man1/mtx-babel.1"
+                   "doc/man/man1/mtx-babel.man1.pdf"
+                   "doc/man/man1/mtx-base.1"
+                   "doc/man/man1/mtx-base.man1.pdf"
+                   "doc/man/man1/mtx-bibtex.1"
+                   "doc/man/man1/mtx-bibtex.man1.pdf"
+                   "doc/man/man1/mtx-cache.1"
+                   "doc/man/man1/mtx-cache.man1.pdf"
+                   "doc/man/man1/mtx-chars.1"
+                   "doc/man/man1/mtx-chars.man1.pdf"
+                   "doc/man/man1/mtx-check.1"
+                   "doc/man/man1/mtx-check.man1.pdf"
+                   "doc/man/man1/mtx-colors.1"
+                   "doc/man/man1/mtx-colors.man1.pdf"
+                   "doc/man/man1/mtx-context.1"
+                   "doc/man/man1/mtx-context.man1.pdf"
+                   "doc/man/man1/mtx-dvi.1"
+                   "doc/man/man1/mtx-dvi.man1.pdf"
+                   "doc/man/man1/mtx-epub.1"
+                   "doc/man/man1/mtx-epub.man1.pdf"
+                   "doc/man/man1/mtx-evohome.1"
+                   "doc/man/man1/mtx-evohome.man1.pdf"
+                   "doc/man/man1/mtx-fcd.1"
+                   "doc/man/man1/mtx-fcd.man1.pdf"
+                   "doc/man/man1/mtx-flac.1"
+                   "doc/man/man1/mtx-flac.man1.pdf"
+                   "doc/man/man1/mtx-fonts.1"
+                   "doc/man/man1/mtx-fonts.man1.pdf"
+                   "doc/man/man1/mtx-grep.1"
+                   "doc/man/man1/mtx-grep.man1.pdf"
+                   "doc/man/man1/mtx-interface.1"
+                   "doc/man/man1/mtx-interface.man1.pdf"
+                   "doc/man/man1/mtx-metapost.1"
+                   "doc/man/man1/mtx-metapost.man1.pdf"
+                   "doc/man/man1/mtx-modules.1"
+                   "doc/man/man1/mtx-modules.man1.pdf"
+                   "doc/man/man1/mtx-package.1"
+                   "doc/man/man1/mtx-package.man1.pdf"
+                   "doc/man/man1/mtx-patterns.1"
+                   "doc/man/man1/mtx-patterns.man1.pdf"
+                   "doc/man/man1/mtx-pdf.1"
+                   "doc/man/man1/mtx-pdf.man1.pdf"
+                   "doc/man/man1/mtx-plain.1"
+                   "doc/man/man1/mtx-plain.man1.pdf"
+                   "doc/man/man1/mtx-profile.1"
+                   "doc/man/man1/mtx-profile.man1.pdf"
+                   "doc/man/man1/mtx-rsync.1"
+                   "doc/man/man1/mtx-rsync.man1.pdf"
+                   "doc/man/man1/mtx-scite.1"
+                   "doc/man/man1/mtx-scite.man1.pdf"
+                   "doc/man/man1/mtx-server.1"
+                   "doc/man/man1/mtx-server.man1.pdf"
+                   "doc/man/man1/mtx-texworks.1"
+                   "doc/man/man1/mtx-texworks.man1.pdf"
+                   "doc/man/man1/mtx-timing.1"
+                   "doc/man/man1/mtx-timing.man1.pdf"
+                   "doc/man/man1/mtx-tools.1"
+                   "doc/man/man1/mtx-tools.man1.pdf"
+                   "doc/man/man1/mtx-unicode.1"
+                   "doc/man/man1/mtx-unicode.man1.pdf"
+                   "doc/man/man1/mtx-unzip.1"
+                   "doc/man/man1/mtx-unzip.man1.pdf"
+                   "doc/man/man1/mtx-update.1"
+                   "doc/man/man1/mtx-update.man1.pdf"
+                   "doc/man/man1/mtx-vscode.1"
+                   "doc/man/man1/mtx-vscode.man1.pdf"
+                   "doc/man/man1/mtx-watch.1"
+                   "doc/man/man1/mtx-watch.man1.pdf"
+                   "doc/man/man1/mtx-youless.1"
+                   "doc/man/man1/mtx-youless.man1.pdf"
+                   "doc/man/man1/mtxrun.1"
+                   "doc/man/man1/mtxrun.man1.pdf"
+                   "doc/man/man1/texexec.1"
+                   "doc/man/man1/texexec.man1.pdf"
+                   "doc/man/man1/texmfstart.1"
+                   "doc/man/man1/texmfstart.man1.pdf"
+                   "fonts/afm/hoekwater/context/"
+                   "fonts/cid/fontforge/"
+                   "fonts/enc/dvips/context/"
+                   "fonts/map/dvips/context/"
+                   "fonts/map/luatex/context/"
+                   "fonts/map/pdftex/context/"
+                   "fonts/misc/xetex/fontmapping/context/"
+                   "fonts/tfm/hoekwater/context/"
+                   "fonts/type1/hoekwater/context/"
+                   "metapost/context/base/common/"
+                   "metapost/context/base/mpii/"
+                   "metapost/context/base/mpiv/"
+                   "metapost/context/base/mpxl/"
+                   "metapost/context/fonts/mpiv/"
+                   "scripts/context/lua/"
+                   "scripts/context/perl/"
+                   "scripts/context/ruby/base/"
+                   "scripts/context/ruby/graphics/"
+                   "scripts/context/ruby/rslb/"
+                   "scripts/context/stubs/install/"
+                   "scripts/context/stubs/mswin/"
+                   "scripts/context/stubs/setup/"
+                   "scripts/context/stubs/source/"
+                   "scripts/context/stubs/unix/"
+                   "scripts/context/stubs/win64/"
+                   "tex/context/base/"
+                   "tex/context/bib/common/"
+                   "tex/context/bib/mkii/"
+                   "tex/context/colors/icc/context/"
+                   "tex/context/fonts/mkii/"
+                   "tex/context/fonts/mkiv/"
+                   "tex/context/interface/mkii/"
+                   "tex/context/interface/mkiv/"
+                   "tex/context/modules/common/"
+                   "tex/context/modules/mkii/"
+                   "tex/context/modules/mkiv/"
+                   "tex/context/modules/mkxl/"
+                   "tex/context/patterns/common/"
+                   "tex/context/patterns/mkii/"
+                   "tex/context/patterns/mkiv/"
+                   "tex/context/sample/common/"
+                   "tex/context/sample/third/"
+                   "tex/context/test/mkiv/"
+                   "tex/context/user/mkii/"
+                   "tex/generic/context/luatex/"
+                   "tex/generic/context/ppchtex/"
+                   "tex/latex/context/ppchtex/")
+             (base32
+              "1sbh4fnxxymh7lmvldp1ll8p6adcf3jhvqf47jvrayqr91zp4hh9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-amsfonts
+                             texlive-lm
+                             texlive-lm-math
+                             texlive-luatex
+                             texlive-manfnt-font
+                             texlive-metapost
+                             texlive-mflogo-font
+                             texlive-mptopdf
+                             texlive-pdftex
+                             texlive-stmaryrd
+                             texlive-xetex))
+    (home-page "https://ctan.org/pkg/context")
     (synopsis "Full featured, parameter driven macro package for TeX")
     (description "ConTeXt is a full featured, parameter driven macro package,
 which fully supports advanced interactive documents.  See the ConTeXt garden
 for a wealth of support information.")
-    ;; The GPL applies to all code; alternatively, the LaTeX license may be used.
-    ;; The CC-BY-SA license applies to all documentation.
+    ;; The GPL applies to all code; alternatively, the LaTeX license may be
+    ;; used.  The CC-BY-SA license applies to all documentation.
     (license (list license:lppl1.3c+
                    license:gpl2+
                    license:cc-by-sa4.0))))
-- 
cgit 1.4.1


From 8c0d071dfce6476f7db769be2c747813cca29d62 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 17 May 2023 16:57:16 +0200
Subject: gnu: texlive-latex-base: Refresh package definition.

* gnu/packages/tex.scm (texlive-latex-base): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[build-system]: Use TEXLIVE-BUILD-SYSTEM.
[arguments]: Use G-expressions.
<#:phases>: Remove unnecessary phase.
[native-inputs]: Add TEXLIVE-ETEX, TEXLIVE-LUATEX. Remove
TEXLIVE-LUATEXCONFIG.  Remove labels.
---
 gnu/packages/tex.scm | 417 +++++++++++++++++++++++----------------------------
 1 file changed, 191 insertions(+), 226 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 381f7061c0..412d46dd3f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3311,235 +3311,200 @@ formats.")
     (license license:lppl)))
 
 (define-public texlive-latex-base
-  (let ((template (simple-texlive-package
-                   "texlive-latex-base"
-                   (list "/doc/latex/base/"
-                         "/source/latex/base/"
-                         ;; Almost all files in /tex/latex/base are generated, but
-                         ;; these are not:
-                         "/tex/latex/base/idx.tex"
-                         "/tex/latex/base/lablst.tex"
-                         "/tex/latex/base/ltnews.cls"
-                         "/tex/latex/base/ltxcheck.tex"
-                         "/tex/latex/base/ltxguide.cls"
-                         "/tex/latex/base/minimal.cls"
-                         "/tex/latex/base/sample2e.tex"
-                         "/tex/latex/base/small2e.tex"
-                         "/tex/latex/base/testpage.tex"
-                         "/tex/latex/base/texsys.cfg")
-                   (base32
-                    "0msyjz0937rc7hs77v6la152sdiwd73qj41z1mlyh0m3dns9qz4g")
-                   #:trivial? #t)))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:modules modules '())
-          '((guix build gnu-build-system)
-            (guix build utils)
-            (ice-9 match)
-            (srfi srfi-26)))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             ;; The literal tab in the dtx file is translated to the string
-             ;; "^^I" in the generated Lua file, which causes a syntax error.
-             (add-after 'unpack 'fix-lua-sources
-               (lambda _
-                 (substitute* "source/latex/base/ltluatex.dtx"
-                   (("	") "  "))))
-             (replace 'build
-               (lambda* (#:key inputs #:allow-other-keys)
-                 ;; Find required fonts
-                 (setenv "TFMFONTS"
+  (package
+    (name "texlive-latex-base")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/base/" "makeindex/latex/"
+                   "source/latex/base/" "tex/latex/base/")
+             (base32
+              "0k2b6qi281cl4zml6l537iyps1zwaq7pip81qq8vlkhb9h5ggpnw")))
+    (build-system texlive-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     (list
+      #:texlive-latex-base #f
+      #:modules '((guix build texlive-build-system)
+                  (guix build utils)
+                  (ice-9 match)
+                  (srfi srfi-26))
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; The literal tab in the dtx file is translated to the string "^^I"
+          ;; in the generated Lua file, which causes a syntax error.
+          (add-after 'unpack 'fix-lua-sources
+            (lambda _
+              (substitute* "source/latex/base/ltluatex.dtx"
+                (("\t") "  "))))
+          (replace 'build
+            (lambda* (#:key inputs #:allow-other-keys)
+              ;; Find required fonts
+              (setenv "TFMFONTS"
+                      (string-join
+                       (map (match-lambda
+                              ((pkg-name . dir)
+                               (string-append
+                                (assoc-ref inputs pkg-name)
+                                "/share/texmf-dist/fonts/tfm/public"
+                                dir)))
+                            '(("texlive-etex" . "/etex")
+                              ("texlive-cm" . "/cm")
+                              ("texlive-latex-fonts" . "/latex-fonts")
+                              ("texlive-knuth-lib" . "/knuth-lib")))
+                       ":"))
+              (let ((cwd (getcwd)))
+                (setenv "TEXINPUTS"
+                        (string-append
+                         cwd "//:"
+                         cwd "/source/latex/base//:"
+                         cwd "/build:"
                          (string-join
-                          (map (match-lambda
-                                 ((pkg-name . dir)
-                                  (string-append
-                                   (assoc-ref inputs pkg-name)
-                                   "/share/texmf-dist/fonts/tfm/public"
-                                   dir)))
-                               '(("texlive-etex" . "/etex")
-                                 ("texlive-cm" . "/cm")
-                                 ("texlive-latex-fonts" . "/latex-fonts")
-                                 ("texlive-knuth-lib" . "/knuth-lib")))
-                          ":"))
-                 (let ((cwd (getcwd)))
-                   (setenv "TEXINPUTS"
-                           (string-append
-                            cwd "//:"
-                            cwd "/source/latex/base//:"
-                            cwd "/build:"
-                            (string-join
-                             (map (match-lambda ((_ . dir) dir)) inputs)
-                             "//:")))
-                   (setenv "LUAINPUTS" (string-append cwd "/build:")))
-
-                 ;; This is the actual build step.
-                 (mkdir "build")
-                 (invoke "tex" "-ini" "-interaction=scrollmode"
-                         "-output-directory=build" "unpack.ins")
-
-                 ;; XXX: We can't build all formats at this point, nor are they
-                 ;; part of the LaTeX base, so we disable them.  Actually, we
-                 ;; should be running this all in a profile hook, so that only
-                 ;; selected formats and hyphenation patterns are included, but it
-                 ;; takes long and TeX Live isn't designed to be modular like
-                 ;; that.  Everything operates on a shared directory, which we
-                 ;; would only have at profile generation time.
-                 (let ((disabled-formats
-                        '("aleph aleph" "lamed aleph" "uptex uptex" "euptex euptex"
-                          "eptex eptex" "ptex ptex" "pdfxmltex pdftex" "platex eptex"
-                          "platex-dev eptex" "uplatex-dev euptex"
-                          "csplain pdftex" "mf mf-nowin" "mex pdftex" "pdfmex pdftex"
-                          "luacsplain luatex" "optex luatex"
-                          ;; LuaJIT is not ported to powerpc64le* or riscv64 yet and
-                          ;; building these fail on powerpc.
-                          ,@(if (or (target-powerpc?)
-                                    (target-riscv64?))
+                          (map (match-lambda ((_ . dir) dir)) inputs)
+                          "//:")))
+                (setenv "LUAINPUTS" (string-append cwd "/build:")))
+
+              ;; This is the actual build step.
+              (mkdir "build")
+              (invoke "tex" "-ini" "-interaction=scrollmode"
+                      "-output-directory=build" "unpack.ins")
+
+              ;; XXX: We can't build all formats at this point, nor are they
+              ;; part of the LaTeX base, so we disable them.  Actually, we
+              ;; should be running this all in a profile hook, so that only
+              ;; selected formats and hyphenation patterns are included, but it
+              ;; takes long and TeX Live isn't designed to be modular like
+              ;; that.  Everything operates on a shared directory, which we
+              ;; would only have at profile generation time.
+              (let ((disabled-formats
+                     '("aleph aleph" "lamed aleph" "uptex uptex" "euptex euptex"
+                       "eptex eptex" "ptex ptex" "pdfxmltex pdftex" "platex eptex"
+                       "platex-dev eptex" "uplatex-dev euptex"
+                       "csplain pdftex" "mf mf-nowin" "mex pdftex" "pdfmex pdftex"
+                       "luacsplain luatex" "optex luatex"
+                       ;; LuaJIT is not ported to powerpc64le* or riscv64 yet and
+                       ;; building these fail on powerpc.
+                       #$@(if (or (target-powerpc?)
+                                  (target-riscv64?))
                               '("luajittex" "luajithbtex" "mfluajit") '())
-                          "cont-en xetex" "cont-en pdftex" "pdfcsplain xetex"
-                          "pdfcsplain pdftex" "pdfcsplain luatex" "cslatex pdftex"
-                          "mptopdf pdftex" "uplatex euptex" "jadetex pdftex"
-                          "amstex pdftex" "pdfcslatex pdftex" "lollipop tex"
-                          "xmltex pdftex" "pdfjadetex pdftex" "eplain pdftex"
-                          "texsis pdftex" "mltex pdftex" "utf8mex pdftex")))
-                   (mkdir "web2c")
-                   (install-file (string-append
-                                  (assoc-ref inputs "texlive-kpathsea")
-                                  "/share/texmf-dist/web2c/fmtutil.cnf")
-                                 "web2c")
-                   (make-file-writable "web2c/fmtutil.cnf")
-                   (substitute* "web2c/fmtutil.cnf"
-                     (((string-append "^(" (string-join disabled-formats "|") ")") m)
-                      (string-append "#! " m))
-                     (("translate-file=cp227")
-                      (format #f "translate-file=~a/share/texmf-dist/web2c/cp227"
-                              (assoc-ref inputs "texlive-kpathsea")))))
-                 (invoke "fmtutil-sys" "--all"
-                         "--fmtdir=web2c"
-                         (string-append "--cnffile=web2c/fmtutil.cnf"))
-                 ;; We don't actually want to install it.
-                 (delete-file "web2c/fmtutil.cnf")))
-             (add-after 'install 'install-more
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 (let* ((out (assoc-ref outputs "out"))
-                        (root (string-append out "/share/texmf-dist"))
-                        (target (string-append root "/tex/latex/base"))
-                        (web2c (string-append root "/web2c"))
-                        (makeindex (string-append root "/makeindex/latex")))
-                   (for-each delete-file (find-files "." "\\.(log|aux)$"))
-
-                   ;; The usedir directive in docstrip.ins is ignored, so these
-                   ;; two files end up in the wrong place.  Move them.
-                   (mkdir-p makeindex)
-                   (for-each (lambda (file)
-                               (install-file file makeindex)
-                               (delete-file file))
-                             '("build/gglo.ist"
-                               "build/gind.ist"))
-                   (for-each (cut install-file <> target)
-                             (find-files "build" ".*"))
-                   (for-each (cut install-file <> web2c)
-                             (find-files "web2c" ".*")))))))))
-      (native-inputs
-       `(("texlive-bin" ,texlive-bin)
-         ("texlive-tex-ini-files" ,texlive-tex-ini-files)
-         ("texlive-plain" ,texlive-plain)
-         ("texlive-kpathsea" ,texlive-kpathsea)
-         ("texlive-cm" ,texlive-cm)
-         ("texlive-latex-fonts" ,texlive-latex-fonts)
-         ("texlive-knuth-lib" ,texlive-knuth-lib)
-         ("texlive-luatexconfig"
-          ,(texlive-origin
-            "texlive-luatexconfig" (number->string %texlive-revision)
-            (list "/tex/generic/config/luatex-unicode-letters.tex"
-                  "/tex/generic/config/luatexiniconfig.tex"
-                  "/web2c/texmfcnf.lua")
-            (base32
-             "065j47i2785nbj2507pzxlscyrwr4ghv6nksc3a01rp62bq8kkjp")))))
-      (propagated-inputs
-       (list texlive-dehyph-exptl
-             texlive-etex
-             texlive-hyph-utf8
-             texlive-hyphen-base
-             texlive-hyphen-afrikaans
-             texlive-hyphen-ancientgreek
-             texlive-hyphen-armenian
-             texlive-hyphen-basque
-             texlive-hyphen-belarusian
-             texlive-hyphen-bulgarian
-             texlive-hyphen-catalan
-             texlive-hyphen-chinese
-             texlive-hyphen-churchslavonic
-             texlive-hyphen-coptic
-             texlive-hyphen-croatian
-             texlive-hyphen-czech
-             texlive-hyphen-danish
-             texlive-hyphen-dutch
-             texlive-hyphen-english
-             texlive-hyphen-esperanto
-             texlive-hyphen-estonian
-             texlive-hyphen-ethiopic
-             texlive-hyphen-finnish
-             texlive-hyphen-schoolfinnish
-             texlive-hyphen-french
-             texlive-hyphen-friulan
-             texlive-hyphen-galician
-             texlive-hyphen-georgian
-             texlive-hyphen-german
-             texlive-hyphen-greek
-             texlive-hyphen-hungarian
-             texlive-hyphen-icelandic
-             texlive-hyphen-indic
-             texlive-hyphen-indonesian
-             texlive-hyphen-interlingua
-             texlive-hyphen-irish
-             texlive-hyphen-italian
-             texlive-hyphen-kurmanji
-             texlive-hyphen-latin
-             texlive-hyphen-latvian
-             texlive-hyphen-lithuanian
-             texlive-hyphen-macedonian
-             texlive-hyphen-mongolian
-             texlive-hyphen-norwegian
-             texlive-hyphen-occitan
-             texlive-hyphen-pali
-             texlive-hyphen-piedmontese
-             texlive-hyphen-polish
-             texlive-hyphen-portuguese
-             texlive-hyphen-romanian
-             texlive-hyphen-romansh
-             texlive-hyphen-russian
-             texlive-hyphen-sanskrit
-             texlive-hyphen-serbian
-             texlive-hyphen-slovak
-             texlive-hyphen-slovenian
-             texlive-hyphen-spanish
-             texlive-hyphen-swedish
-             texlive-hyphen-thai
-             texlive-hyphen-turkish
-             texlive-hyphen-turkmen
-             texlive-hyphen-ukrainian
-             texlive-hyphen-uppersorbian
-             texlive-hyphen-welsh
-             texlive-unicode-data
-             texlive-ukrhyph
-             texlive-ruhyphen
-             texlive-l3kernel
-             texlive-l3backend
-             ;; TODO: This dependency isn't needed for LaTeX version 2021-06-01
-             ;; and later. See:
-             ;; https://tug.org/pipermail/tex-live/2021-June/047180.html
-             texlive-l3packages
-             texlive-latexconfig))
-      (home-page "https://www.ctan.org/pkg/latex-base")
-      (synopsis "Base sources of LaTeX")
-      (description
-       "This bundle comprises the source of LaTeX itself, together with several
-packages which are considered \"part of the kernel\".  This bundle, together
-with the required packages, constitutes what every LaTeX distribution should
+                       "cont-en xetex" "cont-en pdftex" "pdfcsplain xetex"
+                       "pdfcsplain pdftex" "pdfcsplain luatex" "cslatex pdftex"
+                       "mptopdf pdftex" "uplatex euptex" "jadetex pdftex"
+                       "amstex pdftex" "pdfcslatex pdftex" "lollipop tex"
+                       "xmltex pdftex" "pdfjadetex pdftex" "eplain pdftex"
+                       "texsis pdftex" "mltex pdftex" "utf8mex pdftex")))
+                (mkdir "web2c")
+                (install-file (string-append
+                               (assoc-ref inputs "texlive-kpathsea")
+                               "/share/texmf-dist/web2c/fmtutil.cnf")
+                              "web2c")
+                (make-file-writable "web2c/fmtutil.cnf")
+                (substitute* "web2c/fmtutil.cnf"
+                  (((string-append "^(" (string-join disabled-formats "|") ")") m)
+                   (string-append "#! " m))
+                  (("translate-file=cp227")
+                   (format #f "translate-file=~a/share/texmf-dist/web2c/cp227"
+                           (assoc-ref inputs "texlive-kpathsea")))))
+              (invoke "fmtutil-sys" "--all"
+                      "--fmtdir=web2c"
+                      (string-append "--cnffile=web2c/fmtutil.cnf"))
+              ;; We don't actually want to install it.
+              (delete-file "web2c/fmtutil.cnf")
+              ;; Also remove cruft.
+              (for-each delete-file (find-files "web2c" "\\.log$")))))))
+    (native-inputs
+     (list texlive-bin
+           texlive-cm
+           texlive-etex
+           texlive-knuth-lib
+           texlive-kpathsea
+           texlive-latex-fonts
+           texlive-luatex
+           texlive-plain
+           texlive-tex-ini-files))
+    (propagated-inputs
+     (list texlive-dehyph-exptl
+           texlive-etex
+           texlive-hyph-utf8
+           texlive-hyphen-afrikaans
+           texlive-hyphen-ancientgreek
+           texlive-hyphen-armenian
+           texlive-hyphen-base
+           texlive-hyphen-basque
+           texlive-hyphen-belarusian
+           texlive-hyphen-bulgarian
+           texlive-hyphen-catalan
+           texlive-hyphen-chinese
+           texlive-hyphen-churchslavonic
+           texlive-hyphen-coptic
+           texlive-hyphen-croatian
+           texlive-hyphen-czech
+           texlive-hyphen-danish
+           texlive-hyphen-dutch
+           texlive-hyphen-english
+           texlive-hyphen-esperanto
+           texlive-hyphen-estonian
+           texlive-hyphen-ethiopic
+           texlive-hyphen-finnish
+           texlive-hyphen-french
+           texlive-hyphen-friulan
+           texlive-hyphen-galician
+           texlive-hyphen-georgian
+           texlive-hyphen-german
+           texlive-hyphen-greek
+           texlive-hyphen-hungarian
+           texlive-hyphen-icelandic
+           texlive-hyphen-indic
+           texlive-hyphen-indonesian
+           texlive-hyphen-interlingua
+           texlive-hyphen-irish
+           texlive-hyphen-italian
+           texlive-hyphen-kurmanji
+           texlive-hyphen-latin
+           texlive-hyphen-latvian
+           texlive-hyphen-lithuanian
+           texlive-hyphen-macedonian
+           texlive-hyphen-mongolian
+           texlive-hyphen-norwegian
+           texlive-hyphen-occitan
+           texlive-hyphen-pali
+           texlive-hyphen-piedmontese
+           texlive-hyphen-polish
+           texlive-hyphen-portuguese
+           texlive-hyphen-romanian
+           texlive-hyphen-romansh
+           texlive-hyphen-russian
+           texlive-hyphen-sanskrit
+           texlive-hyphen-schoolfinnish
+           texlive-hyphen-serbian
+           texlive-hyphen-slovak
+           texlive-hyphen-slovenian
+           texlive-hyphen-spanish
+           texlive-hyphen-swedish
+           texlive-hyphen-thai
+           texlive-hyphen-turkish
+           texlive-hyphen-turkmen
+           texlive-hyphen-ukrainian
+           texlive-hyphen-uppersorbian
+           texlive-hyphen-welsh
+           texlive-l3backend
+           texlive-l3kernel
+           texlive-latexconfig
+           texlive-ruhyphen
+           texlive-ukrhyph
+           texlive-unicode-data
+           ;; TODO: This dependency isn't needed for LaTeX version 2021-06-01
+           ;; and later. See:
+           ;; <https://tug.org/pipermail/tex-live/2021-June/047180.html>
+           texlive-l3packages))
+    (home-page "https://www.ctan.org/pkg/latex-base")
+    (synopsis "Base sources of LaTeX")
+    (description
+     "This bundle comprises the source of LaTeX itself, together with several
+packages which are considered part of the kernel.  This bundle, together with
+the required packages, constitutes what every LaTeX distribution should
 contain.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-public texlive-atenddvi
   (package
-- 
cgit 1.4.1


From 6a09a6c5eb570eca34818d95b069c082dce5ee4f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 10:54:09 +0200
Subject: gnu: texlive-hyphen-package: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-hyphen-package): Remove SIMPLE-TEXLIVE-PACKAGE call.
---
 gnu/packages/tex.scm | 133 ++++++++++++++++++++++++++-------------------------
 1 file changed, 69 insertions(+), 64 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 412d46dd3f..50cde22825 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -184,70 +184,75 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used."
 
 (define (texlive-hyphen-package name code locations hash)
   "Return a TeX Live hyphenation package with the given NAME, using source
-files from LOCATIONS with expected checksum HASH.  CODE is not currently in use."
-  (let ((parent (simple-texlive-package
-                 name locations hash #:trivial? #t)))
-    (package
-      (inherit parent)
-      (arguments
-       (substitute-keyword-arguments (package-arguments parent)
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (replace 'build
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 (let* ((out (assoc-ref outputs "out"))
-                        (root (string-append out "/share/texmf-dist"))
-                        (patterns
-                         (string-append root "/tex/generic/hyph-utf8/patterns/txt/"))
-                        (loaders
-                         (string-append root "/tex/generic/hyph-utf8/loadhyph"))
-                        (ptex
-                         (string-append root "/tex/generic/hyph-utf8/patterns/ptex"))
-                        (quote
-                         (string-append root "/tex/generic/hyph-utf8/patterns/quote")))
-                   (mkdir "scripts")
-                   (copy-recursively
-                    (dirname (search-input-file inputs "hyph-utf8.rb"))
-                    "scripts")
-
-                   ;; Prepare target directories
-                   (mkdir-p patterns)
-                   (mkdir-p loaders)
-                   (mkdir-p ptex)
-                   (mkdir-p quote)
-
-                   ;; Generate plain patterns
-                   (with-directory-excursion "scripts"
-                     (substitute* "lib/tex/hyphen/path.rb"
-                       (("^([[:blank:]]+)TeXROOT = .*" _ indent)
-                        (string-append indent "TeXROOT = \""
-                                       (getcwd) "/..\"\n")))
-
-                     (substitute* "generate-plain-patterns.rb"
-                       ;; Ruby 2 does not need this.
-                       (("require 'unicode'") "")
-                       ;; Write directly to the output directory
-                       (("File\\.join\\(PATH::TXT")
-                        (string-append "File.join(\"" patterns "\""))
-                       (("File\\.join\\(PATH::QUOTE")
-                        (string-append "File.join(\"" quote "\"")))
-                     (invoke "ruby" "generate-plain-patterns.rb")
-
-                     ;; Build pattern loaders
-                     (substitute* "generate-pattern-loaders.rb"
-                       (("File\\.join\\(PATH::LOADER")
-                        (string-append "File.join(\"" loaders "\"")))
-
-                     (invoke "ruby" "generate-pattern-loaders.rb")
-
-                     ;; Build ptex patterns
-                     (substitute* "generate-ptex-patterns.rb"
-                       (("File\\.join\\(PATH::PTEX")
-                        (string-append "File.join(\"" ptex "\"")))
-                     (invoke "ruby" "generate-ptex-patterns.rb")))))))))
-      (native-inputs
-       (list ruby-2.7 ruby-hydra-minimal/pinned hyph-utf8-scripts))
-      (home-page "https://ctan.org/pkg/hyph-utf8"))))
+files from LOCATIONS with expected checksum HASH.  CODE is not currently in
+use."
+  (package
+    (name name)
+    (version (number->string %texlive-revision))
+    (source (texlive-origin name version location hash))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:texlive-latex-base #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'build
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let* ((root (string-append #$output "/share/texmf-dist"))
+                     (patterns
+                      (string-append root "/tex/generic/hyph-utf8/patterns/txt/"))
+                     (loaders
+                      (string-append root "/tex/generic/hyph-utf8/loadhyph"))
+                     (ptex
+                      (string-append root "/tex/generic/hyph-utf8/patterns/ptex"))
+                     (quote
+                      (string-append root "/tex/generic/hyph-utf8/patterns/quote")))
+                (mkdir "scripts")
+                (copy-recursively
+                 (dirname (search-input-file inputs "hyph-utf8.rb"))
+                 "scripts")
+
+                ;; Prepare target directories
+                (mkdir-p patterns)
+                (mkdir-p loaders)
+                (mkdir-p ptex)
+                (mkdir-p quote)
+
+                ;; Generate plain patterns
+                (with-directory-excursion "scripts"
+                  (substitute* "lib/tex/hyphen/path.rb"
+                    (("^([[:blank:]]+)TeXROOT = .*" _ indent)
+                     (string-append indent "TeXROOT = \""
+                                    (getcwd) "/..\"\n")))
+
+                  (substitute* "generate-plain-patterns.rb"
+                    ;; Ruby 2 does not need this.
+                    (("require 'unicode'") "")
+                    ;; Write directly to the output directory
+                    (("File\\.join\\(PATH::TXT")
+                     (string-append "File.join(\"" patterns "\""))
+                    (("File\\.join\\(PATH::QUOTE")
+                     (string-append "File.join(\"" quote "\"")))
+                  (invoke "ruby" "generate-plain-patterns.rb")
+
+                  ;; Build pattern loaders
+                  (substitute* "generate-pattern-loaders.rb"
+                    (("File\\.join\\(PATH::LOADER")
+                     (string-append "File.join(\"" loaders "\"")))
+
+                  (invoke "ruby" "generate-pattern-loaders.rb")
+
+                  ;; Build ptex patterns
+                  (substitute* "generate-ptex-patterns.rb"
+                    (("File\\.join\\(PATH::PTEX")
+                     (string-append "File.join(\"" ptex "\"")))
+                  (invoke "ruby" "generate-ptex-patterns.rb"))))))))
+    (native-inputs
+     (list hyph-utf8-scripts ruby-2.7 ruby-hydra-minimal/pinned))
+    (home-page "https://ctan.org/pkg/hyph-utf8")
+    (synopsis #f)
+    (description #f)
+    (license #f)))
 
 (define texlive-extra-src
   (origin
-- 
cgit 1.4.1


From 8b2d1a93475b64adb23ec49443476b3fd5fb629b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 11:00:01 +0200
Subject: gnu: texlive-tetex: Refresh package definition.

* gnu/packages/tex.scm (texlive-tetex): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 50cde22825..dbbfcad9d8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4288,19 +4288,23 @@ of file names.")
 
 (define-public texlive-tetex
   (package
-    (inherit (simple-texlive-package
-              "texlive-tetex"
-              (list "/dvips/tetex/"
-                    "/fonts/enc/dvips/tetex/"
-                    "/fonts/map/dvips/tetex/")
-              (base32
-               "05mf8yqdj2wrc1zm3al2j4aam2wx0ky6a7slxw17pkd1c7rmvjrq")
-              #:trivial? #t))
+    (name "texlive-tetex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/tetex/"
+                   "fonts/enc/dvips/tetex/"
+                   "fonts/map/dvips/tetex/")
+             (base32
+              "05mf8yqdj2wrc1zm3al2j4aam2wx0ky6a7slxw17pkd1c7rmvjrq")))
+    (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-base #f))
     (home-page "https://www.ctan.org/pkg/tetex")
     (synopsis "Font maps originally from teTeX")
-    (description "This package provides font maps that were originally part of
-the now obsolete teTeX distributions but are still used at the core of the TeX
-Live distribution.")
+    (description
+     "This package provides font maps that were originally part of the now
+obsolete teTeX distributions but are still used at the core of the TeX Live
+distribution.")
     (license license:public-domain)))
 
 (define-public texlive-l3kernel
-- 
cgit 1.4.1


From 12a22bfdb52563b956474b676a4b1828819f7377 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 11:30:19 +0200
Subject: gnu: simple-texlive-package: Turn it into a stub.

No texlive package makes use of #:TRIVIAL? keyword anymore. This function now
always use TEXLIVE-BUILD-SYSTEM until is can be completely removed.

* gnu/packages/tex.scm (simple-texlive-package): Always use TEXLIVE-BUILD-SYSTEM.
---
 gnu/packages/tex.scm | 46 +++-------------------------------------------
 1 file changed, 3 insertions(+), 43 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dbbfcad9d8..99452c9bdd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -107,8 +107,7 @@
                                  #:key trivial?)
   "Return a template for a simple TeX Live package with the given NAME,
 downloading from a list of LOCATIONS in the TeX Live repository, and expecting
-the provided output HASH.  If TRIVIAL? is provided, all files will simply be
-copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used."
+the provided output HASH.  The TRIVIAL? keyword is not used."
   (set! locations
         ;; Some locations may be manually inserted, so be tolerant with
         ;; leading slashes.  Ignore them consistently.
@@ -124,47 +123,8 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used."
     (name name)
     (version (number->string %texlive-revision))
     (source (texlive-origin name version locations hash))
-    (outputs (if with-documentation?
-                 '("out" "doc")
-                 '("out")))
-    (build-system (if trivial?
-                      gnu-build-system
-                      texlive-build-system))
-    (arguments
-     (let ((copy-files
-            `(lambda* (#:key outputs inputs tex-directory #:allow-other-keys)
-               (let (,@(if with-documentation?
-                           `((doc (string-append (assoc-ref outputs "doc")
-                                                 "/share/texmf-dist")))
-                           '())
-                     (source (assoc-ref inputs "source"))
-                     (out (string-append (assoc-ref outputs "out")
-                                         "/share/texmf-dist")))
-                 ,@(if with-documentation?
-                       '((mkdir-p doc)
-                         (copy-recursively
-                          (string-append source "/doc")
-                          (string-append doc "/doc")))
-                       '())
-                 (mkdir-p out)
-                 (copy-recursively "." out)
-                 ;; In any case, if documentation exists, it is already in the
-                 ;; "doc" output, so remove it from regular one.
-                 (let ((doc (string-append out "/doc")))
-                   (when (file-exists? doc)
-                     (delete-file-recursively doc)))
-                 ;; Also remove all source files.
-                 (let ((srcfiles (string-append out "/source")))
-                   (when (file-exists? srcfiles)
-                     (delete-file-recursively srcfiles)))))))
-       (if trivial?
-           `(#:tests? #f
-             #:phases
-             (modify-phases %standard-phases
-               (delete 'configure)
-               (replace 'build (const #t))
-               (replace 'install ,copy-files)))
-           `())))
+    (outputs (if with-documentation? '("out" "doc") '("out")))
+    (build-system texlive-build-system)
     (home-page #f)
     (synopsis #f)
     (description #f)
-- 
cgit 1.4.1


From 2e4f91bcce148d381fd3d704b4d40246c277304d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 11:33:01 +0200
Subject: gnu: texlive-hyph-utf8: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-hyph-utf8): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[arguments]: Use G-expressions. Remove trailing #T from phases.
[native-inputs]: Add TEXLIVE-DOCSTRIP.
---
 gnu/packages/tex.scm | 193 +++++++++++++++++++++++++--------------------------
 1 file changed, 95 insertions(+), 98 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 99452c9bdd..0f0399e868 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2891,115 +2891,112 @@ T1/EC and UTF-8 encodings.")
 
 (define-public texlive-hyph-utf8
   (package
-    (inherit (simple-texlive-package
-              "texlive-hyph-utf8"
-              (list "/source/generic/hyph-utf8/"
-                    "/source/luatex/hyph-utf8/"
-                    "/doc/luatex/hyph-utf8/"
-                    "/tex/luatex/hyph-utf8/etex.src"
-                    ;; Used to extract luatex-hyphen.lua
-                    "/tex/latex/base/docstrip.tex"
-
-                    ;; Documentation; we can't use the whole directory because
-                    ;; it includes files from other packages.
-                    "/doc/generic/hyph-utf8/CHANGES"
-                    "/doc/generic/hyph-utf8/HISTORY"
-                    "/doc/generic/hyph-utf8/hyph-utf8.pdf"
-                    "/doc/generic/hyph-utf8/hyph-utf8.tex"
-                    "/doc/generic/hyph-utf8/hyphenation-distribution.pdf"
-                    "/doc/generic/hyph-utf8/hyphenation-distribution.tex"
-                    "/doc/generic/hyph-utf8/img/miktex-languages.png"
-                    "/doc/generic/hyph-utf8/img/texlive-collection.png")
-              (base32
-               "0rgp0zn36gwzqwpmjb9h01ns3m19v3r7lpw1h0pc9bx115w6c9jx")))
+    (name "texlive-hyph-utf8")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/hyph-utf8/"
+                   "source/generic/hyph-utf8/"
+                   "source/generic/hyph-utf8/contributed/"
+                   "source/generic/hyph-utf8/data/"
+                   "source/luatex/hyph-utf8/"
+                   "tex/luatex/hyph-utf8/"
+                   ;; Documentation; we can't use the whole directory because
+                   ;; it includes files from other packages.
+                   "doc/generic/hyph-utf8/CHANGES"
+                   "doc/generic/hyph-utf8/HISTORY"
+                   "doc/generic/hyph-utf8/hyph-utf8.pdf"
+                   "doc/generic/hyph-utf8/hyph-utf8.tex"
+                   "doc/generic/hyph-utf8/hyphenation-distribution.pdf"
+                   "doc/generic/hyph-utf8/hyphenation-distribution.tex"
+                   "doc/generic/hyph-utf8/img/miktex-languages.png"
+                   "doc/generic/hyph-utf8/img/texlive-collection.png")
+             (base32
+              "1dm023k05c0pnnyqgbsy1cbpq8layabdp8acln0v59kpsx7flmj9")))
     (outputs '("out" "doc"))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f ; there are none
-       #:modules ((guix build gnu-build-system)
+     (list
+      #:tests? #f                       ; there are none
+      #:modules '((guix build gnu-build-system)
                   (guix build utils)
                   (ice-9 match))
-       #:make-flags
-       (list "-C" "source/luatex/hyph-utf8/"
-             (string-append "DO_TEX = tex --interaction=nonstopmode '&tex' $<")
-             (string-append "RUNDIR =" (assoc-ref %outputs "out") "/share/texmf-dist/tex/luatex/hyph-utf8/")
-             (string-append "DOCDIR =" (assoc-ref %outputs "doc") "/share/texmf-dist/doc/luatex/hyph-utf8/")
-             ;; hyphen.cfg is neither included nor generated, so let's only build the lua file.
-             (string-append "UNPACKED = $(NAME).lua"))
-       #:phases
-       (modify-phases %standard-phases
-         ;; TeX isn't usable at this point, so we first need to generate the
-         ;; tex.fmt.
-         (replace 'configure
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             ;; Target directories must exist.
-             (mkdir-p (string-append (assoc-ref %outputs "out")
-                                     "/share/texmf-dist/tex/luatex/hyph-utf8/"))
-             (mkdir-p (string-append (assoc-ref %outputs "doc")
-                                     "/share/texmf-dist/doc/luatex/hyph-utf8/"))
-
-             ;; We cannot build the documentation because that requires a
-             ;; fully functional pdflatex, which depends on this package.
-             (substitute* "source/luatex/hyph-utf8/Makefile"
-               (("all: .*") "all: $(RUNFILES)\n"))
-
-             ;; Find required fonts for building tex.fmt
-             (setenv "TFMFONTS"
-                     (string-append (assoc-ref inputs "texlive-cm")
-                                    "/share/texmf-dist/fonts/tfm/public/cm:"
-                                    (assoc-ref inputs "texlive-knuth-lib")
-                                    "/share/texmf-dist/fonts/tfm/public/knuth-lib"))
-             ;; ...and find all tex files in this environment.
-             (setenv "TEXINPUTS"
-                     (string-append
-                      (getcwd) ":"
-                      (string-join
-                       (map (match-lambda ((_ . dir) dir)) inputs)
-                       "//:")))
-
-             ;; Generate tex.fmt.
-             (let ((where "source/luatex/hyph-utf8"))
-               (mkdir-p where)
-               (with-directory-excursion where
-                 (invoke "tex" "-ini"
-                         (string-append (assoc-ref inputs "texlive-plain")
-                                        "/share/texmf-dist/tex/plain/config/tex.ini"))))))
-         (add-before 'build 'build-loaders-and-converters
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((root (string-append (assoc-ref outputs "out")
-                                         "/share/texmf-dist"))
-                    (conv
-                     (string-append root
-                                    "/tex/generic/hyph-utf8/conversions")))
-
-               ;; Build converters
-               (mkdir-p conv)
-               (with-directory-excursion "source/generic/hyph-utf8"
-                 (substitute* "generate-converters.rb"
-                   (("\\$path_root=File.*")
-                    (string-append "$path_root=\"" root "\"\n"))
-                   ;; Avoid error with newer Ruby.
-                   (("#1\\{%") "#1{%%"))
-                 (invoke "ruby" "generate-converters.rb"))
-               #t)))
-         (replace 'install
-           (lambda* (#:key source outputs #:allow-other-keys)
-             (let ((doc (assoc-ref outputs "doc"))
-                   (out (assoc-ref outputs "out")))
-               (mkdir-p doc)
-               (copy-recursively
-                (string-append source "/doc")
-                (string-append doc "/doc"))
-               (install-file
-                (string-append source "/tex/luatex/hyph-utf8/etex.src")
-                (string-append out "/share/texmf-dist/tex/luatex/hyph-utf8/")))
-             #t)))))
+      #:make-flags
+      #~(list "-C" "source/luatex/hyph-utf8/"
+              (string-append "DO_TEX = tex --interaction=nonstopmode '&tex' $<")
+              (string-append "RUNDIR =" (assoc-ref %outputs "out") "/share/texmf-dist/tex/luatex/hyph-utf8/")
+              (string-append "DOCDIR =" (assoc-ref %outputs "doc") "/share/texmf-dist/doc/luatex/hyph-utf8/")
+              ;; hyphen.cfg is neither included nor generated, so let's only build the lua file.
+              (string-append "UNPACKED = $(NAME).lua"))
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; TeX isn't usable at this point, so we first need to generate the
+          ;; tex.fmt.
+          (replace 'configure
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              ;; Target directories must exist.
+              (mkdir-p (string-append (assoc-ref %outputs "out")
+                                      "/share/texmf-dist/tex/luatex/hyph-utf8/"))
+              (mkdir-p (string-append (assoc-ref %outputs "doc")
+                                      "/share/texmf-dist/doc/luatex/hyph-utf8/"))
+
+              ;; We cannot build the documentation because that requires a
+              ;; fully functional pdflatex, which depends on this package.
+              (substitute* "source/luatex/hyph-utf8/Makefile"
+                (("all: .*") "all: $(RUNFILES)\n"))
+
+              ;; Find required fonts for building tex.fmt
+              (setenv "TFMFONTS"
+                      (string-append (assoc-ref inputs "texlive-cm")
+                                     "/share/texmf-dist/fonts/tfm/public/cm:"
+                                     (assoc-ref inputs "texlive-knuth-lib")
+                                     "/share/texmf-dist/fonts/tfm/public/knuth-lib"))
+              ;; ...and find all tex files in this environment.
+              (setenv "TEXINPUTS"
+                      (string-append
+                       (getcwd) ":"
+                       (string-join
+                        (map (match-lambda ((_ . dir) dir)) inputs)
+                        "//:")))
+
+              ;; Generate tex.fmt.
+              (let ((where "source/luatex/hyph-utf8"))
+                (mkdir-p where)
+                (with-directory-excursion where
+                  (invoke "tex" "-ini"
+                          (string-append (assoc-ref inputs "texlive-plain")
+                                         "/share/texmf-dist/tex/plain/config/tex.ini"))))))
+          (add-before 'build 'build-loaders-and-converters
+            (lambda _
+              (let* ((root (string-append #$output "/share/texmf-dist"))
+                     (conv
+                      (string-append root "/tex/generic/hyph-utf8/conversions")))
+
+                ;; Build converters
+                (mkdir-p conv)
+                (with-directory-excursion "source/generic/hyph-utf8"
+                  (substitute* "generate-converters.rb"
+                    (("\\$path_root=File.*")
+                     (string-append "$path_root=\"" root "\"\n"))
+                    ;; Avoid error with newer Ruby.
+                    (("#1\\{%") "#1{%%"))
+                  (invoke "ruby" "generate-converters.rb")))))
+          (replace 'install
+            (lambda* (#:key source #:allow-other-keys)
+              (mkdir-p #$output:doc)
+              (copy-recursively
+               (string-append source "/doc")
+               (string-append #$output:doc "/doc"))
+              (install-file
+               (string-append source "/tex/luatex/hyph-utf8/etex.src")
+               (string-append #$output "/share/texmf-dist/tex/luatex/hyph-utf8/")))))))
     (native-inputs
      (list ruby-2.7
            texlive-bin
            ;; The following packages are needed for build "tex.fmt", which we
            ;; need for a working "tex".
            texlive-cm
+           texlive-docstrip
            texlive-knuth-lib
            texlive-hyphen-base
            texlive-plain))
-- 
cgit 1.4.1


From a161e8057b9f0d35f2302dbb0d3026877f46d636 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 13:37:47 +0200
Subject: gnu: texlive-amsmath: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-amsmath): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[description]: Fix typos.
---
 gnu/packages/tex.scm | 56 +++++++++++++++++++++++-----------------------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0f0399e868..300f525407 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4727,39 +4727,33 @@ loading fonts by their proper names instead of file names.")
 (define-deprecated-package texlive-luatex-luaotfload texlive-luaotfload)
 
 (define-public texlive-amsmath
-  (let ((template (simple-texlive-package
-                   "texlive-amsmath"
-                   (list "/doc/latex/amsmath/"
-                         "/source/latex/amsmath/"
-                         ;; These two files are not generated from any of the
-                         ;; dtx/ins files.
-                         "/tex/latex/amsmath/amsmath-2018-12-01.sty"
-                         "/tex/latex/amsmath/amstex.sty")
-                   (base32
-                    "0gmdzhgr0h57xhsl61c5jsp4fj4pbmdr8p6k96am5jbyrbbx121q"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "latex/amsmath")))
-      (propagated-inputs
-       (list texlive-amsfonts))
-      (home-page "https://www.ctan.org/pkg/amsmath")
-      (synopsis "AMS mathematical facilities for LaTeX")
-      (description
-       "This is the principal package in the AMS-LaTeX distribution.  It adapts
+  (package
+    (name "texlive-amsmath")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/amsmath/" "source/latex/amsmath/"
+                   "tex/latex/amsmath/")
+             (base32
+              "0kqrgc1kbrgkw9kflazi5imdj8r2fbj2q44x6may362a6izzk2jq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-amsfonts))
+    (home-page "https://www.ctan.org/pkg/amsmath")
+    (synopsis "AMS mathematical facilities for LaTeX")
+    (description
+     "This is the principal package in the AMS-LaTeX distribution.  It adapts
 for use in LaTeX most of the mathematical features found in AMS-TeX; it is
 highly recommended as an adjunct to serious mathematical typesetting in LaTeX.
-When amsmath is loaded, AMS-LaTeX packages @code{amsbsyamsbsy} (for bold
-symbols), @code{amsopnamsopn} (for operator names) and
-@code{amstextamstext} (for text embedded in mathematics) are also loaded.
-This package is part of the LaTeX required distribution; however, several
-contributed packages add still further to its appeal; examples are
-@code{empheqempheq}, which provides functions for decorating and highlighting
-mathematics, and @code{ntheoremntheorem}, for specifying theorem (and similar)
-definitions.")
-      (license license:lppl1.3c+))))
+When amsmath is loaded, AMS-LaTeX packages @code{amsbsy} (for bold symbols),
+@code{amsopn} (for operator names) and @code{amstext} (for text embedded in
+mathematics) are also loaded.  This package is part of the LaTeX required
+distribution; however, several contributed packages add still further to its
+appeal; examples are @code{empheq}, which provides functions for decorating
+and highlighting mathematics, and @code{ntheorem}, for specifying theorem (and
+similar) definitions.")
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-latex-amsmath texlive-amsmath)
 
-- 
cgit 1.4.1


From 903f6db73b0cb4368fc20a81b39b8d9e6c110cbf Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 13:41:14 +0200
Subject: gnu: texlive-amscls: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-amscls): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-AMSFONTS, TEXLIVE-AMSMATH, TEXLIVE-URL.
[description]: Fix typos.
---
 gnu/packages/tex.scm | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 300f525407..ba50ccd40d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4820,28 +4820,29 @@ commands.  The commands may also be used in plain TeX.")
     (license license:lppl)))
 
 (define-public texlive-amscls
-  (let ((template (simple-texlive-package
-                   "texlive-amscls"
-                   (list "/doc/latex/amscls/"
-                         "/source/latex/amscls/"
-                         "/bibtex/bst/amscls/")
-                   (base32
-                    "0vw0b815slvfqfd8qffyfzb3xfvyv6k77m12xp0l67hs8p08s5b7"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "latex/amscls")))
-      (home-page "https://www.ctan.org/pkg/amscls")
-      (synopsis "AMS document classes for LaTeX")
-      (description
-       "This bundle contains three AMS classes: @code{amsartamsart} (for writing
-articles for the AMS), @code{amsbookamsbook} (for books) and
-@code{amsprocamsproc} (for proceedings), together with some supporting
-material.  The material is made available as part of the AMS-LaTeX
-distribution.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-amscls")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/amscls/" "doc/latex/amscls/"
+                   "source/latex/amscls/" "tex/latex/amscls/")
+             (base32
+              "1chy1rqwici66p9brphb3gsprmcyhia9cvm5fn9wb5a9cchxqa08")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-amsfonts
+           texlive-amsmath
+           texlive-url))
+    (home-page "https://www.ctan.org/pkg/amscls")
+    (synopsis "AMS document classes for LaTeX")
+    (description
+     "This bundle contains three AMS classes: @code{amsart} (for writing
+articles for the AMS), @code{amsbook} (for books) and @code{amsproc} (for
+proceedings), together with some supporting material.  The material is made
+available as part of the AMS-LaTeX distribution.")
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-latex-amscls texlive-amscls)
 
-- 
cgit 1.4.1


From 936693c1fff5f581ead26899e4dd4d1f09b8629a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 13:45:41 +0200
Subject: gnu: texlive-catchfile: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-catchfile!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-ETEXCMDS, TEXLIVE-INFWARERR,
TEXLIVE-LTXCMDS.
---
 gnu/packages/tex.scm | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ba50ccd40d..7cfebfbd5b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6350,24 +6350,26 @@ for physicists.")
     (license license:lppl)))
 
 (define-public texlive-catchfile
-  (let ((template (simple-texlive-package
-                   "texlive-catchfile"
-                   (list "/doc/latex/catchfile/"
-                         "/source/latex/catchfile/"
-                         "/tex/generic/catchfile/")
-                   (base32
-                    "1dpxy64hs0bjp8d2dmikflc995vazf7fi6z92w51fnj2fidgl8gx"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "latex/catchfile")))
-      (home-page "https://ctan.org/macros/latex/contrib/catchfile")
-      (synopsis "Catch an external file into a macro")
-      (description
-       "Catchfile catches the contents of a file and puts it in a macro.")
-      (license license:lppl1.3+))))
+  (package
+    (name "texlive-catchfile")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/catchfile/" "source/latex/catchfile/"
+                   "tex/generic/catchfile/")
+             (base32
+              "1dpxy64hs0bjp8d2dmikflc995vazf7fi6z92w51fnj2fidgl8gx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etexcmds
+           texlive-infwarerr
+           texlive-ltxcmds))
+    (home-page "https://ctan.org/macros/latex/contrib/catchfile")
+    (synopsis "Catch an external file into a macro")
+    (description
+     "Catchfile catches the contents of a file and puts it in a macro.")
+    (license license:lppl1.3+)))
 
 (define-public texlive-ddphonism
   (package
-- 
cgit 1.4.1


From c448952f0af32aa40b4f6e555bff609beb929271 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 13:49:23 +0200
Subject: gnu: texlive-tabu: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-tabu!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-TOOLS.
[description]: Shorten it and use proper Texinfo syntax.
---
 gnu/packages/tex.scm | 50 +++++++++++++++++++++-----------------------------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7cfebfbd5b..d4cb32d63e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10974,35 +10974,27 @@ the engine in use.")
 (define-deprecated-package texlive-generic-ifxetex texlive-iftex)
 
 (define-public texlive-tabu
-  (let ((template
-         (simple-texlive-package
-          "texlive-tabu"
-          (list "doc/latex/tabu/"
-                "source/latex/tabu/"
-                "tex/latex/tabu/")
-          (base32 "0mixyrqavipq4ni38z42x3579cdjbz54cp2qqb4q4yhfbl0a4pka"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/tabu")
-         ((#:build-targets _ '())
-          '(list "tabu.dtx"))))
-      (propagated-inputs (list texlive-varwidth))
-      (home-page "https://ctan.org/macros/latex/contrib/tabu")
-      (synopsis "Flexible LaTeX tabulars")
-      (description
-       "The package provides an environment, tabu, which will make any sort of
-tabular, and an environment longtabu which provides the facilities of tabu in
-a modified longtable environment.  The package requires array, xcolor for
-coloured rules in tables, and colortbl for coloured cells.  The longtabu
-environment further requires that longtable be loaded.  The package itself
-does not load any of these packages for the user.  The tabu environment may be
-used in place of @code{tabular}, @code{tabular*} and @code{tabularx}
-environments, as well as the @code{array} environment in maths mode.")
-      (license license:lppl1.3+))))
+  (package
+    (name "texlive-tabu")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tabu/"
+                   "source/latex/tabu/"
+                   "tex/latex/tabu/")
+             (base32 "0mixyrqavipq4ni38z42x3579cdjbz54cp2qqb4q4yhfbl0a4pka")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-tools
+           texlive-varwidth))
+    (home-page "https://ctan.org/macros/latex/contrib/tabu")
+    (synopsis "Flexible LaTeX tabulars")
+    (description
+     "The package provides an environment, @code{tabu}, which will make any
+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-xkeyval
   (package
-- 
cgit 1.4.1


From 99ee7d5340a691b0843d68c454c913a11f96f575 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 13:54:12 +0200
Subject: gnu: texlive-sectsty: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-sectsty!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d4cb32d63e..c26f972412 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11904,27 +11904,25 @@ Helvetica and Courier) in LaTeX using LY1 encoding.")
     (license license:lppl1.0+)))
 
 (define-public texlive-sectsty
-  (let ((template (simple-texlive-package
-                   "texlive-sectsty"
-                   (list "/doc/latex/sectsty/"
-                         "/source/latex/sectsty/")
-                   (base32
-                    "08m90j7cg6w46vnwgsp10clpj4l6c9a6l8dad20q3mnd32l84hbl"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/sectsty")
-         ((#:build-targets _ '())
-          ''("sectsty.ins"))
-         ((#:tex-format _ "latex") "latex")))
-      (home-page "https://www.ctan.org/pkg/sectsty")
-      (synopsis "Control sectional headers")
-      (description "This is a LaTeX2ε package to help change the style of any or
-all of LaTeX's sectional headers in the article, book, or report classes.
-Examples include the addition of rules above or below a section title.")
-      (license license:lppl1.2+))))
+  (package
+    (name "texlive-sectsty")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sectsty/" "source/latex/sectsty/"
+                   "tex/latex/sectsty/")
+             (base32
+              "1h7zi622s84vqjl6bi4g6iv639jz9m2imz4g7y1qpc0zdw1mlqv4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (home-page "https://www.ctan.org/pkg/sectsty")
+    (synopsis "Control sectional headers")
+    (description
+     "This is a LaTeX2ε package to help change the style of any or all of
+LaTeX's sectional headers in the article, book, or report classes.  Examples
+include the addition of rules above or below a section title.")
+    (license license:lppl1.2+)))
 
 (define-public texlive-morefloats
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From f95f4d7a87ee45d268b24b1ca94eab03ecac3eb6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 13:55:23 +0200
Subject: gnu: texlive-morefloats: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-morefloats!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-IFTEX, TEXLIVE-KVOPTIONS.
---
 gnu/packages/tex.scm | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c26f972412..e550ef5fc4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11925,30 +11925,31 @@ include the addition of rules above or below a section title.")
     (license license:lppl1.2+)))
 
 (define-public texlive-morefloats
-  (let ((template (simple-texlive-package
-                   "texlive-morefloats"
-                   (list "/doc/latex/morefloats/"
-                         "/source/latex/morefloats/")
-                   (base32
-                    "0n0405fjxyjlbjspzfvhl0wjkwiqicj3hk8fa0g7agw72wlxscpl"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/morefloats")
-         ((#:build-targets _ '())
-          ''("morefloats.ins"))))
-      (home-page "https://www.ctan.org/pkg/morefloats")
-      (synopsis "Increase the number of simultaneous LaTeX floats")
-      (description "LaTeX can, by default, only cope with 18 outstanding floats;
+  (package
+    (name "texlive-morefloats")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/morefloats/"
+                   "source/latex/morefloats/"
+                   "tex/latex/morefloats/")
+             (base32
+              "0y8rd3ys71ys9cab172wwhrmbs9b52wqrj6d3p0iy3075z93h51c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-iftex
+           texlive-kvoptions))
+    (home-page "https://ctan.org/pkg/morefloats")
+    (synopsis "Increase the number of simultaneous LaTeX floats")
+    (description "LaTeX can, by default, only cope with 18 outstanding floats;
 any more, and you get the error “too many unprocessed floats”.  This package
 releases the limit; TeX itself imposes limits (which are independent of the
 help offered by e-TeX).
 
 However, if your floats can’t be placed anywhere, extending the number of
 floats merely delays the arrival of the inevitable error message.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-public texlive-ifmtarg
   (package
-- 
cgit 1.4.1


From cf937f92313b141c8d6e8c0646e9f0928744bc93 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 13:57:58 +0200
Subject: gnu: texlive-pagenote: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-pagenote!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e550ef5fc4..e7d9af1b34 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11975,27 +11975,25 @@ whether an argument is empty.")
     (license license:lppl1.3c+)))
 
 (define-public texlive-pagenote
-  (let ((template (simple-texlive-package
-                   "texlive-pagenote"
-                   (list "/doc/latex/pagenote/"
-                         "/source/latex/pagenote/")
-                   (base32
-                    "0cqfqrfvnzq7ldaf255hcvi8xsfx8h7iha3hs8p9gdi3cfzbcmjm"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/pagenote")
-         ((#:build-targets _ '())
-          ''("pagenote.ins"))))
-      (propagated-inputs
-       (list texlive-ifmtarg))
-      (home-page "https://www.ctan.org/pkg/pagenote")
-      (synopsis "Notes at end of document")
-      (description "The pagenote package provides tagged notes on a separate
-page (also known as ‘end notes’).")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-pagenote")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pagenote/" "source/latex/pagenote/"
+                   "tex/latex/pagenote/")
+             (base32
+              "1dffh7ac13w3gs94lvfxgw1i4k6cfkrpcyikj1sfrqaivrxpmqpi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-ifmtarg))
+    (home-page "https://ctan.org/pkg/pagenote")
+    (synopsis "Notes at end of document")
+    (description
+     "The @code{pagenote} package provides tagged notes on a separate
+page (also known as end notes).")
+    (license license:lppl1.3c+)))
 
 (define-public texlive-titling
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From c2764fc7e255c17671d8b540c20a3f73f50bf312 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 13:59:40 +0200
Subject: gnu: texlive-titling: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-titling!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[synopsis, description]: Add proper Texinfo markup.
---
 gnu/packages/tex.scm | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e7d9af1b34..541be156ae 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11996,32 +11996,28 @@ page (also known as end notes).")
     (license license:lppl1.3c+)))
 
 (define-public texlive-titling
-  (let ((template (simple-texlive-package
-                   "texlive-titling"
-                   (list "/doc/latex/titling/"
-                         "/source/latex/titling/")
-                   (base32
-                    "0pc3806kc9p2dizdghis0p0b00xs0gmlh2nmf94f5wasz5mkw6bk"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "latex/titling")
-         ((#:build-targets _ '())
-          ''("titling.ins"))
-         ((#:tex-format _ "latex") "latex")))
-      (native-inputs
-       (list texlive-cm))
-      (home-page "https://www.ctan.org/pkg/titling")
-      (synopsis "Control typesetting of the \\maketitle command")
-      (description "The @code{titling} package provides control over the
-typesetting of the @code{\\maketitle} command and @code{\\thanks} commands,
-and makes the \title, @code{\\author} and @code{\\date} information
-permanently available.  Multiple titles are allowed in a single document.  New
-titling elements can be added and a @code{titlepage} title can be centered on
+  (package
+    (name "texlive-titling")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/titling/" "source/latex/titling/"
+                   "tex/latex/titling/")
+             (base32
+              "1wp5r6wwrz1nx3wrmc0hxjfapqppcb126l4wmmzh14sfb1py7mz4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (home-page "https://ctan.org/pkg/titling")
+    (synopsis "Control typesetting of the @code{\\maketitle} command")
+    (description
+     "The @code{titling} package provides control over the typesetting of the
+@code{\\maketitle} command and @code{\\thanks} commands, and makes the
+@code{\\title}, @code{\\author} and @code{\\date} information permanently
+available.  Multiple titles are allowed in a single document.  New titling
+elements can be added and a @code{titlepage} title can be centered on
 a physical page.")
-      (license license:lppl))))
+    (license license:lppl)))
 
 (define-public texlive-ifoddpage
   (package
-- 
cgit 1.4.1


From 7a6e4797497abedf34217717584a1c61580126f0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:01:23 +0200
Subject: gnu: texlive-grfext: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-grfext!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-INFWARERR, TEXLIVE-KVDEFINEKEYS.
[home-page]: Use CTAN URL.
[synopsis]: Add proper Texinfo markup.
---
 gnu/packages/tex.scm | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 541be156ae..dd05a2d8f8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12102,27 +12102,26 @@ The macros were designed for use within other macros.")
     (license license:lppl1.3)))
 
 (define-public texlive-grfext
-  (let ((template (simple-texlive-package
-                   "texlive-grfext"
-                   (list "doc/latex/grfext/"
-                         "source/latex/grfext/"
-                         "tex/latex/grfext/")
-                   (base32
-                    "1x35r10mkjg8dzx7aj99y4dwyf69jgs41qwapdx523lbglywmgxp"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "latex/grfext")
-         ((#:build-targets _ #t)
-          #~(list "grfext.dtx"))))
-      (home-page "https://github.com/ho-tex/grfext")
-      (synopsis "Manipulate the graphics package's list of extensions")
-      (description "This package provides macros for adding to, and reordering
-the list of graphics file extensions recognised by package graphics.")
-      (license license:lppl1.3c+))))
+  (package
+    (name "texlive-grfext")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/grfext/" "source/latex/grfext/"
+                   "tex/latex/grfext/")
+             (base32
+              "1x35r10mkjg8dzx7aj99y4dwyf69jgs41qwapdx523lbglywmgxp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-infwarerr
+           texlive-kvdefinekeys))
+    (home-page "https://ctan.org/pkg/grfext")
+    (synopsis "Manipulate the @code{graphics} package's list of extensions")
+    (description
+     "This package provides macros for adding to, and reordering the list of
+graphics file extensions recognised by package @code{graphics}.")
+    (license license:lppl1.3c+)))
 
 (define-public texlive-adjustbox
   (package
-- 
cgit 1.4.1


From 65eb3ff97d708a40d65f6d07ce020c5912daf591 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:04:09 +0200
Subject: gnu: texlive-qrcode: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-qrcode!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[native-inputs]: Remove them.
[description]: Shorten it.
---
 gnu/packages/tex.scm | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dd05a2d8f8..5840646701 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12162,33 +12162,25 @@ provided box macros are @code{\\lapbox}, @code{\\marginbox},
 
 (define-public texlive-qrcode
   (package
-    (inherit (simple-texlive-package
-              "texlive-qrcode"
-              (list "doc/latex/qrcode/README"
-                    "source/latex/qrcode/qrcode.dtx"
-                    "source/latex/qrcode/qrcode.ins")
-              (base32
-               "1xfv0imrrbxjqwjapcf2silg19rwz2jinawy1x65c1krg919vn02")))
+    (name "texlive-qrcode")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/qrcode/" "source/latex/qrcode/"
+                   "tex/latex/qrcode/")
+             (base32
+              "197v18lsvb90i07gxvc6mrmn1z63q8v0wvcnbk8dnn3hhabpn16y")))
     (outputs '("out" "doc"))
-    (arguments
-     (list
-      #:tex-directory "latex/qrcode"))
+    (build-system texlive-build-system)
     (propagated-inputs
      (list texlive-lm
            texlive-xcolor
            texlive-xkeyval))
-    (native-inputs
-     (list (texlive-updmap.cfg (list texlive-lm texlive-zapfding))
-           texlive-hyperref
-           texlive-stringenc
-           texlive-xcolor
-           texlive-xkeyval))
-    (home-page "https://www.ctan.org/pkg/qrcode")
+    (home-page "https://ctan.org/pkg/qrcode")
     (synopsis "QR codes without external tools")
-    (description "This package creates @acronym{QR,Quick Response} codes for
-LaTeX documents without depending on external graphics packages.  It supports
-generating codes of different sizes and with different error correction
-levels.  All functionality is provided by the single @code{\\qrcode} command.")
+    (description
+     "The package generates QR (Quick Response) codes in LaTeX, without the
+need for PSTricks or any other graphical package.")
     (license license:lppl1.3c+)))
 
 (define-public texlive-tcolorbox
-- 
cgit 1.4.1


From b45b6210d489b2c77569d2151ba6c7274f887d8d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:11:30 +0200
Subject: gnu: texlive-unicode-math: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-unicode-math!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-AMSMATH, TEXLIVE-FONTSPEC, TEXLIVE-L3KERNEL,
TEXLIVE-L3PACKAGES, TEXLIVE-LM-MATH, TEXLIVE-LUALATEX-MATH.
[description]: Add commas at the end of items for an improved typographic core.
---
 gnu/packages/tex.scm | 72 ++++++++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 39 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5840646701..870f1d8afb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12476,49 +12476,43 @@ conference posters.")
 
 (define-public texlive-unicode-math
   (package
-    (inherit (simple-texlive-package
-              "texlive-unicode-math"
-              (list "source/latex/unicode-math/"
-                    "doc/latex/unicode-math/"
-                    "tex/latex/unicode-math/unicode-math-table.tex")
-              (base32 "1j3041dcm7wqj0x26rxm9bb7q4xa1rqsqynqdb6cbjk3jmfvskxn")))
+    (name "texlive-unicode-math")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/unicode-math/"
+                   "source/latex/unicode-math/"
+                   "tex/latex/unicode-math/")
+             (base32
+              "0w5gp11ccc486lckzag63arg97g1r0zkf29bdnnk13pz4r5m2lgx")))
     (outputs '("out" "doc"))
-    (arguments
-     (list
-      #:tex-directory "latex/unicode-math"
-      #:tex-format "xelatex"
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'copy-files
-            ;; The documentation isn't built.
-            (lambda* (#:key outputs tex-directory #:allow-other-keys)
-              (let ((doc (assoc-ref outputs "doc"))
-                    (tex (string-append #$output "/share/texmf-dist/tex/"
-                                        tex-directory)))
-                ;; Install documentation.
-                (mkdir-p (string-append doc "/share/texmf-dist/doc" ))
-                (copy-recursively "doc" doc)
-                ;; Install unicode-math-table.tex, which is not
-                ;; built.
-                (install-file "tex/latex/unicode-math/unicode-math-table.tex"
-                              tex)))))))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "xelatex"))
+    (propagated-inputs
+     (list texlive-amsmath
+           texlive-fontspec
+           texlive-l3kernel
+           texlive-l3packages
+           texlive-lm-math
+           texlive-lualatex-math))
     (home-page "https://ctan.org/pkg/unicode-math")
     (synopsis "Unicode mathematics support for XeTeX and LuaTeX")
-    (description "This package will provide a complete implementation of
-Unicode maths for XeLaTeX and LuaLaTeX.  Unicode maths is currently supported
-by the following fonts:
+    (description
+     "This package will provide a complete implementation of unicode maths for
+XeLaTeX and LuaLaTeX.  Unicode maths is currently supported by the following
+fonts:
 @itemize
-@item Latin Modern Math
-@item TeX Gyre Bonum Math
-@item TeX Gyre Pagella Math
-@item TeX Gyre Schola Math
-@item TeX Gyre Termes Math
-@item DejaVu Math TeX Gyre
-@item Asana-Math
-@item STIX
-@item XITS Math
-@item Libertinus Math
-@item Fira Math
+@item Latin Modern Math,
+@item TeX Gyre Bonum Math,
+@item TeX Gyre Pagella Math,
+@item TeX Gyre Schola Math,
+@item TeX Gyre Termes Math,
+@item DejaVu Math TeX Gyre,
+@item Asana-Math fonts,
+@item STIX,
+@item XITS Math,
+@item Libertinus Math,
+@item Fira Math.
 @end itemize")
     (license license:lppl1.3c+)))
 
-- 
cgit 1.4.1


From a50776a40c2bc039d95250dfa2ebafddaace60ad Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:15:11 +0200
Subject: gnu: texlive-fvextra: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-fvextra!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-ETOOLBOX, TEXLIVE-FANCYVRB, TEXLIVE-LINENO,
TEXLIVE-UPQUOTE.
[description]: Shorten it.
---
 gnu/packages/tex.scm | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 870f1d8afb..be84cf0afe 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12719,26 +12719,25 @@ to be set left/right or alternating on even/odd pages.")
     (license license:lppl1.3+)))
 
 (define-public texlive-fvextra
-  (let ((template (simple-texlive-package
-                   "texlive-fvextra"
-                   (list "/doc/latex/fvextra/"
-                         "/source/latex/fvextra/"
-                         "/tex/latex/fvextra/")
-                   (base32
-                    "0nawx1fh55yhqspy5jgss2qmwpqmikfrg7628smk931rph9nq0aa"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "latex/fvextra")))
-      (home-page "https://ctan.org/macros/latex/contrib/fvextra")
-      (synopsis "Extensions and patches for fancyvrb")
-      (description
-       "This package provides several extensions to fancyvrb, including
-automatic line breaking and improved math mode.  It also patches some fancyvrb
-internals.")
-      (license license:lppl1.3+))))
+  (package
+    (name "texlive-fvextra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fvextra/" "source/latex/fvextra/"
+                   "tex/latex/fvextra/")
+             (base32
+              "0nawx1fh55yhqspy5jgss2qmwpqmikfrg7628smk931rph9nq0aa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etoolbox texlive-fancyvrb texlive-lineno texlive-upquote))
+    (home-page "https://ctan.org/pkg/fvextra")
+    (synopsis "Extensions and patches for @code{fancyvrb}")
+    (description
+     "This package provides several extensions to fancyvrb, including
+automatic line breaking and improved math mode.")
+    (license license:lppl1.3+)))
 
 (define-public bibtool
   (package
-- 
cgit 1.4.1


From 0af0e39d14942d6bc1040e68ec1f2c3bd1052dfa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:16:58 +0200
Subject: gnu: texlive-babel-czech: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-babel-czech!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index be84cf0afe..ad1106f995 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12954,26 +12954,25 @@ the @code{fnlineno} package.")
     (license license:lppl1.3a+)))
 
 (define-public texlive-babel-czech
-  (let ((template (simple-texlive-package
-                   "texlive-babel-czech"
-                   (list "/source/generic/babel-czech/")
-                   (base32
-                    "1274pzgdya7gkvxjmdm3v5rb7hc0sj6mqn9pd8y9418yx5449spg"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/babel-czech")
-         ((#:build-targets _ '())
-          ''("czech.ins"))))
-      (home-page "https://www.ctan.org/pkg/babel-czech")
-      (synopsis "Babel support for Czech")
-      (description
-       "This package provides the language definition file for support of
-Czech in @code{babel}.  Some shortcuts are defined, as well as translations to
-Czech of standard ``LaTeX names''.")
-      (license license:lppl1.3+))))
+  (package
+    (name "texlive-babel-czech")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-czech/"
+                   "source/generic/babel-czech/"
+                   "tex/generic/babel-czech/")
+             (base32
+              "036817g9dv7m0m1576igwv4mjk8b41klkih44zzwjigdgdjpwbn9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-czech")
+    (synopsis "Babel support for Czech")
+    (description
+     "This package provides the language definition file for support of Czech
+in @code{babel}.  Some shortcuts are defined, as well as translations to Czech
+of standard LaTeX names.")
+    (license license:lppl1.3+)))
 
 (define-public texlive-babel-dutch
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From 02a7779645f58492b0c7953463a58403162b97df Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:17:37 +0200
Subject: gnu: texlive-babel-dutch: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-babel-dutch!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ad1106f995..632c466a01 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12975,26 +12975,25 @@ of standard LaTeX names.")
     (license license:lppl1.3+)))
 
 (define-public texlive-babel-dutch
-  (let ((template (simple-texlive-package
-                   "texlive-babel-dutch"
-                   (list "/source/generic/babel-dutch/")
-                   (base32
-                    "1a40rz6rznawgarnhk0wh751sln2x9js4420i0758y2clf4rlhg9"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/babel-dutch")
-         ((#:build-targets _ '())
-          ''("dutch.ins"))))
-      (home-page "https://www.ctan.org/pkg/babel-dutch")
-      (synopsis "Babel support for Dutch")
-      (description
-       "This package provides the language definition file for support of Dutch
+  (package
+    (name "texlive-babel-dutch")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-dutch/"
+                   "source/generic/babel-dutch/"
+                   "tex/generic/babel-dutch/")
+             (base32
+              "1s72g2hfnk5nqnrsbiwydh7jb9wy9186h5vy7rh3ngjwkmcfg0pz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-dutch")
+    (synopsis "Babel contributed support for Dutch")
+    (description
+     "This package provides the language definition file for support of Dutch
 in @code{babel}.  It provides all the necessary macros, definitions and
 settings to typeset Dutch documents.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-public texlive-babel-finnish
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From 43dd4f64551c5b0ac23dcd9d931202a4cff34b9b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:18:30 +0200
Subject: gnu: texlive-babel-finnish: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-babel-finnish!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 632c466a01..a041ede361 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12996,26 +12996,25 @@ settings to typeset Dutch documents.")
     (license license:lppl1.3c+)))
 
 (define-public texlive-babel-finnish
-  (let ((template (simple-texlive-package
-                   "texlive-babel-finnish"
-                   (list "/source/generic/babel-finnish/")
-                   (base32
-                    "1930zxk4l6k5q4wcbvpvijv4s0gxp2mkxvblczn4gcbar10vfd4x"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/babel-finnish")
-         ((#:build-targets _ '())
-          ''("finnish.ins"))))
-      (home-page "https://www.ctan.org/pkg/babel-finnish")
-      (synopsis "Babel support for Finnish")
-      (description
-       "This package provides the language definition file for support of
+  (package
+    (name "texlive-babel-finnish")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-finnish/"
+                   "source/generic/babel-finnish/"
+                   "tex/generic/babel-finnish/")
+             (base32
+              "1zwrbcqjwhy31mks31vlc4kxci67d5cfm53jaikaabkd8q6grq6i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-finnish")
+    (synopsis "Babel support for Finnish")
+    (description
+     "This package provides the language definition file for support of
 Finnish in @code{babel}.  It provides all the necessary macros, definitions and
 settings to typeset Finnish documents.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-public texlive-babel-norsk
   (package
-- 
cgit 1.4.1


From 87142f0a9bd130ea683611b03a8c686e40bb6964 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:19:26 +0200
Subject: gnu: texlive-babel-danish: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-babel-danish!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a041ede361..2718c71b9f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13040,26 +13040,25 @@ Norsk of standard LaTeX names.")
 (define-deprecated-package texlive-generic-babel-norsk texlive-babel-norsk)
 
 (define-public texlive-babel-danish
-  (let ((template (simple-texlive-package
-                   "texlive-babel-danish"
-                   (list "/source/generic/babel-danish/")
-                   (base32
-                    "00dryb078fqckqjnxa2riq478j6d5i28j5cclv4bw7dn5naa3lz7"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/babel-danish")
-         ((#:build-targets _ '())
-          ''("danish.ins"))))
-      (home-page "https://www.ctan.org/pkg/babel-danish")
-      (synopsis "Babel support for Danish")
-      (description
+  (package
+    (name "texlive-babel-danish")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-danish/"
+                   "source/generic/babel-danish/"
+                   "tex/generic/babel-danish/")
+             (base32
+              "11fhmj850gahjm3l3rg5pg4l8j9x6mma59vgfpmnd4fkxj5acb0r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-danish")
+    (synopsis "Babel contributed support for Danish")
+    (description
        "This package provides the language definition file for support of
 Danish in @code{babel}.  It provides all the necessary macros, definitions and
 settings to typeset Danish documents.")
-      (license license:lppl1.3c+))))
+      (license license:lppl1.3c+)))
 
 (define-public texlive-babel-polish
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From eb44c8892379c35947184fbe48275e0c3169828c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:20:20 +0200
Subject: gnu: texlive-babel-polish: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-babel-polish!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2718c71b9f..3914808692 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13061,26 +13061,25 @@ settings to typeset Danish documents.")
       (license license:lppl1.3c+)))
 
 (define-public texlive-babel-polish
-  (let ((template (simple-texlive-package
-                   "texlive-babel-polish"
-                   (list "/source/generic/babel-polish/")
-                   (base32
-                    "1jymxl98mwxmq0yq90mhrr7bq7c613rh1rnhl7l3bih36af55rwr"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ '())
-          "generic/babel-polish")
-         ((#:build-targets _ '())
-          ''("polish.ins"))))
-      (home-page "https://www.ctan.org/pkg/babel-polish")
-      (synopsis "Babel support for Polish")
-      (description
-       "This package provides the language definition file for support of
-Polish in @code{babel}.  Some shortcuts are defined, as well as translations to
-Polish of standard ``LaTeX names''.")
-      (license license:lppl1.3+))))
+  (package
+    (name "texlive-babel-polish")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-polish/"
+                   "source/generic/babel-polish/"
+                   "tex/generic/babel-polish/")
+             (base32
+              "0an9csjd4jhz6civdldsrmz7l76hw8zfcgxdp55mj8f1rchsjylx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-polish")
+    (synopsis "Babel support for Polish")
+    (description
+     "This package provides the language definition file for support of Polish
+in @code{babel}.  Some shortcuts are defined, as well as translations to
+Polish of standard LaTeX names.")
+    (license license:lppl1.3+)))
 
 (define-public texlive-mdframed
   (package
-- 
cgit 1.4.1


From c255b295b3018aac91e181960b06f3d2f7159a65 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:21:52 +0200
Subject: gnu: texlive-abstract: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-abstract!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[synopsis, description]: Use Texinfo markup.
---
 gnu/packages/tex.scm | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3914808692..e5fe9ec3e2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13426,27 +13426,24 @@ loading @code{everyshi-2001-05-15}.")
     (license license:lppl1.3c)))
 
 (define-public texlive-abstract
-  (let ((template (simple-texlive-package
-                   "texlive-abstract"
-                   '("doc/latex/abstract/"
-                     "source/latex/abstract/"
-                     "tex/latex/abstract/")
-                   (base32
-                    "1axm78qgrpml09pkh252g1hsjx9c2w7mbdrm9rdl4yqh5ppwq4y9"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #f)
-          "latex/abstract")
-         ((#:build-targets _ #t)
-          #~(list "abstract.ins"))))
-      (home-page "https://ctan.org/pkg/abstract")
-      (synopsis "Control the typesetting of the abstract environment")
-      (description "The abstract package gives you control over the typesetting
-of the abstract environment, and in particular provides for a one column
+  (package
+    (name "texlive-abstract")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/abstract/" "source/latex/abstract/"
+                   "tex/latex/abstract/")
+             (base32
+              "1axm78qgrpml09pkh252g1hsjx9c2w7mbdrm9rdl4yqh5ppwq4y9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/abstract")
+    (synopsis "Control the typesetting of the @code{abstract} environment")
+    (description
+     "The @code{abstract} package gives you control over the typesetting of
+the @code{abstract} environment, and in particular provides for a one column
 abstract in a two column paper.")
-      (license license:lppl))))
+    (license license:lppl)))
 
 (define-public texlive-breqn
   (let ((template (simple-texlive-package
-- 
cgit 1.4.1


From 9d806b6f8f1101dbf31aba3617a6e7b6378ae426 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:25:12 +0200
Subject: gnu: texlive-breqn: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-breqn!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-AMSFONTS, TEXLIVE-AMSMATH, TEXLIVE-GRAPHICS,
TEXLIVE-L3KERNEL, TEXLIVE-TOOLS.
[home-page]: Use CTAN URL.
[description]: Shorten it.
---
 gnu/packages/tex.scm | 52 +++++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e5fe9ec3e2..65a2bf62ba 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13446,31 +13446,33 @@ abstract in a two column paper.")
     (license license:lppl)))
 
 (define-public texlive-breqn
-  (let ((template (simple-texlive-package
-                   "texlive-breqn"
-                   '("/doc/latex/breqn/"
-                     "/source/latex/breqn/")
-                   (base32
-                    "186cypxiyf30fq6dxvvlbwn5yx7c8d4cd243wvvb3243n5l4rpl3"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #f)
-          "latex/breqn")
-         ((#:build-targets _ #t)
-          #~(list "breqnbundle.ins"))))
-      (home-page "https://wspr.io/breqn/")
-      (synopsis "Automatic line breaking of displayed equations")
-      (description "This package provides solutions to a number of common
-difficulties in writing displayed equations and getting high-quality output.
-The single most ambitious goal of the package is to support automatic
-linebreaking of displayed equations.  Such linebreaking cannot be done without
-substantial changes under the hood in the way formulae are processed; the code
-must be watched carefully, keeping an eye on possible glitches.  The bundle
-also contains the @code{flexisym} and @code{mathstyle} packages, which are
-both designated as support for @code{breqn}.")
-      (license license:lppl1.3+))))
+  (package
+    (name "texlive-breqn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/breqn/" "source/latex/breqn/"
+                   "tex/latex/breqn/")
+             (base32
+              "0w6jk97jmgwgshr9a3isbpwsh0fhrkzp36gywdiai1f5x2sldmpv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-amsfonts
+           texlive-amsmath
+           texlive-graphics
+           texlive-l3kernel
+           texlive-tools))
+    (home-page "https://ctan.org/pkg/breqn")
+    (synopsis "Automatic line breaking of displayed equations")
+    (description
+     "This package provides solutions to a number of common difficulties in
+writing displayed equations and getting high-quality output.  The single most
+ambitious goal of the package is to support automatic linebreaking of
+displayed equations.  The bundle also contains the @code{flexisym} and
+@code{mathstyle} packages, which are both designated as support for
+@code{breqn}.")
+    (license license:lppl1.3+)))
 
 (define-public texlive-breakurl
   (package
-- 
cgit 1.4.1


From a94bb92f07f322e8bccd0a6159b79dc60d54d517 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:29:15 +0200
Subject: gnu: texlive-datatool: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-datatool!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[propagated-inputs]: Add TEXLIVE-AMSMATH, TEXLIVE-ETOOLBOX, TEXLIVE-FP,
TEXLIVE-MFIRSTUC, TEXLIVE-PGF, TEXLIVE-SUBSTR, TEXLIVE-TOOLS, TEXLIVE-XFOR,
TEXLIVE-XKEYVAL.
---
 gnu/packages/tex.scm | 51 +++++++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 65a2bf62ba..14f60f8f45 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13517,29 +13517,36 @@ controlled comment versions.")
     (license license:gpl2+)))
 
 (define-public texlive-datatool
-  (let ((template (simple-texlive-package
-                   "texlive-datatool"
-                   '("/bibtex/bst/datatool/"
-                     "/doc/latex/datatool/"
-                     "/source/latex/datatool/")
-                   (base32
-                    "0hh2623zlwgq8zb2lv4d8yfaqwzrz54dqhc1xk0jd1k4fp281kl5"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #f)
-          "latex/datatool")
-         ((#:build-targets _ #t)
-          #~(list "datatool.ins"))))
-      (home-page "https://ctan.org/pkg/datatool")
-      (synopsis "Tools to load and manipulate data")
-      (description "This package provides tools to create databases using LaTeX
-commands or by importing external files.  Databases may be sorted, filtered,
-and visualized using several kinds of configurable plots.  Particular support
-is provided for mail merging, indexing, creating glossaries, manipulating
+  (package
+    (name "texlive-datatool")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/datatool/" "doc/latex/datatool/"
+                   "source/latex/datatool/" "tex/latex/datatool/")
+             (base32
+              "13v6g3i9pch63159ibpn1r8dwl6ip4hm4cv4z0jx6nn3x8kds5ks")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-amsmath
+           texlive-etoolbox
+           texlive-fp
+           texlive-mfirstuc
+           texlive-pgf
+           texlive-substr
+           texlive-tools
+           texlive-xfor
+           texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/datatool")
+    (synopsis "Tools to load and manipulate data")
+    (description
+     "This package provides tools to create databases using LaTeX commands
+or by importing external files.  Databases may be sorted, filtered, and
+visualized using several kinds of configurable plots.  Particular support is
+provided for mail merging, indexing, creating glossaries, manipulating
 bibliographies, and displaying personal pronouns.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
 
 (define-public texlive-physics
   (package
-- 
cgit 1.4.1


From bcabbce9ffaa441aeed05ba9bba816887b214a1f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:31:22 +0200
Subject: gnu: texlive-lastpage: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-lastpage!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 14f60f8f45..f0c224b224 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13695,28 +13695,25 @@ underscores), and hyphenation of text typeset in monospaced (e.g.,
 (define-deprecated-package texlive-latex-hyphenat texlive-hyphenat)
 
 (define-public texlive-lastpage
-  (let ((template  (simple-texlive-package
-                    "texlive-lastpage"
-                    (list "doc/latex/lastpage/"
-                          "source/latex/lastpage/"
-                          "tex/latex/lastpage/")
-                    (base32
-                     "1cmzl0jkid4w60bjlyxrc5bynbc3lwq5nr77rsip0q9hprxykxks"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t) "latex/lastpage")
-         ((#:build-targets _ '()) '(list "lastpage.ins"))))
-      (home-page "https://ctan.org/pkg/lastpage")
-      (synopsis "Reference last page for Page N of M type footers")
-      (description
-       "This package enables referencing the number of pages in a LaTeX
-document through the introduction of a new label which can be referenced like
+  (package
+    (name "texlive-lastpage")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lastpage/" "source/latex/lastpage/"
+                   "tex/latex/lastpage/")
+             (base32
+              "1cmzl0jkid4w60bjlyxrc5bynbc3lwq5nr77rsip0q9hprxykxks")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lastpage")
+    (synopsis "Reference last page for Page N of M type footers")
+    (description
+     "This package enables referencing the number of pages in a LaTeX document
+through the introduction of a new label which can be referenced like
 @code{\\pageref{LastPage}} to give a reference to the last page of a document.
 It is particularly useful in the page footer that says: @samp{Page N of M}.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
 
 (define-deprecated-package texlive-latex-lastpage texlive-lastpage)
 
-- 
cgit 1.4.1


From a15ff31ebdf8541596edf16f8b848eb6b8e91ab2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:32:43 +0200
Subject: gnu: texlive-soul: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-soul!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f0c224b224..693d7d6cdb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13744,30 +13744,27 @@ defined tab stop.")
 (define-deprecated-package texlive-latex-tabto-ltx texlive-tabto-ltx)
 
 (define-public texlive-soul
-  (let ((template (simple-texlive-package
-                   "texlive-soul"
-                   (list "doc/generic/soul/"
-                         "source/generic/soul/"
-                         "tex/generic/soul/")
-                   (base32
-                    "0ikipdswzsafi4rr6q9xh3hkxk2n2683ym1879qcax41xs6cizdl"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t) "generic/soul")
-         ((#:build-targets _ '()) '(list "soul.ins"))))
-      (home-page "http://www.ctan.org/pkg/soul")
-      (synopsis "Hyphenation for letterspacing, underlining, and more")
-      (description
-       "@code{soul} enables hyphenatable spacing out (letterspacing),
+  (package
+    (name "texlive-soul")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/soul/" "source/generic/soul/"
+                   "tex/generic/soul/")
+             (base32
+              "0ikipdswzsafi4rr6q9xh3hkxk2n2683ym1879qcax41xs6cizdl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/soul")
+    (synopsis "Hyphenation for letterspacing, underlining, and more")
+    (description
+     "The @code{soul} package enables hyphenatable spacing out (letterspacing),
 underlining, striking out, etc., using the TeX hyphenation algorithm to find
 the proper hyphens automatically.  The package also provides a mechanism that
 can be used to implement similar tasks, that have to treat text syllable by
 syllable.  The package itself does not support UTF-8 input in ordinary
 (PDF)LaTeX; some UTF-8 support is offered by package @code{soulutf8}.")
-      (license license:lppl))))
+    (license license:lppl)))
 
 (define-deprecated-package texlive-generic-soul texlive-soul)
 
-- 
cgit 1.4.1


From 5c5fd9e825290e38f759d1a466737482654b8ee6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:34:06 +0200
Subject: gnu: texlive-soulutf8: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-soulutf8!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 693d7d6cdb..ba99051a1b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13769,31 +13769,26 @@ syllable.  The package itself does not support UTF-8 input in ordinary
 (define-deprecated-package texlive-generic-soul texlive-soul)
 
 (define-public texlive-soulutf8
-  (let ((template (simple-texlive-package
-                   "texlive-soulutf8"
-                   (list "doc/latex/soulutf8/"
-                         "source/latex/soulutf8/"
-                         "tex/generic/soulutf8/")
-                   (base32
-                    "0d9lv3xsads8ms642ys3pghxnsa2hlzafkcx66d2hbq224bz1phc"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t) "generic/soulutf8")
-         ((#:build-targets _ '()) '(list "soulutf8.dtx"))))
-      (propagated-inputs
-       (list texlive-etexcmds
-             texlive-infwarerr
-             texlive-soul))
-      (home-page "https://ctan.org/pkg/soulutf8")
-      (synopsis "Permit use of UTF-8 characters in @code{soul}")
-      (description
-       "This package extends package @code{soul} and adds some support for
+  (package
+    (name "texlive-soulutf8")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/soulutf8/" "source/latex/soulutf8/"
+                   "tex/generic/soulutf8/")
+             (base32
+              "0d9lv3xsads8ms642ys3pghxnsa2hlzafkcx66d2hbq224bz1phc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etexcmds texlive-infwarerr texlive-soul))
+    (home-page "https://ctan.org/pkg/soulutf8")
+    (synopsis "Permit use of UTF-8 characters in @code{soul}")
+    (description
+     "This package extends package @code{soul} and adds some support for
 UTF-8.  Namely the input encodings in @file{utf8.def} from package
 @code{inputenc} and @file{utf8x.def} from package @code{ucs} are supported.")
-      (license license:lppl1.3+))))
+    (license license:lppl1.3+)))
 
 (define-public texlive-xstring
   (package
-- 
cgit 1.4.1


From 0110ef1c4efac93a1b8e2cffefdb39576f2907b2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:35:47 +0200
Subject: gnu: texlive-totcount: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-totcount!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
---
 gnu/packages/tex.scm | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ba99051a1b..1453a3bd07 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13835,31 +13835,26 @@ of occurrences of a substring.")
     (license license:lppl1.0+)))
 
 (define-public texlive-totcount
-  (let ((template (simple-texlive-package
-                   "texlive-totcount"
-                   (list "doc/latex/totcount/"
-                         "source/latex/totcount/"
-                         "tex/latex/totcount/")
-                   (base32
-                    "1rj9ncip5h2cbdljjqwxqsg14pb4mimzhz290q872n32w7rxkp28"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (build-system texlive-build-system)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t) "latex/totcount")
-         ((#:tex-format _ #t) "latex")
-         ((#:build-targets _ '()) '(list "totcount.ins"))))
-      (propagated-inputs
-       (list texlive-graphics))
-      (home-page "https://ctan.org/pkg/totcount")
-      (synopsis "Find the last value of a counter")
-      (description
-       "This package records the value that was last set, for any counter of
+  (package
+    (name "texlive-totcount")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/totcount/" "source/latex/totcount/"
+                   "tex/latex/totcount/")
+             (base32
+              "1rj9ncip5h2cbdljjqwxqsg14pb4mimzhz290q872n32w7rxkp28")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (propagated-inputs (list texlive-graphics))
+    (home-page "https://ctan.org/pkg/totcount")
+    (synopsis "Find the last value of a counter")
+    (description
+     "This package records the value that was last set, for any counter of
 interest.  Since most such counters are simply incremented when they are
 changed, the recorded value will usually be the maximum value.")
-      (license license:lppl1.3c+))))
+    (license license:lppl1.3c+)))
 
 (define-deprecated-package texlive-latex-totcount texlive-totcount)
 
-- 
cgit 1.4.1


From 28f384e85c93e16e8edaf4d8e0d96a287ae978f0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:37:23 +0200
Subject: gnu: texlive-totpages: Remove SIMPLE-TEXLIVE-PACKAGE call.

* gnu/packages/tex.scm (texlive-totpages!): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[native-inputs]: Remove them.
---
 gnu/packages/tex.scm | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1453a3bd07..6d7bd82e6e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13859,33 +13859,26 @@ changed, the recorded value will usually be the maximum value.")
 (define-deprecated-package texlive-latex-totcount texlive-totcount)
 
 (define-public texlive-totpages
-  (let ((template (simple-texlive-package
-                   "texlive-totpages"
-                   (list "doc/latex/totpages/"
-                         "source/latex/totpages/"
-                         "tex/latex/totpages/")
-                   (base32
-                    "1mmya2fqdskyavw3hvdiygfyp9cll7bl4lpi7pl2jf9s7ds49j5a"))))
-    (package
-      (inherit template)
-      (outputs '("out" "doc"))
-      (build-system texlive-build-system)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t) "latex/totpages")
-         ((#:tex-format _ #t) "latex")
-         ((#:build-targets _ '()) '(list "totpages.ins"))))
-      (native-inputs
-       (list (texlive-updmap.cfg)))
-      (propagated-inputs
-       (list texlive-everyshi texlive-graphics))
-      (home-page "https://ctan.org/pkg/totpages")
-      (synopsis "Count pages in a document, and report last page number")
-      (description
-       "The package counts the actual pages in the document (as opposed to
+  (package
+    (name "texlive-totpages")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/totpages/" "source/latex/totpages/"
+                   "tex/latex/totpages/")
+             (base32
+              "1mmya2fqdskyavw3hvdiygfyp9cll7bl4lpi7pl2jf9s7ds49j5a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (propagated-inputs (list texlive-everyshi texlive-graphics))
+    (home-page "https://ctan.org/pkg/totpages")
+    (synopsis "Count pages in a document, and report last page number")
+    (description
+     "The package counts the actual pages in the document (as opposed to
 reporting the number of the last page, as does @code{lastpage}).  The counter
 itself may be shipped out to the DVI file.")
-      (license license:lppl))))
+    (license license:lppl)))
 
 (define-public texlive-xetexconfig
   (package
-- 
cgit 1.4.1


From 10011abc44b6714911bd3d3bc5b675c55ae583da Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 18 May 2023 14:37:59 +0200
Subject: gnu: simple-texlive-package: Remove it.

* gnu/packages/tex.scm (simple-texlive-package): Remove variable.
---
 gnu/packages/tex.scm | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6d7bd82e6e..6ce5e372a4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -103,33 +103,6 @@
   #:use-module (ice-9 match)
   #:use-module ((srfi srfi-1) #:hide (zip)))
 
-(define* (simple-texlive-package name locations hash
-                                 #:key trivial?)
-  "Return a template for a simple TeX Live package with the given NAME,
-downloading from a list of LOCATIONS in the TeX Live repository, and expecting
-the provided output HASH.  The TRIVIAL? keyword is not used."
-  (set! locations
-        ;; Some locations may be manually inserted, so be tolerant with
-        ;; leading slashes.  Ignore them consistently.
-        (map (lambda (location)
-               (if (string-prefix? "/" location)
-                   (string-drop location 1)
-                   location))
-             locations))
-  (define with-documentation?
-    (any (lambda (l) (string-prefix? "doc/" l))
-         locations))
-  (package
-    (name name)
-    (version (number->string %texlive-revision))
-    (source (texlive-origin name version locations hash))
-    (outputs (if with-documentation? '("out" "doc") '("out")))
-    (build-system texlive-build-system)
-    (home-page #f)
-    (synopsis #f)
-    (description #f)
-    (license #f)))
-
 (define hyph-utf8-scripts
   (origin
     (method svn-fetch)
-- 
cgit 1.4.1


From c09a05d06cda29ee13047b5e2e969d778494b49b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 16:29:19 +0200
Subject: guix: texlive-build-system: Generate font metrics.

* guix/build/texlive-build-system.scm (install-as-runfiles):
(generate-font-metrics): New function.
(build): Use INSTALL-AS-RUNFILES.
(%standard-phases): Add new phase.
---
 doc/guix.texi                       |   3 +
 guix/build/texlive-build-system.scm | 138 +++++++++++++++++++++++++++---------
 2 files changed, 109 insertions(+), 32 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index a1b624ad6f..2e03e3802f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10007,6 +10007,9 @@ and format can be specified with the @code{#:tex-format} argument.
 Different build targets can be specified with the @code{#:build-targets}
 argument, which expects a list of file names.
 
+It also generates font metrics (i.e., @file{.tfm} files) out of METAFONT
+files whenever possible.
+
 The build system adds only @code{texlive-bin} and
 @code{texlive-latex-base} (both from @code{(gnu packages tex}) to the
 inputs.  Both can be overridden with the arguments @code{#:texlive-bin}
diff --git a/guix/build/texlive-build-system.scm b/guix/build/texlive-build-system.scm
index 9bc0ce31c1..4f3938213f 100644
--- a/guix/build/texlive-build-system.scm
+++ b/guix/build/texlive-build-system.scm
@@ -27,6 +27,7 @@
   #:use-module (ice-9 ftw)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-2)
   #:use-module (srfi srfi-26)
   #:export (%standard-phases
             texlive-build))
@@ -43,11 +44,111 @@
            (negate
             (cut member <> '("." ".." "build" "doc" "source")))))
 
+(define (install-as-runfiles dir regexp)
+  "Install files under DIR matching REGEXP on top of existing runfiles in the
+current tree.  Sub-directories below DIR are preserved when looking for the
+runfile to replace.  If a file has no matching runfile, it is ignored."
+  (let ((runfiles (append-map (cut find-files <>)
+                              (runfiles-root-directories))))
+    (for-each (lambda (file)
+                (match (filter
+                        (cut string-suffix?
+                             (string-drop file (string-length dir))
+                             <>)
+                        runfiles)
+                  ;; Current file is not a runfile.  Ignore it.
+                  (() #f)
+                  ;; One candidate only.  Replace it with the one from DIR.
+                  ((destination)
+                   (let ((target (dirname destination)))
+                     (install-file file target)
+                     (format #t "re-generated file ~s in ~s~%"
+                             (basename file)
+                             target)))
+                  ;; Multiple candidates!  Not much can be done.  Hopefully,
+                  ;; this should never happen.
+                  (_
+                   (format (current-error-port)
+                           "warning: ambiguous location for file ~s; ignoring it~%"
+                           (basename file)))))
+              (find-files dir regexp))))
+
 (define* (delete-drv-files #:rest _)
   "Delete pre-generated \".drv\" files in order to prevent build failures."
   (when (file-exists? "source")
     (for-each delete-file (find-files "source" "\\.drv$"))))
 
+(define* (generate-font-metrics #:key native-inputs inputs #:allow-other-keys)
+  ;; Decide what Metafont files to build by comparing them to the expected
+  ;; font metrics base names.  Keep only files for which the two base names
+  ;; do match.
+  (define (font-metrics root)
+    (and (file-exists? root)
+         (map (cut basename <> ".tfm") (find-files root "\\.tfm$"))))
+  (define (font-files directory metrics)
+    (if (file-exists? directory)
+        (delete-duplicates
+         (filter (lambda (f)
+                   (or (not metrics)
+                       (member (basename f ".mf") metrics)))
+                 (find-files directory "\\.mf$")))
+        '()))
+  ;; Metafont files could be scattered across multiple directories.  Treat
+  ;; each sub-directory as a separate font source.
+  (define (font-sources root metrics)
+    (delete-duplicates (map dirname (font-files root metrics))))
+  (define (texlive-input? input)
+    (string-prefix? "texlive-" input))
+  (and-let* ((local-metrics (font-metrics "fonts/tfm"))
+             (local-sources (font-sources "fonts/source" local-metrics))
+             ((not (null? local-sources))) ;nothing to generate: bail out
+             (root (getcwd))
+             (metafont
+              (cond ((assoc-ref (or native-inputs inputs) "texlive-metafont") =>
+                     (cut string-append <> "/share/texmf-dist"))
+                    (else
+                     (error "Missing 'texlive-metafont' native input"))))
+             ;; Collect all font source files from texlive (native-)inputs so
+             ;; "mf" can know where to look for them.
+             (font-inputs
+              (delete-duplicates
+               (append-map (match-lambda
+                             (((? (negate texlive-input?)) . _) '())
+                             (("texlive-bin" . _) '())
+                             (("texlive-metafont" . _)
+                              (list (string-append metafont "/metafont/base")))
+                             ((_ . input)
+                              (font-sources input #f)))
+                           (or native-inputs inputs)))))
+    ;; Tell mf where to find "mf.base".
+    (setenv "MFBASES" (string-append metafont "/web2c/"))
+    (mkdir-p "build")
+    (for-each
+     (lambda (source)
+       ;; Tell "mf" where are the font source files.  In case current package
+       ;; provides multiple sources, treat them separately.
+       (setenv "MFINPUTS"
+               (string-join (cons (string-append root "/" source)
+                                  font-inputs)
+                            ":"))
+       ;; Build font metrics (tfm).
+       (with-directory-excursion source
+         (for-each (lambda (font)
+                     (format #t "building font ~a~%" font)
+                     (invoke "mf" "-progname=mf"
+                             (string-append "-output-directory="
+                                            root "/build")
+                             (string-append "\\"
+                                            "mode:=ljfour; "
+                                            "mag:=1; "
+                                            "batchmode; "
+                                            "input "
+                                            (basename font ".mf"))))
+                   (font-files "." local-metrics)))
+       ;; Refresh font metrics at the appropriate location.
+       (install-as-runfiles "build" "\\.tfm$"))
+     local-sources)))
+
 (define (compile-with-latex engine format output file)
   (invoke engine
           "-interaction=nonstopmode"
@@ -86,42 +187,14 @@
                   targets))
       ;; Now move generated files from the "build" directory into the rest of
       ;; the source tree, effectively replacing downloaded files.
-
+      ;;
       ;; Documentation may have been generated, but replace only runfiles,
       ;; i.e., files that belong neither to "doc" nor "source" trees.
       ;;
       ;; In TeX Live, all packages are fully pre-generated.  As a consequence,
-      ;; a generated file from the "build" top directory absent from the rest
-      ;; of the tree is deemed unnecessary and can safely be ignored.
-      (let ((runfiles (append-map (cut find-files <>)
-                                  (runfiles-root-directories))))
-        (for-each (lambda (file)
-                    (match (filter
-                            (cut string-suffix?
-                                 (string-drop file (string-length "build"))
-                                 <>)
-                            runfiles)
-                      ;; Current file is not a runfile.  Ignore it.
-                      (() #f)
-                      ;; One candidate only.  Replace it with the one just
-                      ;; generated.
-                      ((destination)
-                       (let ((target (dirname destination)))
-                         (install-file file target)
-                         (format #t "re-generated file ~s in ~s~%"
-                                 (basename file)
-                                 target)))
-                      ;; Multiple candidates!  Not much can be done.
-                      ;; Hopefully, this should never happen.
-                      (_
-                       (format (current-error-port)
-                               "warning: ambiguous localization of file ~s; \
-ignoring it~%"
-                               (basename file)))))
-                  ;; Preserve the relative file name of the generated file in
-                  ;; order to be more accurate when looking for the
-                  ;; corresponding runfile in the tree.
-                  (find-files "build"))))))
+      ;; a generated file from the "build" top directory absent from the rest of
+      ;; the tree is deemed unnecessary and can safely be ignored.
+      (install-as-runfiles "build" "."))))
 
 (define* (install #:key outputs #:allow-other-keys)
   (let ((out (assoc-ref outputs "out"))
@@ -147,6 +220,7 @@ ignoring it~%"
     (delete 'bootstrap)
     (delete 'configure)
     (add-before 'build 'delete-drv-files delete-drv-files)
+    (add-after 'delete-drv-files 'generate-font-metrics generate-font-metrics)
     (replace 'build build)
     (delete 'check)
     (replace 'install install)))
-- 
cgit 1.4.1


From 31cd9a50402ac64e83fce35a7c789613d6ad156a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 23:27:38 +0200
Subject: guix: import: Handle native inputs in texlive importer.

* guix/import/texlive.scm (tlpdb->package): Add TEXLIVE-METAFONT as a native
input whenever font metrics are to be generated.
* tests/texlive.scm (%fake-tlpdb): Add test data.
("texlive->guix-package, with METAFONT files"): New test.
---
 guix/import/texlive.scm | 15 ++++++++++++++
 tests/texlive.scm       | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 33a0e7d1d9..fd772d3133 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -315,6 +315,21 @@ of those files are returned that are unexpectedly installed."
               '((outputs '("out" "doc")))
               '())
         (build-system texlive-build-system)
+        ;; Texlive build system generates font metrics whenever a font metrics
+        ;; file has the same base name as a Metafont file.
+        ,@(or (and-let* ((runfiles (assoc-ref data 'runfiles))
+                         (metrics
+                          (filter-map (lambda (f)
+                                        (and (string-suffix? ".tfm" f)
+                                             (basename f ".tfm")))
+                                      runfiles))
+                         ((not (null? metrics)))
+                         ((any (lambda (f)
+                                 (and (string-suffix? ".mf" f)
+                                      (member (basename f ".mf") metrics)))
+                               runfiles)))
+                '((native-inputs (list texlive-metafont))))
+              '())
         ,@(match filtered-depends
             (() '())
             (inputs
diff --git a/tests/texlive.scm b/tests/texlive.scm
index 9f4c965139..704c86e24a 100644
--- a/tests/texlive.scm
+++ b/tests/texlive.scm
@@ -195,7 +195,24 @@ completely compatible with Plain TeX.")
             "texmf-dist/tex/texsis/base/thesis.txs"
             "texmf-dist/tex/texsis/base/twin.txs"
             "texmf-dist/tex/texsis/config/texsis.ini"))
-        (catalogue-license . "lppl")))))
+        (catalogue-license . "lppl")))
+    ("trsym"
+     (name . "trsym")
+     (shortdesc . "Symbols for transformations")
+     (longdesc . "The bundle provides Metafont...")
+     (docfiles "texmf-dist/doc/latex/trsym/README"
+               "texmf-dist/doc/latex/trsym/manifest.txt"
+               "texmf-dist/doc/latex/trsym/trsym.pdf")
+     (srcfiles "texmf-dist/source/latex/trsym/trsym.dtx"
+               "texmf-dist/source/latex/trsym/trsym.ins")
+     (runfiles "texmf-dist/fonts/source/public/trsym/trsy.mf"
+               "texmf-dist/fonts/source/public/trsym/trsy10.mf"
+               "texmf-dist/fonts/source/public/trsym/trsy12.mf"
+               "texmf-dist/fonts/tfm/public/trsym/trsy10.tfm"
+               "texmf-dist/fonts/tfm/public/trsym/trsy12.tfm"
+               "texmf-dist/tex/latex/trsym/trsym.sty"
+               "texmf-dist/tex/latex/trsym/utrsy.fd")
+     (catalogue-license . "lppl"))))
 
 (test-assert "texlive->guix-package, no docfiles"
   ;; Replace network resources with sample data.
@@ -277,6 +294,40 @@ completely compatible with Plain TeX.")
                (format #t "~s~%" result)
                (pk 'fail result #f)))))))
 
+(test-assert "texlive->guix-package, with METAFONT files"
+  ;; Replace network resources with sample data.
+  (mock ((guix build svn) svn-fetch
+         (lambda* (url revision directory
+                       #:key (svn-command "svn")
+                       (user-name #f)
+                       (password #f)
+                       (recursive? #t))
+           (mkdir-p directory)
+           (with-output-to-file (string-append directory "/foo")
+             (lambda ()
+               (display "source")))))
+        (let ((result (texlive->guix-package "trsym"
+                                             #:package-database
+                                             (lambda _ %fake-tlpdb))))
+          (match result
+            (('package
+               ('name _)
+               ('version _)
+               ('source _)
+               ('outputs _)
+               ('build-system _)
+               ('native-inputs
+                ('list 'texlive-metafont))
+               ('home-page (? string?))
+               ('synopsis (? string?))
+               ('description (? string?))
+               ('license _))
+             #true)
+            (_
+             (begin
+               (format #t "~s~%" result)
+               (pk 'fail result #f)))))))
+
 (test-assert "texlive->guix-package, with catalogue entry, no inputs"
   ;; Replace network resources with sample data.
   (mock ((guix build svn) svn-fetch
-- 
cgit 1.4.1


From c3e3f03dafb1460b8693fc6c114365f376289197 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 16:32:19 +0200
Subject: gnu: texlive-cm: Fix build.

* gnu/packages/tex.scm (texlive-cm)[arguments]<#:modules>: Remove keyword.
<#:phases>: Remove unnecessary phases.  Add a phase to build ".pk" files.
---
 gnu/packages/tex.scm | 58 ++++++++++++++++------------------------------------
 1 file changed, 18 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6ce5e372a4..893899a103 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1164,52 +1164,30 @@ part of the cite bundle of the author's citation-related packages.")
     (arguments
      (list
       #:texlive-latex-base #f
-      #:modules
-      '((guix build texlive-build-system)
-        (guix build utils)
-        (srfi srfi-26))
       #:phases
       #~(modify-phases %standard-phases
-          (replace 'build
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((mf (assoc-ref inputs "texlive-metafont")))
-                ;; Tell mf where to find mf.base
-                (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c"))
-                ;; Tell mf where to look for source files
-                (setenv "MFINPUTS"
-                        (string-append (getcwd) "/fonts/source/public/cm/:"
-                                       mf "/share/texmf-dist/metafont/base")))
-              (for-each make-file-writable
-                        (cons "fonts/source/public/cm/"
-                              (find-files "fonts/source/public/cm/" ".*")))
-              (let ((build (string-append (getcwd) "/build"))
-                    (pkdir (string-append (getcwd) "/pk/ljfour/public/cm/dpi600")))
-                (mkdir-p pkdir)
-                (mkdir-p build)
+          (add-after 'generate-font-metrics 'generate-pk
+            (lambda _
+              (let* ((cwd (getcwd))
+                     (pkdir
+                      (string-append cwd "/fonts/pk/ljfour/public/cm/dpi600"))
+                     (build-dir (string-append cwd "/build")))
                 (with-directory-excursion "fonts/source/public/cm/"
-                  (for-each (lambda (font)
-                              (format #t "building font ~a\n" font)
-                              (invoke "mf" "-progname=mf"
-                                      (string-append "-output-directory=" build)
-                                      (string-append "\\"
-                                                     "mode:=ljfour; "
-                                                     "mag:=1+0/600; "
-                                                     "scrollmode; "
-                                                     "input "
-                                                     (basename font ".mf")))
-                              (invoke "gftopk"
-                                      (string-append build "/"
-                                                     (basename font ".mf") ".600gf")
-                                      (string-append pkdir "/"
-                                                     (basename font ".mf") ".pk")))
-                            (find-files "." "cm(.*[0-9]+.*|inch)\\.mf$")))))))))
+                  (mkdir-p pkdir)
+                  (for-each
+                   (lambda (font)
+                     (let ((font-name (basename font ".mf")))
+                       (invoke "gftopk"
+                               (string-append build-dir "/" font-name ".600gf")
+                               (string-append pkdir "/" font-name ".pk"))))
+                   (find-files "." "cm(.*[0-9]+.*|inch)\\.mf$")))))))))
     (native-inputs (list texlive-metafont))
     (home-page "https://ctan.org/pkg/cm")
     (synopsis "Computer Modern fonts for TeX")
-    (description "This package provides the Computer Modern fonts by Donald
-Knuth.  The Computer Modern font family is a large collection of text,
-display, and mathematical fonts in a range of styles, based on Monotype Modern
-8A.")
+    (description
+     "This package provides the Computer Modern fonts by Donald Knuth.  The
+Computer Modern font family is a large collection of text, display, and
+mathematical fonts in a range of styles, based on Monotype Modern 8A.")
     (license license:knuth)))
 
 (define-deprecated-package texlive-fonts-cm texlive-cm)
-- 
cgit 1.4.1


From dc87a11f9ec37992d27d1fdc2313e2d39e2c9fb0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 16:32:50 +0200
Subject: gnu: texlive-etex: Fix build.

* gnu/packages/tex.scm (texlive-etex)[arguments]<#:modules>: Remove keyword.
<#:phases>: Remove phases.
---
 gnu/packages/tex.scm | 58 +---------------------------------------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 893899a103..b34ad62711 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1829,63 +1829,7 @@ features generation of clean UTF-8 patterns.")
               "17pvh7i9zw8qa5hr53kci7di64fqzx4j35gsn28s36b74x6xj4bc")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list
-      #:texlive-latex-base #f
-      #:modules
-      '((guix build texlive-build-system)
-        (guix build utils)
-        (srfi srfi-1)
-        (srfi srfi-26))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'generate-fonts-metrics
-            (lambda _
-              (let ((cm #$(this-package-native-input "texlive-cm"))
-                    (metafont #$(this-package-native-input "texlive-metafont"))
-                    (fonts-directories
-                     (delete-duplicates
-                      (map (lambda (f)
-                             (string-drop (dirname f) (string-length "./")))
-                           (find-files "." "[0-9]+\\.mf$"))))
-                    (root (getcwd)))
-                (mkdir-p "build")
-                ;; Tell mf where to find mf.base.
-                (setenv "MFBASES"
-                        (string-append metafont "/share/texmf-dist/web2c/"))
-                (for-each
-                 (lambda (directory)
-                   ;; Tell mf where to look for source files.
-                   (setenv "MFINPUTS"
-                           (string-append
-                            (getcwd) "/" directory ":"
-                            metafont "/share/texmf-dist/metafont/base/:"
-                            cm "/share/texmf-dist/fonts/source/public/cm/"))
-                   ;; Build font metrics (tfm).
-                   (with-directory-excursion directory
-                     (for-each (lambda (font)
-                                 (format #t "building font ~a\n" font)
-                                 (invoke "mf" "-progname=mf"
-                                         (string-append "-output-directory="
-                                                        root "/build")
-                                         (string-append "\\"
-                                                        "mode:=ljfour; "
-                                                        "mag:=1; "
-                                                        "batchmode; "
-                                                        "input "
-                                                        (basename font ".mf"))))
-                               (find-files "." "[0-9]+\\.mf$")))
-                   ;; Install font metrics at the appropriate location.
-                   (let ((destination
-                          ;; fonts/source/xxx/yyy/... -> fonts/tfm/xxx/yyy/...
-                          (string-append "fonts/tfm"
-                                         (string-drop
-                                          directory
-                                          (string-length "fonts/source")))))
-                     (format #t "moving font metrics in ~a\n" destination)
-                     (for-each (cut install-file <> destination)
-                               (find-files "build/" "\\.tfm$"))))
-                 fonts-directories)))))))
+    (arguments (list #:texlive-latex-base #f))
     (native-inputs (list texlive-cm texlive-metafont))
     (home-page "https://www.ctan.org/pkg/etex")
     (synopsis "Extended version of TeX")
-- 
cgit 1.4.1


From c6d117f867800b4f12dbc9944ee9732b7cbdd0ba Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 16:31:20 +0200
Subject: gnu: texlive-knuth-lib: Fix build.

* gnu/packages/tex.scm (texlive-knuth-lib)[arguments]<#:modules>: Remove them.
<#:phases>: Remove them.
---
 gnu/packages/tex.scm | 58 +---------------------------------------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b34ad62711..d88b98e38e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1446,63 +1446,7 @@ conversion software and word processors.")
              (base32
               "0dl8z340n6m6xn7wari4hir0syxqi0kl2fhnf0bvnmkqhqwyzpca")))
     (build-system texlive-build-system)
-    (arguments
-     (list
-      #:texlive-latex-base #f
-      #:modules
-      '((guix build texlive-build-system)
-        (guix build utils)
-        (srfi srfi-1)
-        (srfi srfi-26))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'generate-fonts-metrics
-            (lambda _
-              (let ((cm #$(this-package-native-input "texlive-cm"))
-                    (metafont #$(this-package-native-input "texlive-metafont"))
-                    (fonts-directories
-                     (delete-duplicates
-                      (map (lambda (f)
-                             (string-drop (dirname f) (string-length "./")))
-                           (find-files "." "[0-9]+\\.mf$"))))
-                    (root (getcwd)))
-                (mkdir-p "build")
-                ;; Tell mf where to find mf.base.
-                (setenv "MFBASES"
-                        (string-append metafont "/share/texmf-dist/web2c/"))
-                (for-each
-                 (lambda (directory)
-                   ;; Tell mf where to look for source files.
-                   (setenv "MFINPUTS"
-                           (string-append
-                            (getcwd) "/" directory ":"
-                            metafont "/share/texmf-dist/metafont/base/:"
-                            cm "/share/texmf-dist/fonts/source/public/cm/"))
-                   ;; Build font metrics (tfm).
-                   (with-directory-excursion directory
-                     (for-each (lambda (font)
-                                 (format #t "building font ~a\n" font)
-                                 (invoke "mf" "-progname=mf"
-                                         (string-append "-output-directory="
-                                                        root "/build")
-                                         (string-append "\\"
-                                                        "mode:=ljfour; "
-                                                        "mag:=1; "
-                                                        "batchmode; "
-                                                        "input "
-                                                        (basename font ".mf"))))
-                               (find-files "." "[0-9]+\\.mf$")))
-                   ;; Install font metrics at the appropriate location.
-                   (let ((destination
-                          ;; fonts/source/xxx/yyy/... -> fonts/tfm/xxx/yyy/...
-                          (string-append "fonts/tfm"
-                                         (string-drop
-                                          directory
-                                          (string-length "fonts/source")))))
-                     (format #t "moving font metrics in ~a\n" destination)
-                     (for-each (cut install-file <> destination)
-                               (find-files "build/" "\\.tfm$"))))
-                 fonts-directories)))))))
+    (arguments (list #:texlive-latex-base #f))
     (native-inputs (list texlive-cm texlive-metafont))
     (home-page "https://ctan.org/pkg/knuth-lib")
     (synopsis "Small library of METAFONT sources")
-- 
cgit 1.4.1


From bc348db933ebe03a2df6a8e38f465b573ddd9059 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 16:31:54 +0200
Subject: gnu: texlive-mflogo-font: Fix build.

* gnu/packages/tex.scm (texlive-mflogo-font)[arguments]: Remove them.
[native-inputs]: Remove TEXLIVE-BIN.
---
 gnu/packages/tex.scm | 34 +---------------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d88b98e38e..b777c935b3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1554,39 +1554,7 @@ circle fonts (for use in the picture environment) and LaTeX symbol fonts.")
               "1r53qlrcqfwc0dfr7ji1nxnqrj6n0qrlg1rl7fjlw6ap3q9y434k")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'build 'build-font-metrics
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((root (assoc-ref inputs "source"))
-                    (mf #$(this-package-native-input "texlive-metafont"))
-                    (kl #$(this-package-native-input "texlive-knuth-lib")))
-                ;; Tell mf where to find mf.base.
-                (setenv "MFBASES"
-                        (string-append mf "/share/texmf-dist/web2c"))
-                ;; Tell mf where to look for source files.
-                (setenv "MFINPUTS"
-                        (string-append root ":"
-                                       mf "/share/texmf-dist/metafont/base:"
-                                       kl "/share/texmf-dist/fonts/source/public/knuth-lib:"
-                                       root "/fonts/source/public/mflogo/"))
-                (for-each (lambda (font)
-                            (format #t "building font ~a\n" font)
-                            (invoke "mf" "-progname=mf"
-                                    "-output-directory=build"
-                                    (string-append "\\"
-                                                   "mode:=ljfour; "
-                                                   "mag:=1; "
-                                                   "scrollmode; "
-                                                   "input " (basename font))))
-                          (find-files
-                           (string-append root
-                                          "/fonts/source/public/mflogo/")
-                           "\\.mf$"))))))))
-    (native-inputs
-     (list texlive-bin texlive-knuth-lib texlive-metafont))
+    (native-inputs (list texlive-knuth-lib texlive-metafont))
     (home-page "https://ctan.org/pkg/mflogo")
     (synopsis "LaTeX support for Metafont logo fonts")
     (description
-- 
cgit 1.4.1


From f3d523af3d0ca4036aa8e32d87852690b3fac267 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 16:35:42 +0200
Subject: gnu: texlive-ec: Fix build.

* gnu/packages/tex.scm (texlive-ec)[arguments]: Remove them.
[native-inputs]: Remove TEXLIVE-BIN.
---
 gnu/packages/tex.scm | 45 +--------------------------------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b777c935b3..175c5e1b84 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7271,50 +7271,7 @@ package options.")
               "1cyi0vv9dnp45s0ilsrbkyznj9ji62s5bhkqgh49461mv2f8qj6p")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list
-      #:modules
-      '((guix build texlive-build-system)
-        (guix build utils)
-        (srfi srfi-1)
-        (srfi srfi-26))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 're-generate-fonts-metrics
-            (lambda _
-              (let ((mf #$(this-package-native-input "texlive-metafont"))
-                    (cm #$(this-package-native-input "texlive-cm"))
-                    (root (getcwd)))
-                (mkdir-p "build")
-                (with-directory-excursion "fonts/source/jknappen/ec"
-                  ;; Tell mf where to find mf.base.
-                  (setenv "MFBASES"
-                          (string-append mf "/share/texmf-dist/web2c"))
-                  ;; Tell mf where to look for source files.
-                  (setenv "MFINPUTS"
-                          (string-append
-                           (getcwd) ":"
-                           mf "/share/texmf-dist/metafont/base:"
-                           cm "/share/texmf-dist/fonts/source/public/cm"))
-                  ;; Build font metrics (tfm).
-                  (for-each (lambda (font)
-                              (format #t "building font ~a\n" font)
-                              (invoke "mf" "-progname=mf"
-                                      (string-append "-output-directory="
-                                                     root "/build")
-                                      (string-append "\\"
-                                                     "mode:=ljfour; "
-                                                     "mag:=1; "
-                                                     "batchmode; "
-                                                     "input "
-                                                     (basename font ".mf"))))
-                            (find-files "." "[0-9]+\\.mf$")))
-                ;; Install font metrics at the appropriate location.
-                (for-each
-                 (cut install-file <> "fonts/tfm/jknappen/ec")
-                 (find-files "build/" "\\.tfm$"))))))))
-    (native-inputs
-     (list texlive-bin texlive-cm texlive-metafont))
+    (native-inputs (list texlive-cm texlive-metafont))
     (home-page "https://ctan.org/pkg/ec")
     (synopsis "Computer modern fonts in T1 and TS1 encodings")
     (description
-- 
cgit 1.4.1


From b474017516034f46e22638235dfb57cfd7f350f2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 16:31:43 +0200
Subject: gnu: texlive-latex-fonts: Fix build.

* gnu/packages/tex.scm (texlive-latex-fonts)[arguments]<#:modules>: Remove
them.
<#:phases>: Remove them.
[native-inputs]: Remove TEXLIVE-BIN.
---
 gnu/packages/tex.scm | 64 ++++------------------------------------------------
 1 file changed, 4 insertions(+), 60 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 175c5e1b84..c13520e736 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1470,71 +1470,15 @@ Knuth, including the plain format, plain base, and the MF logo fonts.")
               "1bzqzzhs15w7dqz90hfjnaffjqh24q14w2h1h8vnxzvrlsyv21vq")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list
-      #:texlive-latex-base #f
-      #:modules
-      '((guix build texlive-build-system)
-        (guix build utils)
-        (srfi srfi-1)
-        (srfi srfi-26))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'generate-fonts-metrics
-            (lambda _
-              (let ((cm #$(this-package-native-input "texlive-cm"))
-                    (metafont #$(this-package-native-input "texlive-metafont"))
-                    (fonts-directories
-                     (delete-duplicates
-                      (map (lambda (f)
-                             (string-drop (dirname f) (string-length "./")))
-                           (find-files "." "[0-9]+\\.mf$"))))
-                    (root (getcwd)))
-                (mkdir-p "build")
-                ;; Tell mf where to find mf.base.
-                (setenv "MFBASES"
-                        (string-append metafont "/share/texmf-dist/web2c/"))
-                (for-each
-                 (lambda (directory)
-                   ;; Tell mf where to look for source files.
-                   (setenv "MFINPUTS"
-                           (string-append
-                            (getcwd) "/" directory ":"
-                            metafont "/share/texmf-dist/metafont/base/:"
-                            cm "/share/texmf-dist/fonts/source/public/cm/"))
-                   ;; Build font metrics (tfm).
-                   (with-directory-excursion directory
-                     (for-each (lambda (font)
-                                 (format #t "building font ~a\n" font)
-                                 (invoke "mf" "-progname=mf"
-                                         (string-append "-output-directory="
-                                                        root "/build")
-                                         (string-append "\\"
-                                                        "mode:=ljfour; "
-                                                        "mag:=1; "
-                                                        "batchmode; "
-                                                        "input "
-                                                        (basename font ".mf"))))
-                               (find-files "." "[0-9]+\\.mf$")))
-                   ;; Install font metrics at the appropriate location.
-                   (let ((destination
-                          ;; fonts/source/xxx/yyy/... -> fonts/tfm/xxx/yyy/...
-                          (string-append "fonts/tfm"
-                                         (string-drop
-                                          directory
-                                          (string-length "fonts/source")))))
-                     (format #t "moving font metrics in ~a\n" destination)
-                     (for-each (cut install-file <> destination)
-                               (find-files "build/" "\\.tfm$"))))
-                 fonts-directories)))))))
-    (native-inputs
-     (list texlive-bin texlive-cm texlive-metafont))
+    (arguments (list #:texlive-latex-base #f))
+    (native-inputs (list texlive-cm texlive-metafont))
     (home-page "https://ctan.org/pkg/latex-fonts")
     (synopsis "Collection of fonts used in LaTeX distributions")
     (description
      "This is a collection of fonts for use with standard LaTeX packages and
 classes. It includes invisible fonts (for use with the slides class), line and
-circle fonts (for use in the picture environment) and LaTeX symbol fonts.")
+circle fonts (for use in the @code{picture} environment) and LaTeX symbol
+fonts.")
     (license license:lppl1.2+)))
 
 (define-deprecated-package texlive-fonts-latex texlive-latex-fonts)
-- 
cgit 1.4.1


From 40b11de65e302f1b3f72eab2eaeebe98d9888d4e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 16:32:35 +0200
Subject: gnu: texlive-amsfonts: Fix build.

* gnu/packages/tex.scm (texlive-amsfonts)[arguments]: Remove them.
[native-inputs]: Remove TEXLIVE-KPATHSEA.
---
 gnu/packages/tex.scm | 59 +---------------------------------------------------
 1 file changed, 1 insertion(+), 58 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c13520e736..be4d28493f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1571,64 +1571,7 @@ Taco Hoekwater.")
               "0phhzcxapa5607pk37agr981rg90zw2p4rqv7sk7i19byr867a1b")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list
-      #:modules
-      '((guix build texlive-build-system)
-        (guix build utils)
-        (srfi srfi-1)
-        (srfi srfi-26))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'generate-fonts-metrics
-            (lambda _
-              (let ((cm #$(this-package-native-input "texlive-cm"))
-                    (metafont #$(this-package-native-input "texlive-metafont"))
-                    (fonts-directories
-                     (delete-duplicates
-                      (map (lambda (f)
-                             (string-drop (dirname f) (string-length "./")))
-                           (find-files "." "[0-9]+\\.mf$"))))
-                    (root (getcwd)))
-                (mkdir-p "build")
-                ;; Tell mf where to find mf.base.
-                (setenv "MFBASES"
-                        (string-append metafont "/share/texmf-dist/web2c/"))
-                (for-each
-                 (lambda (directory)
-                   ;; Tell mf where to look for source files.
-                   (setenv "MFINPUTS"
-                           (string-append
-                            (getcwd) "/" directory ":"
-                            metafont "/share/texmf-dist/metafont/base/:"
-                            cm "/share/texmf-dist/fonts/source/public/cm/"))
-                   ;; Build font metrics (tfm).
-                   (with-directory-excursion directory
-                     (for-each (lambda (font)
-                                 (format #t "building font ~a\n" font)
-                                 (invoke "mf" "-progname=mf"
-                                         (string-append "-output-directory="
-                                                        root "/build")
-                                         (string-append "\\"
-                                                        "mode:=ljfour; "
-                                                        "mag:=1; "
-                                                        "batchmode; "
-                                                        "input "
-                                                        (basename font ".mf"))))
-                               (find-files "." "[0-9]+\\.mf$")))
-                   ;; Install font metrics at the appropriate location.
-                   (let ((destination
-                          ;; fonts/source/xxx/yyy/... -> fonts/tfm/xxx/yyy/...
-                          (string-append "fonts/tfm"
-                                         (string-drop
-                                          directory
-                                          (string-length "fonts/source")))))
-                     (format #t "moving font metrics in ~a\n" destination)
-                     (for-each (cut install-file <> destination)
-                               (find-files "build/" "\\.tfm$"))))
-                 fonts-directories)))))))
-    (native-inputs
-     (list texlive-kpathsea texlive-cm texlive-metafont))
+    (native-inputs (list texlive-cm texlive-metafont))
     (home-page "https://ctan.org/pkg/amsfonts")
     (synopsis "TeX fonts from the American Mathematical Society")
     (description
-- 
cgit 1.4.1


From a04782f613b5ba7dbb02b36f26a7982be4237c24 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 16:35:58 +0200
Subject: gnu: texlive-rsfs: Fix build.

* gnu/packages/tex.scm (texlive-rsfs)[arguments]: Remove them.
[native-inputs]: Remove TEXLIVE-BIN.
---
 gnu/packages/tex.scm | 45 +--------------------------------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index be4d28493f..b609171750 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7415,50 +7415,7 @@ modules that use it.")
               "1sa32wnsj84wbwqji1fb4k9ik99dy5ji7zz4v0xbd7306agyhns5")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list
-      #:modules
-      '((guix build texlive-build-system)
-        (guix build utils)
-        (srfi srfi-1)
-        (srfi srfi-26))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 're-generate-fonts-metrics
-            (lambda _
-              (let ((mf #$(this-package-native-input "texlive-metafont"))
-                    (cm #$(this-package-native-input "texlive-cm"))
-                    (root (getcwd)))
-                (mkdir-p "build")
-                (with-directory-excursion "fonts/source/public/rsfs"
-                  ;; Tell mf where to find mf.base.
-                  (setenv "MFBASES"
-                          (string-append mf "/share/texmf-dist/web2c"))
-                  ;; Tell mf where to look for source files.
-                  (setenv "MFINPUTS"
-                          (string-append
-                           (getcwd) ":"
-                           mf "/share/texmf-dist/metafont/base:"
-                           cm "/share/texmf-dist/fonts/source/public/cm"))
-                  ;; Build font metrics (tfm).
-                  (for-each (lambda (font)
-                              (format #t "building font ~a\n" font)
-                              (invoke "mf" "-progname=mf"
-                                      (string-append "-output-directory="
-                                                     root "/build")
-                                      (string-append "\\"
-                                                     "mode:=ljfour; "
-                                                     "mag:=1; "
-                                                     "batchmode; "
-                                                     "input "
-                                                     (basename font ".mf"))))
-                            (find-files "." "[0-9]+\\.mf$")))
-                ;; Install font metrics at the appropriate location.
-                (for-each
-                 (cut install-file <> "fonts/tfm/public/rsfs/")
-                 (find-files "build/" "\\.tfm$"))))))))
-    (native-inputs
-     (list texlive-bin texlive-metafont texlive-cm))
+    (native-inputs (list texlive-cm texlive-metafont))
     (home-page "https://ctan.org/pkg/rsfs")
     (synopsis "Ralph Smith's Formal Script font")
     (description
-- 
cgit 1.4.1


From 80e2694ff9d68a6553caab0e00fe57c345144eaf Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 16:36:18 +0200
Subject: gnu: texlive-eurosym: Fix build.

* gnu/packages/tex.scm (texlive-eurosym)[arguments]: Remove them.
[native-inputs]: Remove TEXLIVE-BIN.
---
 gnu/packages/tex.scm | 45 +--------------------------------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b609171750..c1d6d8a001 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11923,50 +11923,7 @@ OpenType fonts.")
               "0ml24rxbl1yir4s3fjjxm0z7axklc3p33syg41b76zc7hck9mk8s")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list
-      #:modules
-      '((guix build texlive-build-system)
-        (guix build utils)
-        (srfi srfi-1)
-        (srfi srfi-26))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 're-generate-fonts-metrics
-            (lambda _
-              (let ((mf #$(this-package-native-input "texlive-metafont"))
-                    (cm #$(this-package-native-input "texlive-cm"))
-                    (root (getcwd)))
-                (mkdir-p "build")
-                (with-directory-excursion "fonts/source/public/eurosym"
-                  ;; Tell mf where to find mf.base.
-                  (setenv "MFBASES"
-                          (string-append mf "/share/texmf-dist/web2c"))
-                  ;; Tell mf where to look for source files.
-                  (setenv "MFINPUTS"
-                          (string-append
-                           (getcwd) ":"
-                           mf "/share/texmf-dist/metafont/base:"
-                           cm "/share/texmf-dist/fonts/source/public/cm"))
-                  ;; Build font metrics (tfm).
-                  (for-each (lambda (font)
-                              (format #t "building font ~a\n" font)
-                              (invoke "mf" "-progname=mf"
-                                      (string-append "-output-directory="
-                                                     root "/build")
-                                      (string-append "\\"
-                                                     "mode:=ljfour; "
-                                                     "mag:=1; "
-                                                     "batchmode; "
-                                                     "input "
-                                                     (basename font ".mf"))))
-                            (find-files "." "[0-9]+\\.mf$")))
-                ;; Install font metrics at the appropriate location.
-                (for-each
-                 (cut install-file <> "fonts/tfm/public/eurosym")
-                 (find-files "build/" "\\.tfm$"))))))))
-    (native-inputs
-     (list texlive-bin texlive-cm texlive-metafont))
+    (native-inputs (list texlive-cm texlive-metafont))
     (home-page "https://ctan.org/pkg/eurosym")
     (synopsis "METAFONT and macros for Euro sign")
     (description
-- 
cgit 1.4.1


From 4104e8ae7212e3f763da0f98cb907966ef1c6e75 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 16:35:27 +0200
Subject: gnu: texlive-tipa: Fix build.

* gnu/packages/tex.scm (texlive-tipa)[arguments]<#:modules, #:phases>: Remove
them.
---
 gnu/packages/tex.scm | 61 ----------------------------------------------------
 1 file changed, 61 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c1d6d8a001..ec1b1dba18 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5044,67 +5044,6 @@ It includes little more than the required set of LaTeX packages.")))
               "11gi7yhq2lnfgvqa29i0sidi5mwkzpja5ggdcpvqwv4xljf4vpvh")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list
-      #:modules
-      '((guix build texlive-build-system)
-        (guix build utils)
-        (ice-9 regex)
-        (srfi srfi-1)
-        (srfi srfi-26))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'generate-fonts-metrics
-            (lambda _
-              (let ((mf #$(this-package-native-input "texlive-metafont"))
-                    (cm #$(this-package-native-input "texlive-cm"))
-                    (fonts-directories
-                     (delete-duplicates
-                      (map dirname
-                           (find-files "." "[0-9]+\\.mf$"))))
-                    (root (getcwd)))
-                (mkdir-p "build")
-                ;; Tell mf where to find mf.base.
-                (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c"))
-                (for-each
-                 (lambda (directory)
-                   ;; Tell mf where to look for source files.
-                   (setenv "MFINPUTS"
-                           (string-append
-                            (getcwd) "/" directory ":"
-                            mf "/share/texmf-dist/metafont/base:"
-                            cm "/share/texmf-dist/fonts/source/public/cm"))
-                   ;; Build font metrics (tfm).
-                   (with-directory-excursion directory
-                     (for-each (lambda (font)
-                                 (format #t "building font ~a\n" font)
-                                 (invoke "mf" "-progname=mf"
-                                         (string-append "-output-directory="
-                                                        root "/build")
-                                         (string-append "\\"
-                                                        "mode:=ljfour; "
-                                                        "mag:=1; "
-                                                        "batchmode; "
-                                                        "input "
-                                                        (basename font ".mf"))))
-                               ;; "tipasym[1-4].mf are files to be included in
-                               ;; other ".mf" files and should not be compiled
-                               ;; by themselves.
-                               (filter
-                                (negate
-                                 (cut string-match "tipasym[0-9]\\.mf$" <>))
-                                (find-files "." "[0-9]+\\.mf$"))))
-                   ;; Install font metrics at the appropriate location.
-                   (let ((destination
-                          ;; fonts/source/xxx/yyy/... -> fonts/tfm/xxx/yyy/...
-                          (string-append "fonts/tfm"
-                                         (string-drop
-                                          directory
-                                          (string-length "fonts/source")))))
-                     (format #t "moving font metrics in ~a\n" destination)
-                     (for-each (cut install-file <> destination)
-                               (find-files "build/" "\\.tfm$"))))
-                 fonts-directories)))))))
     (native-inputs
      (list texlive-cm texlive-metafont))
     (home-page "https://ctan.org/pkg/tipa")
-- 
cgit 1.4.1


From 9c04dc79fdae4351421dc0de850cc929896dd922 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 18:18:12 +0200
Subject: gnu: texlive-stmaryrd: Fix build.

* gnu/packages/tex.scm (texlive-stmaryrd)[native-inputs]: Add TEXLIVE-CM and TEXLIVE-METAFONT.
---
 gnu/packages/tex.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ec1b1dba18..e2c3ccc1d0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7711,6 +7711,7 @@ captions sideways.  Options include @code{outercaption}, @code{innercaption},
                 (("^%% LaTeX2e.*") "\\input docstrip\n")
                 (("fontdef\\}\\}" line)
                  (string-append line "\n\\endbatchfile"))))))))
+    (native-inputs (list texlive-cm texlive-metafont))
     (home-page "https://ctan.org/pkg/stmaryrd")
     (synopsis "St Mary Road symbols for theoretical computer science")
     (description
-- 
cgit 1.4.1


From 8aafda0abd69ee866e9cf769611c66245a9f4959 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 18:21:49 +0200
Subject: gnu: texlive-wasy: Fix build.

* gnu/packages/tex.scm (texlive-wasy)[native-inputs]: Add TEXLIVE-CM and TEXLIVE-METAFONT.
---
 gnu/packages/tex.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e2c3ccc1d0..2c98293c9b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8339,6 +8339,7 @@ natural width.")
               "1swzxgld3lndi5q0q6zkwbw06ndh13fvp04as7zpwyhh646s0hbx")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (native-inputs (list texlive-cm texlive-metafont))
     (home-page "https://ctan.org/pkg/wasy")
     (synopsis "Waldi symbol fonts")
     (description "This package provides the @code{wasy} (Waldi symbol) fonts,
-- 
cgit 1.4.1


From 030d490d35bbbc54b67a278483ca059428cac0fa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 18:28:19 +0200
Subject: gnu: texlive-cbfonts: Fix build.

* gnu/packages/tex.scm (texlive-cbfonts)[arguments]<#:phases>: Skip failing
GENERATE-FONT-METRICS phase.
[native-inputs]: Add TEXLIVE-CM, TEXLIVE-METAFONT.
---
 gnu/packages/tex.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2c98293c9b..74260ffacd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1089,8 +1089,14 @@ arbitrarily complex font names, thus helping portability of TeX documents.")
              (base32
               "0l0dpgvngah227snzk6j5hf3kxs5cz5jvlpkv8pbapw6jx084np6")))
     (outputs '("out" "doc"))
-    ;; FIXME: Font metrics cannot be generated due to "bad pos" errors.
     (build-system texlive-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               ;; FIXME: Font metrics cannot be generated due to "bad pos"
+               ;; errors.
+               (delete 'generate-font-metrics))))
+    (native-inputs (list texlive-cm texlive-metafont))
     (propagated-inputs (list texlive-cbfonts-fd))
     (home-page "https://ctan.org/pkg/cbgreek-complete")
     (synopsis "Complete set of Greek fonts")
-- 
cgit 1.4.1


From 066d9e59cd0fba3aa3a1d6847a29d6129290ae60 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 19:00:13 +0200
Subject: gnu: texlive-cs: Fix build.

* gnu/packages/tex.scm (texlive-cs)[arguments]<#:phases>: Skip failing
GENERATE-FONT-METRICS phase.
[native-inputs]: Add TEXLIVE-CM, TEXLIVE-METAFONT.
---
 gnu/packages/tex.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 74260ffacd..ff5ba070c2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4618,7 +4618,6 @@ polyglossia package rather than Babel.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             ;; FIXME: Cannot build font metrics: "cannot find cmb12".
              (list "fonts/enc/dvips/cs/"
                    "fonts/map/dvips/cs/"
                    "fonts/source/public/cs/"
@@ -4631,6 +4630,14 @@ polyglossia package rather than Babel.")
              (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))
     (propagated-inputs (list texlive-cmexb))
     (home-page "https://ctan.org/pkg/csfonts")
     (synopsis "Czech/Slovak-tuned Computer Modern fonts")
-- 
cgit 1.4.1


From 79ba7e354d38abdb50ed96596e01df88088ce3a0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 19:35:58 +0200
Subject: gnu: texlive-lh: Fix build.

* gnu/packages/tex.scm (texlive-lh)[native-inputs]: Add TEXLIVE-CM,
TEXLIVE-METAFONT.
---
 gnu/packages/tex.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ff5ba070c2..607f3fd0f7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8185,6 +8185,7 @@ same job for T1- and TS1-encoded @code{ec} fonts.")
               "0cqwns4zy1847fn3dp8z3wbfpy4dl05cr065nk9k65fmp7wksnjk")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (native-inputs (list texlive-cm texlive-ec texlive-metafont))
     (propagated-inputs (list texlive-ec))
     (home-page "https://ctan.org/pkg/lh")
     (synopsis "Cyrillic fonts that support LaTeX standard encodings")
-- 
cgit 1.4.1


From 6488ac29a4090a9d09e8c8794ac287c11a2241b2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 19:36:20 +0200
Subject: gnu: texlive-xypic: Fix build.

* gnu/packages/tex.scm (texlive-xypic)[native-inputs]: Add TEXLIVE-CM,
TEXLIVE-METAFONT.
---
 gnu/packages/tex.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 607f3fd0f7..a73a9b6144 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9912,8 +9912,8 @@ glyphs.")
               "09b51bbm189xh7039h5n8nmab5nn2bybhh26qjn08763m80zdhjg")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics texlive-iftex))
+    (native-inputs (list texlive-cm texlive-metafont))
+    (propagated-inputs (list texlive-graphics texlive-iftex))
     (home-page "https://ctan.org/pkg/xypic")
     (synopsis "Flexible diagramming macros")
     (description
-- 
cgit 1.4.1


From a26fac9028707d55562b4d4cccf86fa2b9ccc769 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 15:43:50 +0200
Subject: gnu: Add texlive-sansmathfonts.

* gnu/packages/tex.scm (texlive-sansmathfonts): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a73a9b6144..dd159e3c61 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4140,6 +4140,32 @@ 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-sansmathfonts
+  (package
+    (name "texlive-sansmathfonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/sansmathfonts/"
+                   "fonts/map/dvips/sansmathfonts/"
+                   "fonts/source/public/sansmathfonts/"
+                   "fonts/tfm/public/sansmathfonts/"
+                   "fonts/type1/public/sansmathfonts/"
+                   "fonts/vf/public/sansmathfonts/"
+                   "tex/latex/sansmathfonts/")
+             (base32
+              "1l6q26590kdr2b24psdwgjw199p3sgk2hh74gq6fd6qircc1z3cy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs
+     (list texlive-amsfonts texlive-cm texlive-ec texlive-metafont))
+    (home-page "https://ctan.org/pkg/sansmathfonts")
+    (synopsis "Correct placement of accents in sans-serif maths")
+    (description
+     "This package provides sans serif small caps and math fonts for use with
+Computer Modern.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-stringenc
   (package
     (name "texlive-stringenc")
-- 
cgit 1.4.1


From f3f888ea55e7f34b7d36fd6ae921c91931f16ee4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 19 May 2023 21:41:11 +0200
Subject: gnu: Add texlive-semaphor.

* gnu/packages/tex.scm (texlive-semaphor): New variable.
---
 gnu/packages/tex.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dd159e3c61..5d7ba3b611 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5762,6 +5762,36 @@ corresponding thing with the page reference of the label.")
 characters and their glyph names.")
     (license license:lppl1.3+)))
 
+(define-public texlive-semaphor
+  (package
+    (name "texlive-semaphor")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/semaphor/"
+                   "fonts/afm/public/semaphor/"
+                   "fonts/enc/dvips/semaphor/"
+                   "fonts/map/dvips/semaphor/"
+                   "fonts/opentype/public/semaphor/"
+                   "fonts/source/public/semaphor/"
+                   "fonts/tfm/public/semaphor/"
+                   "fonts/type1/public/semaphor/"
+                   "tex/context/third/semaphor/"
+                   "tex/latex/semaphor/"
+                   "tex/plain/semaphor/")
+             (base32
+              "1yigah8x75fd13x0f6ncpp21ly75nyfz6h5y5sfc590n7wcm0gvr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/semaphor")
+    (synopsis "Semaphore alphabet font")
+    (description
+     "These fonts represent semaphore in a highly schematic, but very clear,
+fashion.  The fonts are provided as Metafont source, and in both OpenType and
+Adobe Type 1 formats.")
+    (license license:gpl3+)))
+
 (define-public texlive-seminar
   (package
     (name "texlive-seminar")
-- 
cgit 1.4.1


From 64c3ae85b742027c0a95c2d8046f9f7fb8c66a90 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 27 May 2023 17:57:17 +0200
Subject: gnu: Add texlive-knuth-local.

* gnu/packages/tex.scm (texlive-knuth-local): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5d7ba3b611..8695828d6e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1463,6 +1463,28 @@ Knuth, including the plain format, plain base, and the MF logo fonts.")
 
 (define-deprecated-package texlive-fonts-knuth-lib texlive-knuth-lib)
 
+(define-public texlive-knuth-local
+  (package
+    (name "texlive-knuth-local")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/source/public/knuth-local/"
+                   "fonts/tfm/public/knuth-local/"
+                   "mft/knuth-local/" "tex/plain/knuth-local/")
+             (base32
+              "02cf32f57fr6bngiv9xiw8bh4sq53p9br034ap74s80h3bgcmn1f")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/knuth-local")
+    (native-inputs
+     (list texlive-knuth-lib texlive-metafont))
+    (synopsis "Knuth's local information")
+    (description
+     "This package provides a collection of experimental programs and
+developments based on, or complementary to, the matter in his distribution
+directories.")
+    (license license:public-domain)))
+
 (define-public texlive-latex-fonts
   (package
     (name "texlive-latex-fonts")
-- 
cgit 1.4.1


From 68d9c5da482c0021674582e5d4ed1cc19fd836f3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 20 May 2023 09:45:22 +0200
Subject: gnu: texlive-xindy: Use TEXLIVE-BUILD-SYSTEM and related tools.

* gnu/packages/tex.scm (texlive-xindy)[source]: Use TEXLIVE-ORIGIN.
[build-system]: Use TEXLIVE-BUILD-SYSTEM.
[arguments]<#:phases>: Also set Perl executable location in scripts.
---
 gnu/packages/tex.scm | 71 +++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8695828d6e..350b1c9880 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12142,49 +12142,46 @@ handle complex tests.")
 (define-public texlive-xindy
   (package
     (name "texlive-xindy")
-    (version "2.5.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://ctan/indexing/xindy/base/xindy-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0hxsx4zw19kmixkmrln17sxgg1ln4pfp4lpfn5v5fyr1nwfyk3ic"))))
-    (build-system gnu-build-system)
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/tex2xindy.1"
+                   "doc/man/man1/tex2xindy.man1.pdf"
+                   "doc/man/man1/texindy.1"
+                   "doc/man/man1/texindy.man1.pdf"
+                   "doc/man/man1/xindy.1"
+                   "doc/man/man1/xindy.man1.pdf"
+                   "doc/xindy/"
+                   "scripts/xindy/"
+                   "xindy/")
+             (base32
+              "0rgzckyy6w4rmgxins5kakllkpn2hrccaps7lwb8h2nzvd29yj3m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (arguments
      (list
-      #:configure-flags #~(list "--enable-docs")
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-clisp
+          (add-after 'unpack 'patch-inputs
             (lambda* (#:key inputs #:allow-other-keys)
-              ;; The xindy.in file is encoded in ISO-8859-1 (or iso-latin-1).
-              (with-fluids ((%default-port-encoding "ISO-8859-1"))
-                (substitute* "user-commands/xindy.in"
-                  (("(our \\$clisp = ).*" _ head)
-                   (format #f "our $clisp = ~s;~%"
-                           (search-input-file inputs "bin/clisp"))))))))))
-    (native-inputs (list clisp
-                         glibc-locales
-                         perl
-                         texlive-bin
-                         texlive-greek-fontenc
-                         texlive-hyperref
-                         texlive-latex-base
-                         texlive-cyrillic
-                         texlive-geometry
-                         (texlive-updmap.cfg ;fonts
-                          (list texlive-cbfonts
-                                texlive-lh
-                                texlive-jknapltx))))
-    (inputs (list clisp perl))          ;used at run time
-    (home-page "https://www.ctan.org/pkg/xindy")
+              (with-directory-excursion "scripts/xindy/"
+                ;; The scripts are encoded in ISO-8859-1 (or iso-latin-1).
+                (with-fluids ((%default-port-encoding "ISO-8859-1"))
+                  (substitute* (list "texindy.pl" "xindy.pl")
+                    (("our \\$clisp = .*")
+                     (format #f "our $clisp = ~s;~%"
+                             (search-input-file inputs "/bin/clisp")))
+                    (("/usr/bin/env perl")
+                     (search-input-file inputs "/bin/perl"))))))))))
+    (inputs (list clisp perl))
+    (home-page "https://ctan.org/pkg/xindy")
     (synopsis "General-purpose index processor")
-    (description "Xindy was developed after an impasse had been encountered in
-the attempt to complete internationalisation of @command{makeindex}.  Xindy
-can be used to process indexes for documents marked up using (La)TeX, Nroff
-family and SGML-based languages.  Xindy is highly configurable, both in markup
-terms and in terms of the collating order of the text being processed.")
+    (description
+     "Xindy was developed after an impasse had been encountered in the attempt
+to complete internationalisation of @command{makeindex}.  Xindy can be used to
+process indexes for documents marked up using (La)TeX, Nroff family and
+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-nth
-- 
cgit 1.4.1


From a91171ad635884977248276c4aa6a9ee1ec409af Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 27 May 2023 15:29:18 +0200
Subject: guix: import: Fix Creative Common licenses in texlive importer.

* guix/import/texlive.scm (string->license): Fix symbol used for some CC-BY
licenses.  Add version 4.0 for CC-BY and CC-BY-SA.
---
 guix/import/texlive.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index fd772d3133..46680a0b6b 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -90,10 +90,12 @@
     ("lppl1.3a" 'lppl1.3a)
     ("lppl1.3b" 'lppl1.3b)
     ("lppl1.3c" 'lppl1.3c)
-    ("cc-by-2" 'cc-by-2.0)
-    ("cc-by-3" 'cc-by-3.0)
+    ("cc-by-2" 'cc-by2.0)
+    ("cc-by-3" 'cc-by3.0)
+    ("cc-by-4" 'cc-by4.0)
     ("cc-by-sa-2" 'cc-by-sa2.0)
     ("cc-by-sa-3" 'cc-by-sa3.0)
+    ("cc-by-sa-4" 'cc-by-sa4.0)
     ("mit" 'expat)
     ("fdl" 'fdl1.3+)
     ("gfl" 'gfl1.0)
-- 
cgit 1.4.1


From 293abb4c4e72617de2e83ccb271fce4792988492 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 27 May 2023 17:54:17 +0200
Subject: guix: texlive-build-system: Handle doc-only packages gracefully.

* guix/build/texlive-build-system.scm (install): Always create #$output, even
if it is empty.
---
 guix/build/texlive-build-system.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/guix/build/texlive-build-system.scm b/guix/build/texlive-build-system.scm
index 4f3938213f..eeb23c4645 100644
--- a/guix/build/texlive-build-system.scm
+++ b/guix/build/texlive-build-system.scm
@@ -207,8 +207,10 @@ runfile to replace.  If a file has no matching runfile, it is ignored."
       (let ((doc-dir (string-append (or doc out) "/share/texmf-dist/doc")))
         (mkdir-p doc-dir)
         (copy-recursively "doc" doc-dir)))
-    ;; Handle runfiles.
-    (let ((texmf (string-append (assoc-ref outputs "out") "/share/texmf-dist")))
+    ;; Install runfiles.  The package may not contain any, though.  Create
+    ;; #$output anyway to handle this situation gracefully.
+    (mkdir-p out)
+    (let ((texmf (string-append out "/share/texmf-dist")))
       (for-each (lambda (root)
                   (let ((destination (string-append texmf "/" root)))
                     (mkdir-p destination)
-- 
cgit 1.4.1


From d62b35bbe922b94baffe1ffcf810ad5f29669e5d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 27 May 2023 21:39:26 +0200
Subject: guix: import: Improve importing texlive meta packages.

* guix/import/texlive.scm (tlpdb->package): Generate more appropriate source,
home page and license fields when importing meta packages, i.e., TeX Live
collections and schemes.
* tests/texlive.scm (%fake-tlpdb): Add test data.
("texlive->guix-package, meta-package"): New test.
---
 guix/import/texlive.scm | 112 +++++++++++++++++++++++++-----------------------
 tests/texlive.scm       |  39 +++++++++++++++++
 2 files changed, 98 insertions(+), 53 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 46680a0b6b..da58c8d13f 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -300,59 +300,65 @@ of those files are returned that are unexpectedly installed."
              (source (with-store store
                        (download-multi-svn-to-store
                         store ref (string-append name "-svn-multi-checkout")))))
-    (values
-     `(package
-        (name ,name)
-        (version (number->string %texlive-revision))
-        (source (texlive-origin
-                 name version
-                 (list ,@(sort locs string<))
-                 (base32
-                  ,(bytevector->nix-base32-string
-                    (let-values (((port get-hash) (open-sha256-port)))
-                      (write-file source port)
-                      (force-output port)
-                      (get-hash))))))
-        ,@(if (assoc-ref data 'docfiles)
-              '((outputs '("out" "doc")))
-              '())
-        (build-system texlive-build-system)
-        ;; Texlive build system generates font metrics whenever a font metrics
-        ;; file has the same base name as a Metafont file.
-        ,@(or (and-let* ((runfiles (assoc-ref data 'runfiles))
-                         (metrics
-                          (filter-map (lambda (f)
-                                        (and (string-suffix? ".tfm" f)
-                                             (basename f ".tfm")))
-                                      runfiles))
-                         ((not (null? metrics)))
-                         ((any (lambda (f)
-                                 (and (string-suffix? ".mf" f)
-                                      (member (basename f ".mf") metrics)))
-                               runfiles)))
-                '((native-inputs (list texlive-metafont))))
-              '())
-        ,@(match filtered-depends
-            (() '())
-            (inputs
-             `((propagated-inputs
-                (list ,@(map
-                         (lambda (tex-name)
-                           (let ((name (guix-name tex-name)))
-                             (string->symbol name)))
-                         ;; Sort inputs alphabetically.
-                         (reverse inputs)))))))
-        (home-page
-         ,(or (and=> (or (assoc-ref data 'catalogue)
-                         (assoc-ref data 'name))
-                     (lambda (name)
-                       (string-append "https://ctan.org/pkg/" name)))
-              "https://www.tug.org/texlive/"))
-        (synopsis ,(assoc-ref data 'shortdesc))
-        (description ,(and=> (assoc-ref data 'longdesc) beautify-description))
-        (license ,(and=> (assoc-ref data 'catalogue-license)
-                         string->license)))
-     filtered-depends)))
+    (let ((meta-package? (null? locs)))
+      (values
+       `(package
+          (name ,name)
+          (version (number->string %texlive-revision))
+          (source ,(and (not meta-package?)
+                        `(texlive-origin
+                          name version
+                          (list ,@(sort locs string<))
+                          (base32
+                           ,(bytevector->nix-base32-string
+                             (let-values (((port get-hash) (open-sha256-port)))
+                               (write-file source port)
+                               (force-output port)
+                               (get-hash)))))))
+          ,@(if (assoc-ref data 'docfiles)
+                '((outputs '("out" "doc")))
+                '())
+          (build-system texlive-build-system)
+          ;; Texlive build system generates font metrics whenever a font
+          ;; metrics file has the same base name as a Metafont file.
+          ,@(or (and-let* ((runfiles (assoc-ref data 'runfiles))
+                           (metrics
+                            (filter-map (lambda (f)
+                                          (and (string-suffix? ".tfm" f)
+                                               (basename f ".tfm")))
+                                        runfiles))
+                           ((not (null? metrics)))
+                           ((any (lambda (f)
+                                   (and (string-suffix? ".mf" f)
+                                        (member (basename f ".mf") metrics)))
+                                 runfiles)))
+                  '((native-inputs (list texlive-metafont))))
+                '())
+          ,@(match filtered-depends
+              (() '())
+              (inputs
+               `((propagated-inputs
+                  (list ,@(filter-map
+                           (lambda (tex-name)
+                             (let ((name (guix-name tex-name)))
+                               (string->symbol name)))
+                           ;; Sort inputs alphabetically.
+                           (reverse inputs)))))))
+          (home-page
+           ,(cond
+             (meta-package? "https://www.tug.org/texlive/")
+             ((or (assoc-ref data 'catalogue) (assoc-ref data 'name)) =>
+              (cut string-append "https://ctan.org/pkg/" <>))
+             (else "https://www.tug.org/texlive/")))
+          (synopsis ,(assoc-ref data 'shortdesc))
+          (description ,(and=> (assoc-ref data 'longdesc) beautify-description))
+          (license
+           ,(cond
+             (meta-package?
+              '(license:fsf-free "https://www.tug.org/texlive/copying.html"))
+             ((assoc-ref data 'catalogue-license) => string->license)
+             (else #f))))
+       filtered-depends))))
 
 (define texlive->guix-package
   (memoize
diff --git a/tests/texlive.scm b/tests/texlive.scm
index 704c86e24a..4172262fb2 100644
--- a/tests/texlive.scm
+++ b/tests/texlive.scm
@@ -62,6 +62,11 @@
          .
          ("texmf-dist/tex/latex/chs-physics-report/chs-physics-report.sty"))
         (catalogue-license . "pd cc-by-sa-3")))
+    ("collection-texworks"
+     (name . "collection-texworks")
+     (shortdesc . "TeXworks editor...")
+     (longdesc . "See http...")
+     (depend "texworks" "collection-basic"))
     ("example"
      . ((name . "example")
         (shortdesc . "Typeset examples...")
@@ -401,4 +406,38 @@ completely compatible with Plain TeX.")
                (format #t "~s~%" result)
                (pk 'fail result #f)))))))
 
+(test-assert "texlive->guix-package, meta-package"
+  ;; Replace network resources with sample data.
+  (mock ((guix build svn) svn-fetch
+         (lambda* (url revision directory
+                       #:key (svn-command "svn")
+                       (user-name #f)
+                       (password #f)
+                       (recursive? #t))
+           (mkdir-p directory)
+           (with-output-to-file (string-append directory "/foo")
+             (lambda ()
+               (display "source")))))
+        (let ((result (texlive->guix-package "collection-texworks"
+                                             #:package-database
+                                             (lambda _ %fake-tlpdb))))
+          (match result
+            (('package
+               ('name "texlive-collection-texworks")
+               ('version _)
+               ('source #f)
+               ('build-system 'texlive-build-system)
+               ('propagated-inputs
+                ('list 'texlive-collection-basic 'texlive-texworks))
+               ('home-page "https://www.tug.org/texlive/")
+               ('synopsis (? string?))
+               ('description (? string?))
+               ('license
+                ('license:fsf-free "https://www.tug.org/texlive/copying.html")))
+             #true)
+            (_
+             (begin
+               (format #t "~s~%" result)
+               (pk 'fail result #f)))))))
+
 (test-end "texlive")
-- 
cgit 1.4.1


From 62fad0e46e6661b1336785069abea01651bbb35b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 28 May 2023 00:02:48 +0200
Subject: gnu: Add texlive-etex-pkg.

* gnu/packages/tex.scm (texlive-etex-pkg): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 350b1c9880..fc85896300 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1668,6 +1668,27 @@ programmers may assume e-TeX functionality.  The pdftex engine directly
 incorporates the e-TeX extensions.")
     (license license:knuth)))
 
+(define-public texlive-etex-pkg
+  (package
+    (name "texlive-etex-pkg")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/etex-pkg/" "tex/latex/etex-pkg/")
+             (base32
+              "10bvvn3s3lmzjscnb2qxkj1ba9qxx0q1w2spcsjpwf20dvym19py")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/etex-pkg")
+    (synopsis "E-TeX support package")
+    (description
+     "The package provides support for LaTeX documents to use many of the
+extensions offered by e-TeX; in particular, it modifies LaTeX's register
+allocation macros to make use of the extended register range.  The
+@code{etextools} package provides macros that make more sophisticated use of
+e-TeX's facilities.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-plain
   (package
     (name "texlive-plain")
-- 
cgit 1.4.1


From 8fe63131bab18099d54694233d0911e43ae241fa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 28 May 2023 00:07:48 +0200
Subject: gnu: Add texlive-mfware.

* gnu/packages/tex.scm (texlive-mfware): New variable.
---
 gnu/packages/tex.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fc85896300..c67f109b34 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1563,6 +1563,36 @@ Taco Hoekwater.")
 
 (define-deprecated-package texlive-fonts-mflogo-font texlive-mflogo-font)
 
+(define-public texlive-mfware
+  (package
+    (name "texlive-mfware")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/gftodvi.1"
+                   "doc/man/man1/gftodvi.man1.pdf"
+                   "doc/man/man1/gftopk.1"
+                   "doc/man/man1/gftopk.man1.pdf"
+                   "doc/man/man1/gftype.1"
+                   "doc/man/man1/gftype.man1.pdf"
+                   "doc/man/man1/mft.1"
+                   "doc/man/man1/mft.man1.pdf"
+                   "doc/man/man1/pktogf.1"
+                   "doc/man/man1/pktogf.man1.pdf"
+                   "doc/man/man1/pktype.1"
+                   "doc/man/man1/pktype.man1.pdf"
+                   "mft/base/")
+             (base32
+              "0v8i6w5kinh11xm0vmgb75sxb4lxznf3l1j78dq6xh55a79330ha")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mfware")
+    (synopsis "Supporting tools for use with Metafont")
+    (description
+     "This package provides a collection of programs (as web source) for
+processing the output of Metafont.")
+    (license license:public-domain)))
+
 (define-public texlive-amsfonts
   (package
     (name "texlive-amsfonts")
-- 
cgit 1.4.1


From f4dadc5b496e34bd660caace3e66e530bb353b38 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 28 May 2023 08:26:34 +0200
Subject: gnu: faif: Update texlive package names.

* gnu/packages/fsf.scm (book-faif)[native-inputs]: Replace TEXLIVE-FONTS-EC,
TEXLIVE-LATEX-FNCYCHAP, TEXLIVE-LATEX-GEOMETRY, TEXLIVE-LATEX-UCS with
TEXLIVE-EC, TEXLIVE-FNCYCHAP, TEXLIVE-GEOMETRY, TEXLIVE-UCS.
---
 gnu/packages/fsf.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/fsf.scm b/gnu/packages/fsf.scm
index 16d2179e02..b07ad14164 100644
--- a/gnu/packages/fsf.scm
+++ b/gnu/packages/fsf.scm
@@ -38,16 +38,15 @@
     (build-system copy-build-system)
     (native-inputs
      (list (texlive-updmap.cfg
-            (list
-             texlive-caption
-             texlive-endnotes
-             texlive-fonts-ec
-             texlive-helvetic
-             texlive-hyperref
-             texlive-latex-fncychap
-             texlive-latex-geometry
-             texlive-latex-ucs
-             texlive-times))))
+            (list texlive-caption
+                  texlive-ec
+                  texlive-endnotes
+                  texlive-fncychap
+                  texlive-geometry
+                  texlive-helvetic
+                  texlive-hyperref
+                  texlive-times
+                  texlive-ucs))))
     (arguments
      (list
       #:install-plan #~'(("faif-2.0.pdf" "share/doc/faif/"))
-- 
cgit 1.4.1


From dddb774ec40fc3e3abb20e64d752729389dc8e8a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 28 May 2023 16:48:30 +0200
Subject: gnu: texlive-texmf: Improve package style.

* gnu/packages/tex.scm (texlive-texmf)[version]: Inherit from TEXLIVE-BIN.
[source]: Use autonomous origin instead of relying on another layer.
[inputs]: Remove labels.  Sort alphabetically.
[arguments]: Use G-expressions.  Remove trailing #T from phases.
(texlive-texmf-src): Remove variable.
---
 gnu/packages/tex.scm | 77 ++++++++++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c67f109b34..f128338dc9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -194,13 +194,6 @@ use."
     (sha256 (base32
              "171kg1n9zapw3d2g47d8l0cywa99bl9m54xkqvp9625ks22z78s6"))))
 
-(define texlive-texmf-src
-  (origin
-    (method url-fetch)
-    (uri "ftp://tug.org/historic/systems/texlive/2021/texlive-20210325-texmf.tar.xz")
-    (sha256 (base32
-             "070gczcm1h9rx29w2f02xd3nhd84c4k28nfmm8qgp69yq8vd84pz"))))
-
 (define-public texlive-bin
   (package
     (name "texlive-bin")
@@ -8657,51 +8650,57 @@ documents as well as DVI output.")
 
 (define texlive-texmf
   (package
-   (name "texlive-texmf")
-   (version "20210325")
-   (source texlive-texmf-src)
-   (build-system gnu-build-system)
-   (inputs
-    `(("texlive-bin" ,texlive-bin)
-      ("lua" ,lua)
-      ("perl" ,perl)
-      ("python" ,python)
-      ("ruby" ,ruby)
-      ("tcsh" ,tcsh)))
-   (arguments
-    `(#:modules ((guix build gnu-build-system)
-                 (guix build utils)
-                 (srfi srfi-26))
+    (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
+                "070gczcm1h9rx29w2f02xd3nhd84c4k28nfmm8qgp69yq8vd84pz"))))
+    (build-system gnu-build-system)
+    (inputs
+     (list lua
+           perl
+           python
+           ruby
+           tcsh
+           texlive-bin))
+    (arguments
+     (list
+      #: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)
+      #~(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))
+              (unsetenv "TEXMFCNF")))
           (add-after 'patch-source-shebangs 'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((share (string-append (assoc-ref outputs "out") "/share")))
+            (lambda _
+              (let ((share (string-append #$output "/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"))
+            (lambda _
+              (let* ((share (string-append #$output "/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"))
+                     (texlive-bin #$(this-package-input "texlive-bin"))
                      (texbin (string-append texlive-bin "/bin"))
                      (tlpkg (string-append texlive-bin "/share/tlpkg")))
                 ;; LuaJIT is not ported to powerpc64* yet.
-                (if ,(target-ppc64le?)
+                (if #$(target-ppc64le?)
                     (substitute* fmtutilcnf
                       (("^(luajittex|luajithbtex|mfluajit)" m)
                        (string-append "#! " m))))
@@ -8714,7 +8713,7 @@ documents as well as DVI output.")
                   (("!!\\$TEXMFLOCAL") "$TEXMFLOCAL"))
                 ;; Register paths in texmfcnf.lua, needed for context.
                 (substitute* (string-append texmfroot "/texmfcnf.lua")
-                  (("selfautodir:") out)
+                  (("selfautodir:") #$output)
                   (("selfautoparent:") (string-append share "/")))
                 ;; Set path to TeXLive Perl modules
                 (setenv "PERL5LIB"
@@ -8726,17 +8725,17 @@ documents as well as DVI output.")
                 (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.
+    (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/")))
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))
+    (home-page "https://www.tug.org/texlive/")))
 
 (define-public texlive
   (package
-- 
cgit 1.4.1


From aab0dee520ffacfe2abd02659b487c3762aeee8b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 28 May 2023 16:54:32 +0200
Subject: gnu: texlive: Improve package style.

* gnu/packages/tex.scm (texlive)[version]: Inherit from TEXLIVE-BIN.
[inputs]: Remove labels.
[arguments]: Use G-expressions.  Remove trailing #T from phases.
---
 gnu/packages/tex.scm | 111 +++++++++++++++++++++++++--------------------------
 1 file changed, 55 insertions(+), 56 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f128338dc9..69bf45ed08 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8739,66 +8739,65 @@ This package contains the complete tree of texmf-dist data.")
 
 (define-public texlive
   (package
-   (name "texlive")
-   (version "20210325")
-   (source #f)
-   (build-system trivial-build-system)
-   (inputs `(("bash" ,bash-minimal)     ;for wrap-program
-             ("texlive-bin" ,texlive-bin)
-             ("texlive-texmf" ,texlive-texmf)))
-   (native-search-paths
-    (list (search-path-specification
-           (variable "TEXMFLOCAL")
-           (files '("share/texmf-local")))))
-   (arguments
-    `(#:modules ((guix build utils))
+    (name "texlive")
+    (version (package-version texlive-bin))
+    (source #f)
+    (build-system trivial-build-system)
+    (inputs
+     (list bash-minimal                 ;for wrap-program
+           texlive-bin
+           texlive-texmf))
+    (native-search-paths
+     (list (search-path-specification
+            (variable "TEXMFLOCAL")
+            (files '("share/texmf-local")))))
+    (arguments
+     (list
+      #: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
+      ;; 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.
+          (let ((bin #$(this-package-input "texlive-bin"))
+                (texmf #$(this-package-input "texlive-texmf"))
+                (bash #$(this-package-input "bash-minimal")))
+            (mkdir #$output)
+            (with-directory-excursion #$output
+              (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"))))))))
+    (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/")))
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))
+    (home-page "https://www.tug.org/texlive/")))
 
 (define-public perl-text-bibtex
   (package
-- 
cgit 1.4.1


From 7ce20143a7ccddf54b878f51ef856ea3e717587f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 4 Jun 2023 10:38:11 +0200
Subject: guix: texlive-build-system: Generate TeX formats.

* guix/build-system/texlive.scm (texlive-build): Add #:CREATE-FORMATS argument.
* doc/guix.texi (Build Systems): Document it.
* guix/build/texlive-build-system.scm (texlive-input?): New function.
(generate-font-metrics): Use new function above.
(create-formats): New function.
(%standard-phases): Add function above to phases.
---
 doc/guix.texi                       |  4 +++-
 guix/build-system/texlive.scm       |  2 ++
 guix/build/texlive-build-system.scm | 34 +++++++++++++++++++++++++++++++---
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 2e03e3802f..e58bb65bd1 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10008,7 +10008,9 @@ Different build targets can be specified with the @code{#:build-targets}
 argument, which expects a list of file names.
 
 It also generates font metrics (i.e., @file{.tfm} files) out of METAFONT
-files whenever possible.
+files whenever possible.  Likewise, it can also create TeX formats
+(i.e., @file{.fmt} files) listed in the @code{#:create-formats}
+argument.
 
 The build system adds only @code{texlive-bin} and
 @code{texlive-latex-base} (both from @code{(gnu packages tex}) to the
diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm
index 55e9cfee81..e68cb87589 100644
--- a/guix/build-system/texlive.scm
+++ b/guix/build-system/texlive.scm
@@ -131,6 +131,7 @@ level package ID."
                         source
                         (tests? #f)
                         (build-targets #f)
+                        (create-formats #f)
                         (tex-engine #f)
 
                         ;; FIXME: This would normally default to "luatex" but
@@ -161,6 +162,7 @@ level package ID."
               #~(texlive-build #:name #$name
                                #:source #+source
                                #:build-targets #$build-targets
+                               #:create-formats #$create-formats
                                #:tex-engine #$(if tex-engine
                                                   tex-engine
                                                   tex-format)
diff --git a/guix/build/texlive-build-system.scm b/guix/build/texlive-build-system.scm
index eeb23c4645..8c56131051 100644
--- a/guix/build/texlive-build-system.scm
+++ b/guix/build/texlive-build-system.scm
@@ -44,6 +44,12 @@
            (negate
             (cut member <> '("." ".." "build" "doc" "source")))))
 
+(define (texlive-input? input)
+  "Return #t if INPUT is a texlive input, #f otherwise."
+  (match input
+    (((or "source" (? (cut string-prefix? "texlive-" <>))) . _) #t)
+    (_ #f)))
+
 (define (install-as-runfiles dir regexp)
   "Install files under DIR matching REGEXP on top of existing runfiles in the
 current tree.  Sub-directories below DIR are preserved when looking for the
@@ -97,8 +103,6 @@ runfile to replace.  If a file has no matching runfile, it is ignored."
   ;; each sub-directory as a separate font source.
   (define (font-sources root metrics)
     (delete-duplicates (map dirname (font-files root metrics))))
-  (define (texlive-input? input)
-    (string-prefix? "texlive-" input))
   (and-let* ((local-metrics (font-metrics "fonts/tfm"))
              (local-sources (font-sources "fonts/source" local-metrics))
              ((not (null? local-sources))) ;nothing to generate: bail out
@@ -113,7 +117,7 @@ runfile to replace.  If a file has no matching runfile, it is ignored."
              (font-inputs
               (delete-duplicates
                (append-map (match-lambda
-                             (((? (negate texlive-input?)) . _) '())
+                             ((? (negate texlive-input?)) '())
                              (("texlive-bin" . _) '())
                              (("texlive-metafont" . _)
                               (list (string-append metafont "/metafont/base")))
@@ -149,6 +153,29 @@ runfile to replace.  If a file has no matching runfile, it is ignored."
        (install-as-runfiles "build" "\\.tfm$"))
      local-sources)))
 
+(define* (create-formats #:key create-formats inputs #:allow-other-keys)
+  (define (collect-locations inputs pred)
+    (delete-duplicates
+     (append-map (match-lambda
+                   ((? (negate texlive-input?)) '())
+                   ((_ . dir)
+                    (if pred
+                        (map dirname (find-files dir pred))
+                        (list dir))))
+                 inputs)))
+  (when create-formats
+    (setenv "TFMFONTS"
+            (string-join (collect-locations inputs "\\.tfm$") ":"))
+    (setenv "TEXINPUTS"
+            (string-join (collect-locations inputs #f) "//:" 'suffix))
+    (setenv "LUAINPUTS"
+            (string-join (collect-locations inputs "\\.lua$") ":"))
+    (mkdir-p "web2c")
+    (for-each (cut invoke "fmtutil-sys" "--byfmt" <> "--fmtdir=web2c")
+              create-formats)
+    ;; Remove cruft.
+    (for-each delete-file (find-files "web2c" "\\.log$"))))
+
 (define (compile-with-latex engine format output file)
   (invoke engine
           "-interaction=nonstopmode"
@@ -224,6 +251,7 @@ runfile to replace.  If a file has no matching runfile, it is ignored."
     (add-before 'build 'delete-drv-files delete-drv-files)
     (add-after 'delete-drv-files 'generate-font-metrics generate-font-metrics)
     (replace 'build build)
+    (add-after 'build 'create-formats create-formats)
     (delete 'check)
     (replace 'install install)))
 
-- 
cgit 1.4.1


From 47913ab45276ff45ab47687e1b67b5bc103089df Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 4 Jun 2023 13:15:27 +0200
Subject: guix: Let texlive importer suggest format creation.

* guix/import/texlive.scm (tlpdb): Store "execute" entries.
(tlpdb->package): Add #:CREATE-FORMATS argument when there is an AddFormat
execute action.
* tests/texlive.scm (%fake-tlpdb): Add test data.
("texlive->guix-package, with TeX format"):
("texlive->guix-package, execute but no TeX format"): New tests.
---
 guix/import/texlive.scm |  20 +++++++-
 tests/texlive.scm       | 121 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+), 1 deletion(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index da58c8d13f..36c6f3efb1 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -156,7 +156,8 @@
               (srcfiles . list)
               (runfiles . list)
               (docfiles . list)
-              (depend   . simple-list)))
+              (depend   . simple-list)
+              (execute  . simple-list)))
            (record
             (lambda* (key value alist #:optional (type 'string))
               (let ((new
@@ -319,6 +320,23 @@ of those files are returned that are unexpectedly installed."
                 '((outputs '("out" "doc")))
                 '())
           (build-system texlive-build-system)
+          ;; Translate AddFormat execute actions into a `#:create-formats'
+          ;; argument.
+          ,@(or (and-let*
+                    ((actions (assoc-ref data 'execute))
+                     (formats
+                      (delete-duplicates
+                       (filter-map (lambda (action)
+                                     (match (string-split action #\space)
+                                       (("AddFormat" name . _)
+                                        (string-drop name
+                                                     (string-length "name=")))
+                                       (  #f)))
+                                   actions)))
+                     ((not (null? formats))))
+                  `((arguments
+                     (list #:create-formats #~(list ,@(reverse formats))))))
+                '())
           ;; Texlive build system generates font metrics whenever a font
           ;; metrics file has the same base name as a Metafont file.
           ,@(or (and-let* ((runfiles (assoc-ref data 'runfiles))
diff --git a/tests/texlive.scm b/tests/texlive.scm
index 4172262fb2..6633895ae1 100644
--- a/tests/texlive.scm
+++ b/tests/texlive.scm
@@ -50,6 +50,25 @@
         (runfiles
          . ("texmf-dist/tex/latex/12many/12many.sty"))
         (catalogue-license . "lppl")))
+    ("adforn"
+     (name . "adforn")
+     (shortdesc . "OrnementsADF font with TeX/LaTeX support")
+     (longdesc . "The bundle provides the Ornements ADF font...")
+     (execute "addMap OrnementsADF.map")
+     (docfiles
+      "texmf-dist/doc/fonts/adforn/COPYING"
+      "texmf-dist/doc/fonts/adforn/NOTICE"
+      "texmf-dist/doc/fonts/adforn/README"
+      "texmf-dist/doc/fonts/adforn/adforn.pdf")
+     (runfiles
+      "texmf-dist/fonts/afm/arkandis/adforn/OrnementsADF.afm"
+      "texmf-dist/fonts/enc/dvips/adforn/OrnementsADF.enc"
+      "texmf-dist/fonts/map/dvips/adforn/OrnementsADF.map"
+      "texmf-dist/fonts/tfm/arkandis/adforn/OrnementsADF.tfm"
+      "texmf-dist/fonts/type1/arkandis/adforn/OrnementsADF.pfb"
+      "texmf-dist/tex/latex/adforn/adforn.sty"
+      "texmf-dist/tex/latex/adforn/uornementsadf.fd")
+     (catalogue-license . "lppl gpl2"))
     ("chs-physics-report"
      . ((name . "ch-physics-report")
         (shortdesc . "Physics lab reports...")
@@ -75,6 +94,39 @@
          .
          ("texmf-dist/tex/latex/example/example.sty"))
         (catalogue-license . "gpl")))
+    ("lollipop"
+     (name . "lollipop")
+     (shortdesc . "TeX made easy")
+     (longdesc . "Lollipop is TeX made easy...")
+     (execute "AddFormat name=lollipop engine=tex options=\"lollipop.ini\"...")
+     (docfiles
+      "texmf-dist/doc/otherformats/lollipop/README"
+      "texmf-dist/doc/otherformats/lollipop/manual/address.tex"
+      "texmf-dist/doc/otherformats/lollipop/manual/appendix.tex"
+      "texmf-dist/doc/otherformats/lollipop/manual/btxmac.tex"
+      "texmf-dist/doc/otherformats/lollipop/manual/comm.tex"
+      "texmf-dist/doc/otherformats/lollipop/manual/comment.tex"
+      "texmf-dist/doc/otherformats/lollipop/manual/example.tex"
+      "texmf-dist/doc/otherformats/lollipop/manual/extern.tex"
+      "texmf-dist/doc/otherformats/lollipop/manual/head.tex"
+      "texmf-dist/doc/otherformats/lollipop/manual/list.tex"
+      "texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.bib"
+      "texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.pdf")
+     (runfiles
+      "texmf-dist/tex/lollipop/lollipop-define.tex"
+      "texmf-dist/tex/lollipop/lollipop-document.tex"
+      "texmf-dist/tex/lollipop/lollipop-float.tex"
+      "texmf-dist/tex/lollipop/lollipop-fontdefs.tex"
+      "texmf-dist/tex/lollipop/lollipop-fonts.tex"
+      "texmf-dist/tex/lollipop/lollipop-heading.tex"
+      "texmf-dist/tex/lollipop/lollipop-lists.tex"
+      "texmf-dist/tex/lollipop/lollipop-output.tex"
+      "texmf-dist/tex/lollipop/lollipop-plain.tex"
+      "texmf-dist/tex/lollipop/lollipop-text.tex"
+      "texmf-dist/tex/lollipop/lollipop-tools.tex"
+      "texmf-dist/tex/lollipop/lollipop.ini"
+      "texmf-dist/tex/lollipop/lollipop.tex")
+     (catalogue-license . "gpl3"))
     ("stricttex"
      . ((name
          . "stricttex")
@@ -440,4 +492,73 @@ completely compatible with Plain TeX.")
                (format #t "~s~%" result)
                (pk 'fail result #f)))))))
 
+(test-assert "texlive->guix-package, with TeX format"
+  ;; Replace network resources with sample data.
+  (mock ((guix build svn) svn-fetch
+         (lambda* (url revision directory
+                       #:key (svn-command "svn")
+                       (user-name #f)
+                       (password #f)
+                       (recursive? #t))
+           (mkdir-p directory)
+           (with-output-to-file (string-append directory "/foo")
+             (lambda ()
+               (display "source")))))
+        (let ((result (texlive->guix-package "lollipop"
+                                             #:package-database
+                                             (lambda _ %fake-tlpdb))))
+          (match result
+            (('package
+               ('name "texlive-lollipop")
+               ('version _)
+               ('source ('texlive-origin
+                         'name 'version
+                         ('list "doc/otherformats/lollipop/"
+                                "tex/lollipop/")
+                         ('base32 (? string? hash))))
+               ('outputs ''("out" "doc"))
+               ('build-system 'texlive-build-system)
+               ('arguments ('list '#:create-formats ('gexp ('list "lollipop"))))
+               ('home-page (? string?))
+               ('synopsis (? string?))
+               ('description (? string?))
+               ('license 'gpl3))
+             #true)
+            (_
+             (begin
+               (format #t "~s~%" result)
+               (pk 'fail result #f)))))))
+
+(test-assert "texlive->guix-package, execute but no TeX format"
+  ;; Replace network resources with sample data.
+  (mock ((guix build svn) svn-fetch
+         (lambda* (url revision directory
+                       #:key (svn-command "svn")
+                       (user-name #f)
+                       (password #f)
+                       (recursive? #t))
+           (mkdir-p directory)
+           (with-output-to-file (string-append directory "/foo")
+             (lambda ()
+               (display "source")))))
+        (let ((result (texlive->guix-package "adforn"
+                                             #:package-database
+                                             (lambda _ %fake-tlpdb))))
+          (match result
+            (('package
+               ('name "texlive-adforn")
+               ('version _)
+               ('source _)
+               ('outputs ''("out" "doc"))
+               ('build-system 'texlive-build-system)
+               ('home-page (? string?))
+               ('synopsis (? string?))
+               ('description (? string?))
+               ('license _))
+             #true)
+            (_
+             (begin
+               (format #t "~s~%" result)
+               (pk 'fail result #f)))))))
+
 (test-end "texlive")
-- 
cgit 1.4.1


From e8a3aaa97b015fb680cd219339102ca2f5877b8a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 4 Jun 2023 00:23:33 +0200
Subject: gnu: Add texlive-tex.

* gnu/packages/tex.scm (texlive-tex): New variable.
---
 gnu/packages/tex.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 69bf45ed08..9afc66540f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -549,6 +549,43 @@ This package contains the binaries.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))
     (home-page "https://www.tug.org/texlive/")))
 
+(define-public texlive-tex
+  (package
+    (name "texlive-tex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/initex.1"
+                   "doc/man/man1/initex.man1.pdf"
+                   "doc/man/man1/tex.1"
+                   "doc/man/man1/tex.man1.pdf")
+             (base32
+              "0njmxc6l84j44k48qh7d79n3qznzriz2pf8lkj09i7mkkj9fw9lf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:texlive-latex-base #f
+           #:create-formats #~(list "tex")))
+    (propagated-inputs
+     (list texlive-cm
+           texlive-hyphen-base
+           texlive-knuth-lib
+           texlive-kpathsea
+           texlive-plain))
+    (home-page "https://ctan.org/pkg/tex")
+    (synopsis "Sophisticated typesetting engine")
+    (description
+     "TeX is a typesetting system that incorporates a macro processor.  A TeX
+source document specifies or incorporates a number of macro definitions that
+instruct the TeX engine how to typeset the document.  The TeX engine also uses
+font metrics generated by Metafont, or by any of several other mechanisms that
+incorporate fonts from other sources into an environment suitable for TeX.
+TeX has been, and continues, a basis and an inspiration for several other
+programs, including e-TeX and PDFTeX.  The distribution includes the source of
+Knuth's TeX book; this source is there to read, as an example of writing TeX ;
+it should not be processed without Knuth's direct permission.")
+    (license license:knuth)))
+
 (define-public texlive-bidi
   (package
     (name "texlive-bidi")
-- 
cgit 1.4.1


From 3a434778627071a622a7e0ddd7cc81bb55f08a94 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 4 Jun 2023 00:23:13 +0200
Subject: gnu: Add texlive-hyphen-complete

* gnu/packages/tex.scm (texlive-hyphen-complete): New variable.
---
 gnu/packages/tex.scm | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9afc66540f..972ae10135 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -187,6 +187,160 @@ use."
     (description #f)
     (license #f)))
 
+(define-public texlive-hyphen-complete
+  (package
+    (name "texlive-hyphen-complete")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/dehyph-exptl/"
+                   "doc/generic/elhyphen"
+                   "doc/generic/huhyphen"
+                   "doc/generic/hyph-utf8/"
+                   "doc/luatex/hyph-utf8/"
+                   "doc/generic/ukrhyph/"
+                   "source/generic/hyph-utf8/"
+                   "source/luatex/hyph-utf8/"
+                   "source/generic/ruhyphen/"
+                   "tex/generic/config/"
+                   "tex/generic/dehyph/"
+                   "tex/generic/dehyph-exptl/"
+                   "tex/generic/hyph-utf8/"
+                   "tex/generic/hyphen/"
+                   "tex/generic/ruhyphen/"
+                   "tex/generic/ukrhyph/"
+                   "tex/luatex/hyph-utf8/")
+             (base32
+              "1k7rsi1a74xqvbqr7a84fyqj38jan82sz6h8dcxkx5cg3wa43pji")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:texlive-latex-base #f
+      #:tex-engine "tex"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-ruby-byebug-dependency
+            ;; Avoid dependency on byebug to reduce package closure
+            ;; significantly, see <https://issues.guix.gnu.org/55997>.
+            (lambda _
+              (substitute* "source/generic/hyph-utf8/lib/tex/hyphen/language.rb"
+                (("require 'byebug'") ""))))
+          (add-before 'build 'regenerate-converters
+            (lambda _
+              (let ((root (getcwd)))
+                (for-each delete-file
+                          (find-files "tex/generic/hyph-utf8/conversions/"))
+                (with-directory-excursion "source/generic/hyph-utf8"
+                  (substitute* "generate-converters.rb"
+                    (("\\$path_root=File.*")
+                     (string-append "$path_root=\"" root "\"\n"))
+                    ;; Avoid error with newer Ruby.
+                    (("#1\\{%") "#1{%%"))
+                  (invoke "ruby" "generate-converters.rb")))))
+          (add-before 'build 'regenerate-patterns
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let* ((root (getcwd))
+                     (hyph-utf8 (string-append root "/tex/generic/hyph-utf8"))
+                     (loaders (string-append hyph-utf8 "/loadhyph"))
+                     (patterns (string-append hyph-utf8 "/patterns/txt"))
+                     (ptex (string-append hyph-utf8 "/patterns/ptex"))
+                     (quote (string-append hyph-utf8 "/patterns/quote")))
+                ;; Initial clean-up.  Some files are not generated and need to
+                ;; be preserved.
+                (for-each delete-file (find-files loaders))
+                (let ((preserved (list "hyph-sr-cyrl.hyp.txt"
+                                       "hyph-sr-cyrl.pat.txt"
+                                       "hyph-de-1901.ec.tex"
+                                       "hyph-de-1996.ec.tex"
+                                       "hyph-ru.t2a.tex"
+                                       "hyph-uk.t2a.tex"
+                                       "hyph-zh-latn-pinyin.ec.tex")))
+                  (for-each
+                   (lambda (directory)
+                     (for-each delete-file
+                               (find-files directory
+                                           (lambda (f _)
+                                             (not (member (basename f)
+                                                          preserved))))))
+                   (list patterns ptex quote)))
+                ;; Generate plain patterns.  Write to the local directory.
+                ;; Install phase will take care of moving the files to the
+                ;; output.
+                (with-directory-excursion "source/generic/hyph-utf8/"
+                  (substitute* "lib/tex/hyphen/path.rb"
+                    (("^([[:blank:]]+)TeXROOT = .*" _ indent)
+                     (string-append indent "TeXROOT = \"" root "\"\n")))
+                  (substitute* "generate-plain-patterns.rb"
+                    ;; Ruby 2 does not need this.
+                    (("require 'unicode'") "")
+                    (("File\\.join\\(PATH::TXT")
+                     (string-append "File.join(\"" patterns "\""))
+                    (("File\\.join\\(PATH::QUOTE")
+                     (string-append "File.join(\"" quote "\"")))
+                  (invoke "ruby" "generate-plain-patterns.rb")
+                  ;; Build pattern loaders.
+                  (substitute* "generate-pattern-loaders.rb"
+                    (("File\\.join\\(PATH::LOADER")
+                     (string-append "File.join(\"" loaders "\"")))
+                  (invoke "ruby" "generate-pattern-loaders.rb")
+                  ;; Build ptex patterns.
+                  (substitute* "generate-ptex-patterns.rb"
+                    (("File\\.join\\(PATH::PTEX")
+                     (string-append "File.join(\"" ptex "\"")))
+                  (invoke "ruby" "generate-ptex-patterns.rb"))))))))
+    (native-inputs
+     (list ruby
+           ruby-hydra-minimal
+           texlive-docstrip
+           texlive-tex))
+    (home-page "https://ctan.org/pkg/hyph-utf8")
+    (synopsis "Hyphenation patterns expressed in UTF-8")
+    (description
+     "Modern native UTF-8 engines such as XeTeX and LuaTeX need hyphenation
+patterns in UTF-8 format, whereas older systems require hyphenation patterns
+in the 8-bit encoding of the font in use (such encodings are codified in the
+LaTeX scheme with names like OT1, T2A, TS1, OML, LY1, etc).  The present
+package offers a collection of conversions of existing patterns to UTF-8
+format, together with converters for use with 8-bit fonts in older systems.
+
+This Guix-specific package provides hyphenation patterns for all languages
+supported in TeX Live.  It is a strict super-set of code{hyphen-base} package
+and should be preferred to it whenever a package would otherwise depend on
+@code{hyph-utf8}.")
+    ;; Individual files each have their own license.  Most of these files are
+    ;; independent hyphenation patterns.
+    (license
+     (list license:asl2.0
+           license:bsd-3
+           license:cc0
+           license:expat
+           license:gpl2
+           license:gpl2+
+           license:gpl3+
+           license:knuth
+           license:lgpl2.1
+           license:lgpl2.1+
+           license:lgpl3+
+           license:lppl
+           license:lppl1.0+
+           license:lppl1.2+
+           license:lppl1.3
+           license:lppl1.3+
+           license:lppl1.3a+
+           license:mpl1.1
+           license:public-domain
+           license:wtfpl2
+           (license:fsf-free
+            "/tex/generic/hyph-utf8/patterns/tex/hyph-eu.tex")
+           (license:non-copyleft
+            "file:///tex/generic/hyph-utf8/patterns/tex/hyph-bg.tex"
+            "Ancestral BSD variant")
+           (license:non-copyleft
+            "file:///tex/generic/hyph-utf8/patterns/tex/hyph-en-us.tex"
+            "FSF all permissive license")))))
+
+
 (define texlive-extra-src
   (origin
     (method url-fetch)
-- 
cgit 1.4.1


From d0e7910165b98ae800bd282ed320e36745a8fd8b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 4 Jun 2023 00:29:00 +0200
Subject: gnu: Add texlive-latex.

* gnu/packages/tex.scm (texlive-latex): New variable.
---
 gnu/packages/tex.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 972ae10135..81668aa686 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -740,6 +740,44 @@ Knuth's TeX book; this source is there to read, as an example of writing TeX ;
 it should not be processed without Knuth's direct permission.")
     (license license:knuth)))
 
+(define-public texlive-latex
+  (package
+    (name "texlive-latex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/base/" "makeindex/latex/"
+                   "source/latex/base/" "tex/latex/base/")
+             (base32
+              "0k2b6qi281cl4zml6l537iyps1zwaq7pip81qq8vlkhb9h5ggpnw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:texlive-latex-base #f
+      #:tex-engine "tex"
+      #:tex-format #f
+      #:build-targets #~(list "unpack.ins")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-lua-build
+            ;; The literal tab in the dtx file is translated to the string
+            ;; "^^I" in the generated Lua file, which causes a syntax error.
+            (lambda _
+              (substitute* "source/latex/base/ltluatex.dtx"
+                (("\t") "  ")))))))
+    (propagated-inputs
+     (list texlive-latex-fonts
+           texlive-latexconfig
+           texlive-luatex
+           texlive-pdftex))
+    (home-page "https://ctan.org/pkg/latex")
+    (synopsis "TeX macro package that defines LaTeX")
+    (description
+     "LaTeX is a widely-used macro package for TeX, providing many basic
+document formating commands extended by a wide range of packages.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-bidi
   (package
     (name "texlive-bidi")
-- 
cgit 1.4.1


From 9e1e34bd8c91a5dadee18a873a2ec6023b3336e2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 4 Jun 2023 00:33:10 +0200
Subject: gnu: texlive-pdftex: Create formats.

* gnu/packages/tex.scm (texlive-pdftex)[source]: Do not grab all files
"tex/generic/config/" location.
[arguments]<#phases>: Create ETEX, PDFETEX and PDFTEX formats.
[propagated-inputs]: Remove TEXLIVE-DEHYPH, TEXLIVE-HYPHEN-BASE,
TEXLIVE-HYPH-UTF8.  Add TEXLIVE-HYPHEN-COMPLETE.
---
 gnu/packages/tex.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 81668aa686..382c433ed1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8852,18 +8852,20 @@ e-TeX.")
                    "fonts/tfm/public/pdftex/"
                    "fonts/type1/public/pdftex/"
                    "scripts/simpdftex/"
-                   "tex/generic/config/"
+                   "tex/generic/config/pdftex-dvi.tex"
                    "tex/generic/pdftex/")
              (base32
-              "1d2fvz0j7picfks57sacm5j4lwl4r231iia99fv5z71id9blr2vc")))
+              "182q6cy2crn2wwaljsq35g0kcmrngyjc307b4sh2zjdnkf8n58xx")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments
+     (list
+      #:texlive-latex-base #f
+      #:create-formats #~(list "etex" "pdfetex" "pdftex")))
     (propagated-inputs
      (list texlive-cm
-           texlive-dehyph
            texlive-etex
-           texlive-hyph-utf8
-           texlive-hyphen-base
+           texlive-hyphen-complete
            texlive-knuth-lib
            texlive-kpathsea
            texlive-plain
-- 
cgit 1.4.1


From 1a95d34bb8975b030ebda05ac29f702e70a69694 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 4 Jun 2023 00:37:57 +0200
Subject: gnu: texlive-babel: Do not rely on TEXLIVE-LATEX-BASE.

* gnu/packages/tex.scm (texlive-babel)[arguments]: Do not rely on
TEXLIVE-LATEX-BASE.
[native-inputs]: Add TEXLIVE-DOCSTRIP, TEXLIVE-PDFTEX.
---
 gnu/packages/tex.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 382c433ed1..5ce84cb757 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4883,6 +4883,7 @@ available as part of the AMS-LaTeX distribution.")
     (build-system texlive-build-system)
     (arguments
      (list
+      #:texlive-latex-base #f
       #:phases
       #~(modify-phases %standard-phases
           ;; This package tries to produce babel.aux twice but refuses to
@@ -4897,8 +4898,7 @@ available as part of the AMS-LaTeX distribution.")
                 (mkdir-p locale-directory)
                 (with-directory-excursion "source/latex/babel/"
                   (invoke "unzip" "locale.zip" "-d" locale-directory))))))))
-    (native-inputs
-     (list unzip))
+    (native-inputs (list texlive-docstrip texlive-pdftex unzip))
     (home-page "https://www.ctan.org/pkg/babel")
     (synopsis "Multilingual support for Plain TeX or LaTeX")
     (description
-- 
cgit 1.4.1


From df5ae55ff7e4bf43f0417a20bbb6fcf69d5813bd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 4 Jun 2023 10:31:37 +0200
Subject: gnu: texlive-latex-base: Simplify package.

* gnu/packages/tex.scm (texlive-latex-base)[arguments]: Only build
DVILUALATEX, LATEX, LUALATEX and PDFLATEX formats.
[native-inputs]: Move them to propagated inputs.
[propagated-inputs]: Remove all specific hyphenation packages.  Replace them
with TEXLIVE-HYPHEN-COMPLETE.  Add TEXLIVE-BABEL, TEXLIVE-PDFTEX.
---
 gnu/packages/tex.scm | 172 ++++-----------------------------------------------
 1 file changed, 12 insertions(+), 160 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5ce84cb757..723c75f5cc 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3282,173 +3282,25 @@ formats.")
     (arguments
      (list
       #:texlive-latex-base #f
-      #:modules '((guix build texlive-build-system)
-                  (guix build utils)
-                  (ice-9 match)
-                  (srfi srfi-26))
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; The literal tab in the dtx file is translated to the string "^^I"
-          ;; in the generated Lua file, which causes a syntax error.
-          (add-after 'unpack 'fix-lua-sources
-            (lambda _
-              (substitute* "source/latex/base/ltluatex.dtx"
-                (("\t") "  "))))
-          (replace 'build
-            (lambda* (#:key inputs #:allow-other-keys)
-              ;; Find required fonts
-              (setenv "TFMFONTS"
-                      (string-join
-                       (map (match-lambda
-                              ((pkg-name . dir)
-                               (string-append
-                                (assoc-ref inputs pkg-name)
-                                "/share/texmf-dist/fonts/tfm/public"
-                                dir)))
-                            '(("texlive-etex" . "/etex")
-                              ("texlive-cm" . "/cm")
-                              ("texlive-latex-fonts" . "/latex-fonts")
-                              ("texlive-knuth-lib" . "/knuth-lib")))
-                       ":"))
-              (let ((cwd (getcwd)))
-                (setenv "TEXINPUTS"
-                        (string-append
-                         cwd "//:"
-                         cwd "/source/latex/base//:"
-                         cwd "/build:"
-                         (string-join
-                          (map (match-lambda ((_ . dir) dir)) inputs)
-                          "//:")))
-                (setenv "LUAINPUTS" (string-append cwd "/build:")))
-
-              ;; This is the actual build step.
-              (mkdir "build")
-              (invoke "tex" "-ini" "-interaction=scrollmode"
-                      "-output-directory=build" "unpack.ins")
-
-              ;; XXX: We can't build all formats at this point, nor are they
-              ;; part of the LaTeX base, so we disable them.  Actually, we
-              ;; should be running this all in a profile hook, so that only
-              ;; selected formats and hyphenation patterns are included, but it
-              ;; takes long and TeX Live isn't designed to be modular like
-              ;; that.  Everything operates on a shared directory, which we
-              ;; would only have at profile generation time.
-              (let ((disabled-formats
-                     '("aleph aleph" "lamed aleph" "uptex uptex" "euptex euptex"
-                       "eptex eptex" "ptex ptex" "pdfxmltex pdftex" "platex eptex"
-                       "platex-dev eptex" "uplatex-dev euptex"
-                       "csplain pdftex" "mf mf-nowin" "mex pdftex" "pdfmex pdftex"
-                       "luacsplain luatex" "optex luatex"
-                       ;; LuaJIT is not ported to powerpc64le* or riscv64 yet and
-                       ;; building these fail on powerpc.
-                       #$@(if (or (target-powerpc?)
-                                  (target-riscv64?))
-                              '("luajittex" "luajithbtex" "mfluajit") '())
-                       "cont-en xetex" "cont-en pdftex" "pdfcsplain xetex"
-                       "pdfcsplain pdftex" "pdfcsplain luatex" "cslatex pdftex"
-                       "mptopdf pdftex" "uplatex euptex" "jadetex pdftex"
-                       "amstex pdftex" "pdfcslatex pdftex" "lollipop tex"
-                       "xmltex pdftex" "pdfjadetex pdftex" "eplain pdftex"
-                       "texsis pdftex" "mltex pdftex" "utf8mex pdftex")))
-                (mkdir "web2c")
-                (install-file (string-append
-                               (assoc-ref inputs "texlive-kpathsea")
-                               "/share/texmf-dist/web2c/fmtutil.cnf")
-                              "web2c")
-                (make-file-writable "web2c/fmtutil.cnf")
-                (substitute* "web2c/fmtutil.cnf"
-                  (((string-append "^(" (string-join disabled-formats "|") ")") m)
-                   (string-append "#! " m))
-                  (("translate-file=cp227")
-                   (format #f "translate-file=~a/share/texmf-dist/web2c/cp227"
-                           (assoc-ref inputs "texlive-kpathsea")))))
-              (invoke "fmtutil-sys" "--all"
-                      "--fmtdir=web2c"
-                      (string-append "--cnffile=web2c/fmtutil.cnf"))
-              ;; We don't actually want to install it.
-              (delete-file "web2c/fmtutil.cnf")
-              ;; Also remove cruft.
-              (for-each delete-file (find-files "web2c" "\\.log$")))))))
-    (native-inputs
-     (list texlive-bin
+      #:tex-engine "tex"
+      #:tex-format #f
+      #:build-targets #~(list "unpack.ins")
+      #:create-formats #~(list "dvilualatex" "latex" "lualatex" "pdflatex")))
+    (propagated-inputs
+     (list texlive-babel
            texlive-cm
            texlive-etex
+           texlive-hyphen-complete
            texlive-knuth-lib
            texlive-kpathsea
-           texlive-latex-fonts
-           texlive-luatex
-           texlive-plain
-           texlive-tex-ini-files))
-    (propagated-inputs
-     (list texlive-dehyph-exptl
-           texlive-etex
-           texlive-hyph-utf8
-           texlive-hyphen-afrikaans
-           texlive-hyphen-ancientgreek
-           texlive-hyphen-armenian
-           texlive-hyphen-base
-           texlive-hyphen-basque
-           texlive-hyphen-belarusian
-           texlive-hyphen-bulgarian
-           texlive-hyphen-catalan
-           texlive-hyphen-chinese
-           texlive-hyphen-churchslavonic
-           texlive-hyphen-coptic
-           texlive-hyphen-croatian
-           texlive-hyphen-czech
-           texlive-hyphen-danish
-           texlive-hyphen-dutch
-           texlive-hyphen-english
-           texlive-hyphen-esperanto
-           texlive-hyphen-estonian
-           texlive-hyphen-ethiopic
-           texlive-hyphen-finnish
-           texlive-hyphen-french
-           texlive-hyphen-friulan
-           texlive-hyphen-galician
-           texlive-hyphen-georgian
-           texlive-hyphen-german
-           texlive-hyphen-greek
-           texlive-hyphen-hungarian
-           texlive-hyphen-icelandic
-           texlive-hyphen-indic
-           texlive-hyphen-indonesian
-           texlive-hyphen-interlingua
-           texlive-hyphen-irish
-           texlive-hyphen-italian
-           texlive-hyphen-kurmanji
-           texlive-hyphen-latin
-           texlive-hyphen-latvian
-           texlive-hyphen-lithuanian
-           texlive-hyphen-macedonian
-           texlive-hyphen-mongolian
-           texlive-hyphen-norwegian
-           texlive-hyphen-occitan
-           texlive-hyphen-pali
-           texlive-hyphen-piedmontese
-           texlive-hyphen-polish
-           texlive-hyphen-portuguese
-           texlive-hyphen-romanian
-           texlive-hyphen-romansh
-           texlive-hyphen-russian
-           texlive-hyphen-sanskrit
-           texlive-hyphen-schoolfinnish
-           texlive-hyphen-serbian
-           texlive-hyphen-slovak
-           texlive-hyphen-slovenian
-           texlive-hyphen-spanish
-           texlive-hyphen-swedish
-           texlive-hyphen-thai
-           texlive-hyphen-turkish
-           texlive-hyphen-turkmen
-           texlive-hyphen-ukrainian
-           texlive-hyphen-uppersorbian
-           texlive-hyphen-welsh
            texlive-l3backend
            texlive-l3kernel
+           texlive-latex-fonts
            texlive-latexconfig
-           texlive-ruhyphen
-           texlive-ukrhyph
+           texlive-luatex
+           texlive-pdftex
+           texlive-plain
+           texlive-tex-ini-files
            texlive-unicode-data
            ;; TODO: This dependency isn't needed for LaTeX version 2021-06-01
            ;; and later. See:
-- 
cgit 1.4.1


From 3801cb2b3e4aafaede289c7e84f9c6d19428b4d6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 4 Jun 2023 00:47:54 +0200
Subject: gnu: texlive-luatex: Create formats.

* gnu/packages/tex.scm (texlive-luatex)[source]: Do not grab all files in
"tex/generic/config/" location.
[arguments]: Create DVILUATEX and LUATEX formats.
[propagated-inputs]: Remove TEXLIVE-HYPH-UTF8, TEXLIVE-HYPHEN-BASE.  Add
TEXLIVE-HYPHEN-COMPLETE.
---
 gnu/packages/tex.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 723c75f5cc..c9613f0953 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4510,18 +4510,20 @@ in the same way as BSD/GNU @code{getopt_long(3)} functions do.")
                    "doc/man/man1/texlua.man1.pdf"
                    "doc/man/man1/texluac.1"
                    "doc/man/man1/texluac.man1.pdf"
-                   "tex/generic/config/"
+                   "tex/generic/config/luatex-unicode-letters.tex"
+                   "tex/generic/config/luatexiniconfig.tex"
                    "web2c/texmfcnf.lua")
              (base32
-              "1g5z1mjfclb85ppcxclwndmkkgjmczrq1547vhg4kl3cclg8348q")))
+              "1iskvy3i7kq0m39x7k8bs3w2l9bvqzcyzyfllfqr4rwpk4373k30")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments (list #:texlive-latex-base #f))
+    (arguments
+     (list #:texlive-latex-base #f
+           #:create-formats #~(list "dviluatex" "luatex")))
     (propagated-inputs
      (list texlive-cm
            texlive-etex
-           texlive-hyph-utf8
-           texlive-hyphen-base
+           texlive-hyphen-complete
            texlive-knuth-lib
            texlive-plain
            texlive-tex-ini-files
-- 
cgit 1.4.1


From 0eb2181d4be571d2d7c33f091986b1c68d964970 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 4 Jun 2023 00:58:24 +0200
Subject: gnu: texlive-xmltex: Rely on build system to create formats.

* gnu/packages/tex.scm (texlive-xmltex)[arguments]: Use #:CREATE-FORMATS.
Remove useless phase.
[propagated-inputs]: Remove call to TEXLIVE-UPDMAP.CFG.  Remove
TEXLIVE-AMSFONTS, TEXLIVE-COURIER, TEXLIVE-DEHYPH, TEXLIVE-HELVETIC,
TEXLIVE-HYPERREF, TEXLIVE-HYPHEN-BASE, TEXLIVE-HYPH-UTF8, TEXLIVE-STMARYRD,
TEXLIVE-SYMBOL, TEXLIVE-TIMES, TEXLIVE-TIPA, TEXLIVE-WASY, TEXLIVE-ZAPFDING.
Add TEXLIVE-HYPHEN-COMPLETE, TEXLIVE-LATEX, TEXLIVE-LATEXCONFIG,
TEXLIVE-PDFTEX, TEXLIVE-TEX, TEXLIVE-UNICODE-DATA.
---
 gnu/packages/tex.scm | 46 ++++++++++------------------------------------
 1 file changed, 10 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c9613f0953..a5a2aadfd4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3764,60 +3764,34 @@ and @code{pdfxmltex}.")
     (build-system texlive-build-system)
     (arguments
      (list
+      #:create-formats #~(list "pdfxmltex" "xmltex")
       #:phases
       #~(modify-phases %standard-phases
-          (add-before 'install 'generate-formats
-            (lambda _
-              (let ((web2c (string-append (getcwd) "/web2c")))
-                (mkdir "web2c")
-                (with-directory-excursion "tex/xmltex/base/"
-                  (invoke "fmtutil-sys"
-                          "--byfmt" "xmltex"
-                          (string-append"--fmtdir=" web2c))
-                  (invoke "fmtutil-sys"
-                          "--byfmt" "pdfxmltex"
-                          (string-append "--fmtdir=" web2c))))))
-          (add-after 'install 'install-formats-and-wrappers
+          (add-after 'install 'install-wrappers
             (lambda* (#:key inputs #:allow-other-keys)
               (let ((pdftex (search-input-file inputs "/bin/pdftex"))
                     (web2c (string-append #$output "/share/texmf-dist/web2c")))
-                (mkdir-p web2c)
-                (copy-recursively "web2c" web2c)
-                (for-each delete-file (find-files web2c "\\.log$"))
-                ;; Create convenience command wrappers.
                 (mkdir-p (string-append #$output "/bin"))
                 (symlink pdftex (string-append #$output "/bin/xmltex"))
                 (symlink pdftex (string-append #$output "/bin/pdfxmltex"))))))))
-    (native-inputs
-     (list texlive-tex-ini-files
-           texlive-xmltexconfig))
     (propagated-inputs
-     (list (texlive-updmap.cfg
-            (list texlive-amsfonts
-                  texlive-babel
-                  texlive-courier
-                  texlive-helvetic
-                  texlive-hyperref
-                  texlive-latex-fonts
-                  texlive-stmaryrd
-                  texlive-symbol
-                  texlive-times
-                  texlive-tipa
-                  texlive-wasy
-                  texlive-zapfding))
-           texlive-atbegshi
+     (list texlive-atbegshi
            texlive-atveryend
            texlive-babel
            texlive-cm
-           texlive-dehyph
            texlive-everyshi
            texlive-firstaid
-           texlive-hyph-utf8
-           texlive-hyphen-base
+           texlive-hyphen-complete
            texlive-l3backend
            texlive-l3kernel
            texlive-l3packages
+           texlive-latex
+           texlive-latex-fonts
+           texlive-latexconfig
+           texlive-pdftex
+           texlive-tex
            texlive-tex-ini-files
+           texlive-unicode-data
            texlive-xmltexconfig))
     (home-page "https://ctan.org/pkg/xmltex")
     (synopsis "Support for parsing XML documents")
-- 
cgit 1.4.1


From 40d208e28d3c53fe3b5f3ed3b1df0889b31da279 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 4 Jun 2023 08:47:16 +0200
Subject: gnu: Add texlive-luatex85.

* gnu/packages/tex.scm (texlive-luatex85): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a5a2aadfd4..e1d7a8e3dd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4542,6 +4542,25 @@ stub package provides a compatibility layer to allow existing packages to
 upgrade smoothly to the new support structure.")
     (license license:lppl1.3+)))
 
+(define-public texlive-luatex85
+  (package
+    (name "texlive-luatex85")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/luatex85/"
+                   "source/generic/luatex85/"
+                   "tex/generic/luatex85/")
+             (base32
+              "02j42g9c5smgbrk898fpvrgqlxqcqi8xch23awvnbvg6y54cs573")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luatex85")
+    (synopsis "pdfTeX aliases for LuaTeX")
+    (description
+     "The package provides emulation of pdfTeX primitives for LuaTeX v0.85+.")
+    (license license:lppl1.3+)))
+
 ;; TODO: We should be able to build this from the sources on Github with
 ;; texlive-l3build, but I haven't been able to get it to work.
 (define-public texlive-luaotfload
-- 
cgit 1.4.1


From 65d146a0c694c54f7813df91943a6b26f21871d3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 4 Jun 2023 08:50:41 +0200
Subject: gnu: texlive-csplain: Create formats.

* gnu/packages/tex.scm (texlive-csplain)[argumets]: Generate CSPLAIN,
LUACSPLAIN and PDFCSPLAIN formats.
[propagated-inputs]: Remove TEXLIVE-HYPHEN-BASE, TEXLIVE-HYPH-UTF8.  Add
TEXLIVE-HYPHEN-COMPLETE, TEXLIVE-LUATEX, TEXLIVE-LUATEX85, TEXLIVE-PLAIN,
TEXLIVE-TEX.
---
 gnu/packages/tex.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e1d7a8e3dd..012c0667fc 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4827,13 +4827,18 @@ available.")
                    "tex/csplain/opmac/")
              (base32
               "068g31l2ralz03gsv58j67dm85vy0ad58dvdkh93ws0yzf0rnr5f")))
+    (arguments
+     (list #:create-formats #~(list "csplain" "luacsplain" "pdfcsplain")))
     (build-system texlive-build-system)
     (propagated-inputs
      (list texlive-cm
            texlive-cs
            texlive-enctex
-           texlive-hyph-utf8
-           texlive-hyphen-base
+           texlive-hyphen-complete
+           texlive-luatex
+           texlive-luatex85
+           texlive-plain
+           texlive-tex
            texlive-tex-ini-files))
     (home-page "https://petr.olsak.net/csplain-e.html")
     (synopsis "Plain TeX multilanguage support")
-- 
cgit 1.4.1


From 7009cd5995ddd39a27da058a2a39419bacaf2a4f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 4 Jun 2023 10:56:34 +0200
Subject: gnu: texlive-jadetex: Rely on build system to create formats.

* gnu/packages/tex.scm (texlive-jadetex)[arguments]: Use #:CREATE-FORMATS.
Remove useless phase.
[native-inputs]: Move to propagated-inputs.
[propagated-inputs]: Do not use TEXLIVE-UPDMAP.CFG.  Remove TEXLIVE-JKNAPLTX.
Remove TEXLIVE-HYPHEN-BASE, TEXLIVE-HYPH-UTF8, TEXLIVE-DEHYPH, TEXLIVE-XMLTEX.
Add TEXLIVE-HYPHEN-COMPLETE.
---
 gnu/packages/tex.scm | 129 ++++++++++++++++++++-------------------------------
 1 file changed, 51 insertions(+), 78 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 012c0667fc..33f417c542 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8138,100 +8138,73 @@ of ink traps which typify the Kurier font.")
     (build-system texlive-build-system)
     (arguments
      (list
+      #:create-formats #~(list "jadetex" "pdfjadetex")
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'build 'bring-ini-files
-            (lambda _
-              (for-each (lambda (f) (install-file f "build"))
-                        (find-files "tex/jadetex/base"))))
-          (add-after 'bring-ini-files 'generate-formats
-            (lambda* (#:key inputs #:allow-other-keys)
-              (mkdir "web2c")
-              (with-directory-excursion "build"
-                (invoke "fmtutil-sys" "--byfmt" "jadetex"
-                        "--fmtdir=../web2c")
-                (invoke "fmtutil-sys" "--byfmt" "pdfjadetex"
-                        "--fmtdir=../web2c"))))
-          (add-after 'install 'install-formats-and-wrappers
+          (add-after 'install 'install-wrappers
             (lambda* (#:key inputs #:allow-other-keys)
               (let ((pdftex (search-input-file inputs "/bin/pdftex"))
                     (web2c (string-append #$output "/share/texmf-dist/web2c")))
-                (mkdir-p web2c)
-                (copy-recursively "web2c" web2c)
-                (for-each delete-file (find-files web2c "\\.log$"))
-                ;; Create convenience command wrappers.
                 (mkdir-p (string-append #$output "/bin"))
                 (symlink pdftex
                          (string-append #$output "/bin/jadetex"))
                 (symlink pdftex
                          (string-append #$output "/bin/pdfjadetex"))))))))
-    (native-inputs
+    (propagated-inputs
      (list texlive-amsfonts
-           texlive-cm                   ;for cmex10 and others
+           texlive-atbegshi
+           texlive-atveryend
+           texlive-auxhook
+           texlive-babel
+           texlive-bigintcalc
+           texlive-bitset
+           texlive-cm
            texlive-colortbl
+           texlive-cyrillic
+           texlive-ec
+           texlive-etexcmds
+           texlive-everyshi
            texlive-fancyhdr
-           texlive-graphics             ;for color.sty
+           texlive-firstaid
+           texlive-graphics
+           texlive-graphics-cfg
+           texlive-graphics-def
+           texlive-hycolor
            texlive-hyperref
-           ;; The t1cmr.fd file of texlive-latex-base refers to the ecrm font,
-           ;; provided by the jknapltx package collection.
-           texlive-jknapltx
-           texlive-latex-fonts          ;for lasy6
+           texlive-hyphen-complete
+           texlive-iftex
+           texlive-infwarerr
+           texlive-intcalc
+           texlive-kvdefinekeys
+           texlive-kvoptions
+           texlive-kvsetkeys
+           texlive-l3backend
+           texlive-l3kernel
+           texlive-l3packages
+           texlive-latex
+           texlive-latex-fonts
+           texlive-latexconfig
            texlive-letltxmacro
+           texlive-ltxcmds
            texlive-marvosym
-           texlive-tex-ini-files        ;for pdftexconfig
-           texlive-tools                ;for array.sty
-           texlive-ulem))               ;for fmtutil.cnf template
-    (propagated-inputs
-     (list
-      (texlive-updmap.cfg
-       (list texlive-amsfonts
-             texlive-atbegshi
-             texlive-atveryend
-             texlive-auxhook
-             texlive-bigintcalc
-             texlive-bitset
-             texlive-colortbl
-             texlive-dehyph
-             texlive-ec
-             texlive-etexcmds
-             texlive-everyshi
-             texlive-fancyhdr
-             texlive-firstaid
-             texlive-hycolor
-             texlive-hyperref
-             texlive-hyph-utf8
-             texlive-hyphen-base
-             texlive-latexconfig
-             texlive-iftex
-             texlive-infwarerr
-             texlive-intcalc
-             texlive-kvdefinekeys
-             texlive-kvoptions
-             texlive-kvsetkeys
-             texlive-l3backend
-             texlive-l3kernel
-             texlive-l3packages
-             texlive-latexconfig
-             texlive-letltxmacro
-             texlive-ltxcmds
-             texlive-marvosym
-             texlive-passivetex
-             texlive-pdfescape
-             texlive-pdftex
-             texlive-pdftexcmds
-             texlive-rerunfilecheck
-             texlive-stmaryrd
-             texlive-symbol
-             texlive-tipa
-             texlive-ulem
-             texlive-unicode-data
-             texlive-uniquecounter
-             texlive-url
-             texlive-wasysym
-             ;; Propagate the texlive-updmap.cfg input used by xmltex,
-             ;; which provides the required fonts for its use.
-             texlive-xmltex
-             texlive-zapfding))))
+           texlive-passivetex
+           texlive-pdfescape
+           texlive-pdftex
+           texlive-pdftexcmds
+           texlive-psnfss
+           texlive-rerunfilecheck
+           texlive-stmaryrd
+           texlive-symbol
+           texlive-tex
+           texlive-tex-ini-files
+           texlive-tipa
+           texlive-tools
+           texlive-ulem
+           texlive-unicode-data
+           texlive-uniquecounter
+           texlive-url
+           texlive-wasysym
+           texlive-zapfding))
     (home-page "https://www.ctan.org/pkg/jadetex/")
     (synopsis "TeX macros to produce TeX output using OpenJade")
     (description "JadeTeX is a companion package to the OpenJade DSSSL
-- 
cgit 1.4.1


From fe9081b27d82585d9b54e0175bbbed844aced558 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 4 Jun 2023 15:54:18 +0200
Subject: gnu: texlive-xetex: Create formats.

* gnu/packages/tex.scm (texlive-xetex)[arguments]: Create XELATEX and XETEX
formats.
[propagated-inputs]: Replace TEXLIVE-LATEX-BASE with TEXLIVE-LATEX.
---
 gnu/packages/tex.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 33f417c542..d534e578d9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13612,6 +13612,7 @@ itself may be shipped out to the DVI file.")
               "15bjr41p9l5d6837hy3nrhkkylgv04b0150vysyg5730svh3fnan")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments (list #:create-formats #~(list "xelatex" "xetex")))
     (propagated-inputs
      (list texlive-atbegshi
            texlive-atveryend
@@ -13625,7 +13626,7 @@ itself may be shipped out to the DVI file.")
            texlive-l3backend
            texlive-l3kernel
            texlive-l3packages
-           texlive-latex-base
+           texlive-latex
            texlive-latex-fonts
            texlive-lm
            texlive-plain
-- 
cgit 1.4.1


From 889327e4fbfe878b7c0efb7544e5eb2b80476163 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 5 Jun 2023 23:16:22 +0200
Subject: gnu: texlive-context: Create formats.

* gnu/packages/tex.scm (texlive-context)[arguments]: Create CONT-EN, CONT-FR,
CONT-IT, CONT-NL, CONT-RO formats.
---
 gnu/packages/tex.scm | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d534e578d9..a8d6d0c69b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10424,17 +10424,21 @@ a counter to be reset when another is incremented) and
               "1sbh4fnxxymh7lmvldp1ll8p6adcf3jhvqf47jvrayqr91zp4hh9")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs (list texlive-amsfonts
-                             texlive-lm
-                             texlive-lm-math
-                             texlive-luatex
-                             texlive-manfnt-font
-                             texlive-metapost
-                             texlive-mflogo-font
-                             texlive-mptopdf
-                             texlive-pdftex
-                             texlive-stmaryrd
-                             texlive-xetex))
+    (arguments
+     (list #:create-formats
+           #~(list "cont-en" "cont-fr" "cont-it" "cont-nl" "cont-ro")))
+    (propagated-inputs
+     (list texlive-amsfonts
+           texlive-lm
+           texlive-lm-math
+           texlive-luatex
+           texlive-manfnt-font
+           texlive-metapost
+           texlive-mflogo-font
+           texlive-mptopdf
+           texlive-pdftex
+           texlive-stmaryrd
+           texlive-xetex))
     (home-page "https://ctan.org/pkg/context")
     (synopsis "Full featured, parameter driven macro package for TeX")
     (description "ConTeXt is a full featured, parameter driven macro package,
-- 
cgit 1.4.1


From c769425a71c42113caced0ed497970fcb3ee70e1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 5 Jun 2023 21:27:22 +0200
Subject: gnu: Clear or deprecate hyphen-related texlive packages or functions.

* gnu/packages/tex.scm (define-deprecated-package): Move near the top of the
module so it can be called earlier.
(hyph-utf8-scripts): Remove package.
(texlive-hyphen-package): Remove function.
(texlive-dehyph):
(texlive-generic-dehyph-exptl):
(texlive-generic-hyph-utf8):
(texlive-hyphen-afrikaans):
(texlive-hyphen-ancientgreek):
(texlive-hyphen-armenian):
(texlive-hyphen-basque):
(texlive-hyphen-belarusian):
(texlive-hyphen-bulgarian):
(texlive-hyphen-catalan):
(texlive-hyphen-chinese):
(texlive-hyphen-churchslavonic):
(texlive-hyphen-coptic):
(texlive-hyphen-croatian):
(texlive-hyphen-czech):
(texlive-hyphen-danish):
(texlive-hyphen-dutch):
(texlive-hyphen-english):
(texlive-hyphen-esperanto):
(texlive-hyphen-estonian):
(texlive-hyphen-ethiopic):
(texlive-hyphen-finnish):
(texlive-hyphen-french):
(texlive-hyphen-friulan):
(texlive-hyphen-galician):
(texlive-hyphen-georgian):
(texlive-hyphen-german):
(texlive-hyphen-greek):
(texlive-hyphen-hungarian):
(texlive-hyphen-icelandic):
(texlive-hyphen-indic):
(texlive-hyphen-indonesian):
(texlive-hyphen-interlingua):
(texlive-hyphen-irish):
(texlive-hyphen-italian):
(texlive-hyphen-kurmanji):
(texlive-hyphen-latin):
(texlive-hyphen-latvian):
(texlive-hyphen-lithuanian):
(texlive-hyphen-macedonian):
(texlive-hyphen-mongolian):
(texlive-hyphen-norwegian):
(texlive-hyphen-occitan):
(texlive-hyphen-pali):
(texlive-hyphen-piedmontese):
(texlive-hyphen-polish):
(texlive-hyphen-portuguese):
(texlive-hyphen-romanian):
(texlive-hyphen-romansh):
(texlive-hyphen-russian):
(texlive-hyphen-sanskrit):
(texlive-hyphen-schoolfinnish):
(texlive-hyphen-serbian):
(texlive-hyphen-slovak):
(texlive-hyphen-slovenian):
(texlive-hyphen-spanish):
(texlive-hyphen-swedish):
(texlive-hyphen-thai):
(texlive-hyphen-turkish):
(texlive-hyphen-turkmen):
(texlive-hyphen-ukrainian):
(texlive-hyphen-uppersorbian):
(texlive-hyphen-welsh):
(texlive-ruhyphen):
(texlive-ukrhyph): Deprecate package.
* gnu/packages/patches/texlive-hyph-utf8-no-byebug.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
---
 gnu/local.mk                                       |    1 -
 .../patches/texlive-hyph-utf8-no-byebug.patch      |   13 -
 gnu/packages/tex.scm                               | 1225 ++------------------
 3 files changed, 78 insertions(+), 1161 deletions(-)
 delete mode 100644 gnu/packages/patches/texlive-hyph-utf8-no-byebug.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index b85be30838..a56864be86 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1980,7 +1980,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/telegram-purple-adjust-test.patch	\
   %D%/packages/patches/texi2html-document-encoding.patch	\
   %D%/packages/patches/texi2html-i18n.patch			\
-  %D%/packages/patches/texlive-hyph-utf8-no-byebug.patch	\
   %D%/packages/patches/thefuck-test-environ.patch		\
   %D%/packages/patches/tidy-CVE-2015-5522+5523.patch		\
   %D%/packages/patches/timewarrior-time-sensitive-tests.patch	\
diff --git a/gnu/packages/patches/texlive-hyph-utf8-no-byebug.patch b/gnu/packages/patches/texlive-hyph-utf8-no-byebug.patch
deleted file mode 100644
index fb29b76ef2..0000000000
--- a/gnu/packages/patches/texlive-hyph-utf8-no-byebug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Avoid dependency on byebug to reduce package closure
-  significantly, see https://issues.guix.gnu.org/55997
-diff --git a/lib/tex/hyphen/language.rb b/lib/tex/hyphen/language.rb
-index 12831417..df6daa39 100644
---- a/lib/tex/hyphen/language.rb
-+++ b/lib/tex/hyphen/language.rb
-@@ -1,6 +1,5 @@
- require 'yaml'
- require 'hydra'
--require 'byebug'
- 
- require_relative 'path'
- 
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a8d6d0c69b..21593d190e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -103,89 +103,10 @@
   #:use-module (ice-9 match)
   #:use-module ((srfi srfi-1) #:hide (zip)))
 
-(define hyph-utf8-scripts
-  (origin
-    (method svn-fetch)
-    (uri (texlive-ref "generic" "hyph-utf8"))
-    (file-name (string-append "hyph-utf8-scripts-"
-                              (number->string %texlive-revision)
-                              "-checkout"))
-    (patches (search-patches "texlive-hyph-utf8-no-byebug.patch"))
-    (sha256
-     (base32
-      "04xzf5gr3ylyh3ls09imrx4mwq3qp1k97r9njzlan6hlff875rx2"))))
-
-(define (texlive-hyphen-package name code locations hash)
-  "Return a TeX Live hyphenation package with the given NAME, using source
-files from LOCATIONS with expected checksum HASH.  CODE is not currently in
-use."
-  (package
-    (name name)
-    (version (number->string %texlive-revision))
-    (source (texlive-origin name version location hash))
-    (build-system texlive-build-system)
-    (arguments
-     (list
-      #:texlive-latex-base #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'build
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let* ((root (string-append #$output "/share/texmf-dist"))
-                     (patterns
-                      (string-append root "/tex/generic/hyph-utf8/patterns/txt/"))
-                     (loaders
-                      (string-append root "/tex/generic/hyph-utf8/loadhyph"))
-                     (ptex
-                      (string-append root "/tex/generic/hyph-utf8/patterns/ptex"))
-                     (quote
-                      (string-append root "/tex/generic/hyph-utf8/patterns/quote")))
-                (mkdir "scripts")
-                (copy-recursively
-                 (dirname (search-input-file inputs "hyph-utf8.rb"))
-                 "scripts")
-
-                ;; Prepare target directories
-                (mkdir-p patterns)
-                (mkdir-p loaders)
-                (mkdir-p ptex)
-                (mkdir-p quote)
-
-                ;; Generate plain patterns
-                (with-directory-excursion "scripts"
-                  (substitute* "lib/tex/hyphen/path.rb"
-                    (("^([[:blank:]]+)TeXROOT = .*" _ indent)
-                     (string-append indent "TeXROOT = \""
-                                    (getcwd) "/..\"\n")))
-
-                  (substitute* "generate-plain-patterns.rb"
-                    ;; Ruby 2 does not need this.
-                    (("require 'unicode'") "")
-                    ;; Write directly to the output directory
-                    (("File\\.join\\(PATH::TXT")
-                     (string-append "File.join(\"" patterns "\""))
-                    (("File\\.join\\(PATH::QUOTE")
-                     (string-append "File.join(\"" quote "\"")))
-                  (invoke "ruby" "generate-plain-patterns.rb")
-
-                  ;; Build pattern loaders
-                  (substitute* "generate-pattern-loaders.rb"
-                    (("File\\.join\\(PATH::LOADER")
-                     (string-append "File.join(\"" loaders "\"")))
-
-                  (invoke "ruby" "generate-pattern-loaders.rb")
-
-                  ;; Build ptex patterns
-                  (substitute* "generate-ptex-patterns.rb"
-                    (("File\\.join\\(PATH::PTEX")
-                     (string-append "File.join(\"" ptex "\"")))
-                  (invoke "ruby" "generate-ptex-patterns.rb"))))))))
-    (native-inputs
-     (list hyph-utf8-scripts ruby-2.7 ruby-hydra-minimal/pinned))
-    (home-page "https://ctan.org/pkg/hyph-utf8")
-    (synopsis #f)
-    (description #f)
-    (license #f)))
+(define-syntax-rule (define-deprecated-package old-name name)
+  "Define OLD-NAME as a deprecated package alias for NAME."
+  (define-deprecated/public old-name name
+    (deprecated-package (symbol->string 'old-name) name)))
 
 (define-public texlive-hyphen-complete
   (package
@@ -290,8 +211,8 @@ use."
                      (string-append "File.join(\"" ptex "\"")))
                   (invoke "ruby" "generate-ptex-patterns.rb"))))))))
     (native-inputs
-     (list ruby
-           ruby-hydra-minimal
+     (list ruby-2.7
+           ruby-hydra-minimal/pinned
            texlive-docstrip
            texlive-tex))
     (home-page "https://ctan.org/pkg/hyph-utf8")
@@ -338,8 +259,78 @@ and should be preferred to it whenever a package would otherwise depend on
             "Ancestral BSD variant")
            (license:non-copyleft
             "file:///tex/generic/hyph-utf8/patterns/tex/hyph-en-us.tex"
-            "FSF all permissive license")))))
-
+            "FSF all permissive license")
+           (license:non-copyleft
+            "/tex/generic/hyph-utf8/patterns/tex/hyph-no.tex"
+            "FSF All permissive license")
+           (license:non-copyleft
+            "file:///tex/generic/hyph-utf8/patterns/tex/hyph-sa.tex")))))
+
+(define-deprecated-package texlive-dehyph texlive-hyphen-complete)
+(define-deprecated-package texlive-generic-dehyph-exptl texlive-hyphen-complete)
+(define-deprecated-package texlive-generic-hyph-utf8 texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-afrikaans texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-ancientgreek texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-armenian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-basque texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-belarusian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-bulgarian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-catalan texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-chinese texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-churchslavonic texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-coptic texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-croatian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-czech texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-danish texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-dutch texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-english texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-esperanto texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-estonian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-ethiopic texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-finnish texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-french texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-friulan texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-galician texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-georgian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-german texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-greek texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-hungarian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-icelandic texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-indic texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-indonesian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-interlingua texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-irish texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-italian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-kurmanji texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-latin texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-latvian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-lithuanian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-macedonian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-mongolian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-norwegian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-occitan texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-pali texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-piedmontese texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-polish texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-portuguese texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-romanian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-romansh texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-russian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-sanskrit texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-schoolfinnish texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-serbian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-slovak texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-slovenian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-spanish texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-swedish texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-thai texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-turkish texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-turkmen texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-ukrainian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-uppersorbian texlive-hyphen-complete)
+(define-deprecated-package texlive-hyphen-welsh texlive-hyphen-complete)
+(define-deprecated-package texlive-ruhyphen texlive-hyphen-complete)
+(define-deprecated-package texlive-ukrhyph texlive-hyphen-complete)
 
 (define texlive-extra-src
   (origin
@@ -846,11 +837,6 @@ includes adaptations for use with many other commonly-used packages.")
 from a list of user-specified directories similar to how shells look up
 executables.  It is maintained as a part of TeX Live.")))
 
-(define-syntax-rule (define-deprecated-package old-name name)
-  "Define OLD-NAME as a deprecated package alias for NAME."
-  (define-deprecated/public old-name name
-    (deprecated-package (symbol->string 'old-name) name)))
-
 (define-public texlive-alphalph
   (package
     (name "texlive-alphalph")
@@ -2061,1061 +2047,6 @@ Adobe's basic set.")
     ;; No license version specified.
     (license license:gpl3+)))
 
-(define-public texlive-hyphen-afrikaans
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-afrikaans" "af"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-af.tex")
-              (base32
-               "1k9k27a27bbrb0gz36191w32l2v6d3zbdh8zhrp4l3ild2pj3n4l")))
-    (synopsis "Hyphenation patterns for Afrikaans")
-    (description "The package provides hyphenation patterns for the Afrikaans
-language.")
-    (license license:lppl1.3+)))
-
-(define-public texlive-hyphen-ancientgreek
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-ancientgreek" "grc"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-grc.tex"
-                    "/tex/generic/hyphen/grahyph5.tex"
-                    "/tex/generic/hyphen/ibyhyph.tex")
-              (base32
-               "01326lb6z0s8krcfgs8i1pnjfrm4gr33rc53gy80f63qbv4ssxrw")))
-    (synopsis "Hyphenation patterns for ancient Greek")
-    (description "The package provides hyphenation patterns for ancient
-Greek.")
-    (license license:lppl1.3+)))
-
-(define-public texlive-hyphen-armenian
-  (let ((template (texlive-hyphen-package
-                   "texlive-hyphen-armenian" "hy"
-                   (list "/tex/generic/hyph-utf8/patterns/tex/hyph-hy.tex")
-                   (base32
-                    "0hzny0npynsb07syxrpbfa5pkpj8r0j51pj64yxyfl1c0bak1fwp"))))
-    (package
-      (inherit template)
-      (synopsis "Hyphenation patterns for Armenian")
-      (description "The package provides hyphenation patterns for the Armenian
-language.")
-      ;; Any version of the LGPL.
-      (license license:lgpl3+))))
-
-(define-public texlive-hyphen-basque
-  (let ((template (texlive-hyphen-package
-                    "texlive-hyphen-basque" "eu"
-                    (list "/tex/generic/hyph-utf8/patterns/tex/hyph-eu.tex")
-                    (base32
-                     "15w969g1jqzn68l2b2lzf7iv7g3kil02aba3if6cag3qcnq92ra9"))))
-    (package
-      (inherit template)
-      (synopsis "Hyphenation patterns for Basque")
-      (description "The package provides hyphenation patterns for the Basque
-language.")
-      ;; Similar to Unicode license.
-      (license (license:fsf-free
-                "/tex/generic/hyph-utf8/patterns/tex/hyph-eu.tex")))))
-
-(define-public texlive-hyphen-belarusian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-belarusian" "be"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-be.tex")
-              (base32
-               "0ppm12wndaxv9da62dwkbnk7w9nijikn6jkc97m76xis338g2h02")))
-    (synopsis "Hyphenation patterns for Belarusian")
-    (description "The package provides hyphenation patterns for the Belarusian
-language.")
-    (license license:expat)))
-
-(define-public texlive-hyphen-bulgarian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-bulgarian" "bg"
-              '("/tex/generic/hyph-utf8/patterns/tex/hyph-bg.tex")
-              (base32
-               "0m254y71j3qrb71klvfalfmic3kjy31l85b9cgpdm5yznlsq3i8d")))
-    (synopsis "Hyphenation patterns for Bulgarian")
-    (description "The package provides hyphenation patterns for the Bulgarian
-language in T2A and UTF-8 encodings.")
-    (license (license:non-copyleft
-              "file:///tex/generic/hyph-utf8/patterns/tex/hyph-bg.tex"
-              "Ancestral BSD variant"))))
-
-(define-public texlive-hyphen-catalan
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-catalan" "ca"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ca.tex")
-              (base32
-               "10zzlfz5v8d9csg85ibpp2vfvmpqa56vbl85qy5gws099vygpayg")))
-    (synopsis "Hyphenation patterns for Catalan")
-    (description "The package provides hyphenation patterns for Catalan in
-T1/EC and UTF-8 encodings.")
-    (license license:lppl1.0+)))
-
-(define-public texlive-hyphen-chinese
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-chinese" "zh-latn-pinyin"
-              '("/tex/generic/hyph-utf8/patterns/ptex/hyph-zh-latn-pinyin.ec.tex"
-                "/tex/generic/hyph-utf8/patterns/tex/hyph-zh-latn-pinyin.tex")
-              (base32
-               "1hhh30hcjymm2igpllly04cavsfmd6xrjkd9zax6b2wdxn3ka4pm")))
-    (synopsis "Hyphenation patterns for unaccented Chinese pinyin")
-    (description "The package provides hyphenation patterns for unaccented
-Chinese pinyin T1/EC and UTF-8 encodings.")
-    (license license:gpl2+)))
-
-(define-public texlive-hyphen-churchslavonic
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-churchslavonic" "cu"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-cu.tex")
-              (base32
-               "0fhbwaapq2213msbhgr0d1lw06ihmrqirxj092mn73d8ynl13qlh")))
-    (synopsis "Hyphenation patterns for Church Slavonic")
-    (description "The package provides hyphenation patterns for Church
-Slavonic in UTF-8 encoding.")
-    (license license:expat)))
-
-(define-public texlive-hyphen-coptic
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-coptic" "cop"
-              (list "/tex/generic/hyph-utf8/patterns/tex-8bit/copthyph.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-cop.tex")
-              (base32
-               "1jlxxvyfa2aljizaa3qlcxyhqsrb4dawv3q3fbyp2lxz6ag9fy6m")))
-    (synopsis "Hyphenation patterns for Coptic")
-    (description "The package provides hyphenation patterns for Coptic in
-UTF-8 encoding as well as in ASCII-based encoding for 8-bit engines.")
-    ;; No explicit license declaration, so we use the project license.
-    (license license:lppl)))
-
-(define-public texlive-hyphen-croatian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-croatian" "hr"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-hr.tex")
-              (base32
-               "12n9r2winai15jc622sqdwclgcs1s68r6vcf7ic8vvq0x9qhwc5v")))
-    (synopsis "Hyphenation patterns for Croatian")
-    (description "The package provides hyphenation patterns for Croatian in
-T1/EC and UTF-8 encodings.")
-    (license license:lppl1.0+)))
-
-(define-public texlive-hyphen-czech
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-czech" "cs"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-cs.tex")
-              (base32
-               "1q37s6p8yfyi3rp1azbz421lg4lr4aiki8m631i4x9rmps89m8iq")))
-    (synopsis "Hyphenation patterns for Czech")
-    (description "The package provides hyphenation patterns for Czech in T1/EC
-and UTF-8 encodings.")
-    (license license:gpl2+)))
-
-(define-public texlive-hyphen-danish
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-danish" "da"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-da.tex")
-              (base32
-               "1vj8nip64rzcrcg3skm4vqad1ggqwgan74znrdns610wjcm1z9qd")))
-    (synopsis "Hyphenation patterns for Danish")
-    (description "The package provides hyphenation patterns for Danish in
-T1/EC and UTF-8 encodings.")
-    ;; Either LPPL 1.3 or later, or Expat
-    (license (list license:lppl1.3+ license:expat))))
-
-(define-public texlive-hyphen-dutch
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-dutch" "nl"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-nl.tex")
-              (base32
-               "1bg9g790ksq5cn8qihai6pacmkp9vpf35h4771z361nvwa40l8yk")))
-    (synopsis "Hyphenation patterns for Dutch")
-    (description "The package provides hyphenation patterns for Dutch in T1/EC
-and UTF-8 encodings.")
-    (license license:lppl1.0+)))
-
-(define-public texlive-hyphen-english
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-english" '("en-gb" "en-us")
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-en-gb.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-en-us.tex")
-              (base32
-               "08b3jihjaamcl1pvffi0s47nwavkm66l9mrrmby3l32dfpkprrc5")))
-    (synopsis "Hyphenation patterns for American and British English")
-    (description "The package provides additional hyphenation patterns for
-American and British English in ASCII encoding.")
-    (license (license:non-copyleft
-              "file:///tex/generic/hyph-utf8/patterns/tex/hyph-en-us.tex"
-              "FSF all permissive license"))))
-
-(define-public texlive-hyphen-esperanto
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-esperanto" "eo"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-eo.tex")
-              (base32
-               "1503kzn9bk4mm4ba35cka2hm8rz0v3j5l30v5rrsd4rqgpibcgic")))
-    (synopsis "Hyphenation patterns for Esperanto")
-    (description "The package provides hyphenation patterns for Esperanto ISO
-Latin 3 and UTF-8 encodings.")
-    (license license:lppl1.0+)))
-
-(define-public texlive-hyphen-estonian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-estonian" "et"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-et.tex")
-              (base32
-               "1rdas2450ib02rwy65i69l86nyc9h15bl07xbbwhmhxfnj8zj4v8")))
-    (synopsis "Hyphenation patterns for Estonian")
-    (description "The package provides hyphenation patterns for Estonian in
-T1/EC and UTF-8 encodings.")
-    ;; Dual licensed under either license.
-    (license (list license:lppl1.3+ license:expat))))
-
-(define-public texlive-hyphen-ethiopic
-  (let ((template (texlive-hyphen-package
-                   "texlive-hyphen-ethiopic" "mul-ethi"
-                   (list "/tex/generic/hyph-utf8/patterns/tex/hyph-mul-ethi.tex")
-                   (base32
-                    "1b93fc6j4aybh0pgq23hsn1njm6asf7sfz803fbj3ai0whsxd10l"))))
-    (package
-      (inherit template)
-      (synopsis "Hyphenation patterns for Ethiopic scripts")
-      (description "The package provides hyphenation patterns for languages
-written using the Ethiopic script for Unicode engines.  They are not supposed
-to be linguistically relevant in all cases and should, for proper typography,
-be replaced by files tailored to individual languages.")
-      (license license:expat))))
-
-(define-public texlive-hyphen-finnish
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-finnish" "fi"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-fi.tex")
-              (base32
-               "1pa8sjs9zvnv1y6dma4s60sf9cr4zrvhxwm6i8cnshm84q16w4bc")))
-    (synopsis "Hyphenation patterns for Finnish")
-    (description "The package provides hyphenation patterns for Finnish in
-T1/EC and UTF-8 encodings.")
-    (license license:public-domain)))
-
-(define-public texlive-hyphen-schoolfinnish
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-schoolfinnish" "fi-x-school"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-fi-x-school.tex")
-              (base32
-               "1w5n6gaclgifbbnafg32vz3mfaibyldvh4yh1ya3sq9fwfmv035c")))
-    (synopsis "Hyphenation patterns for Finnish for school")
-    (description "The package provides hyphenation patterns for Finnish for
-school in T1/EC and UTF-8 encodings.")
-    (license license:public-domain)))
-
-(define-public texlive-hyphen-french
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-french" "fr"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-fr.tex")
-              (base32
-               "0jc3kqys6cxjw8x8pzjln7z78l8s7f5rlyrkv7dzr1kiwnwilk9d")))
-    (synopsis "Hyphenation patterns for French")
-    (description "The package provides hyphenation patterns for French in
-T1/EC and UTF-8 encodings.")
-    (license license:expat)))
-
-(define-public texlive-hyphen-friulan
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-friulan" "fur"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-fur.tex")
-              (base32
-               "1dlnh8slpf50mryxv7zzbx08xp54zkdfs1j7y37ipwbrajvd740f")))
-    (synopsis "Hyphenation patterns for Friulan")
-    (description "The package provides hyphenation patterns for Friulan in
-ASCII encodings.")
-    (license license:lppl1.3+)))
-
-(define-public texlive-hyphen-galician
-  (let ((template (texlive-hyphen-package
-                   "texlive-hyphen-galician" "gl"
-                   (list "/tex/generic/hyph-utf8/patterns/tex/hyph-gl.tex")
-                   (base32
-                    "13zx2r3nrxdr025g2lxrph0ga6wf7cs8dxixn4fhbl6xr1cx028g"))))
-    (package
-      (inherit template)
-      (synopsis "Hyphenation patterns for Galician")
-      (description "The package provides hyphenation patterns for Galician in
-T1/EC and UTF-8 encodings.")
-      (license license:lppl1.3))))
-
-(define-public texlive-hyphen-georgian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-georgian" "ka"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ka.tex")
-              (base32
-               "0l0hk7ka04fr8x11nnw95x151cxyycy0fph772m3a3p8qk4x9wp7")))
-    (synopsis "Hyphenation patterns for Georgian")
-    (description "The package provides hyphenation patterns for Georgian in
-T8M, T8K, and UTF-8 encodings.")
-    (license license:lppl1.3+)))
-
-(define-public texlive-hyphen-german
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-german" '("de-1901" "de-1996" "de-ch-1901")
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-de-1901.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-de-1996.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-de-ch-1901.tex"
-                    "/tex/generic/dehyph/dehyphn.tex"
-                    "/tex/generic/dehyph/dehypht.tex"
-                    "/tex/generic/dehyph/dehyphtex.tex"
-                    "/tex/generic/dehyph/README")
-              (base32
-               "17cc5hd0fr3ykpgly9nxaiz4sik3kmfn2wyxz1fkdnqqhl3i41a0")))
-    (synopsis "Hyphenation patterns for German")
-    (description "This package provides hyphenation patterns for German in
-T1/EC and UTF-8 encodings, for traditional and reformed spelling, including
-Swiss German.")
-    ;; The patterns are released under the Expat license; the dehyph* files
-    ;; are released under the LPPL version 1 or later.
-    (license (list license:expat license:lppl1.0+))))
-
-(define-public texlive-hyphen-greek
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-greek" '("el-monoton" "el-polyton")
-              (list "/doc/generic/elhyphen/"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-el-monoton.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-el-polyton.tex"
-                    "/tex/generic/hyphen/grmhyph5.tex"
-                    "/tex/generic/hyphen/grphyph5.tex")
-              (base32
-               "1qyr6m1nh6d4wj68616cfxv4wjpiy1w2rlldxlx2ajzba381w3hf")))
-    (synopsis "Hyphenation patterns for Greek")
-    (description "This package provides hyphenation patterns for Modern Greek
-in monotonic and polytonic spelling in LGR and UTF-8 encodings.")
-    (license license:lppl)))
-
-(define-public texlive-hyphen-hungarian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-hungarian" "hu"
-              (list "/doc/generic/huhyphen/"
-                    "/doc/generic/hyph-utf8/languages/hu/"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-hu.tex")
-              (base32
-               "006d2290lcsqzh9ljansbaj9k52s17zgkw0kpsspn5l7a8n00zcl")))
-    (synopsis "Hyphenation patterns for Hungarian")
-    (description "This package provides hyphenation patterns for Hungarian in
-T1/EC and UTF-8 encodings.")
-    ;; Any of these licenses
-    (license (list license:gpl2 license:lgpl2.1+ license:mpl1.1))))
-
-(define-public texlive-hyphen-icelandic
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-icelandic" "is"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-is.tex")
-              (base32
-               "1m9xj41csj3ldym09d82zjbd3345sg2z10d8pxpvhgibf97mb66h")))
-    (synopsis "Hyphenation patterns for Icelandic")
-    (description "This package provides hyphenation patterns for Icelandic in
-T1/EC and UTF-8 encodings.")
-    (license license:lppl1.2+)))
-
-(define-public texlive-hyphen-indic
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-indic"
-              '("as" "bn" "gu" "hi" "kn" "ml" "mr" "or" "pa" "ta" "te")
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-as.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-bn.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-gu.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-hi.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-kn.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-ml.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-mr.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-or.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-pa.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-ta.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-te.tex")
-              (base32
-               "02d2kcd3lpk95fykjwhzw9s2a1s2w1skz8h2mmszrz979d1xzhpm")))
-    (synopsis "Indic hyphenation patterns")
-    (description "This package provides hyphenation patterns for Assamese,
-Bengali, Gujarati, Hindi, Kannada, Malayalam, Marathi, Oriya, Panjabi, Tamil
-and Telugu for Unicode engines.")
-    (license license:expat)))
-
-(define-public texlive-hyphen-indonesian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-indonesian" "id"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-id.tex")
-              (base32
-               "1r62w02rf0i4z0jgij54d16qjbj0zyfwm9dwdkqka76jrivij83q")))
-    (synopsis "Indonesian hyphenation patterns")
-    (description "This package provides hyphenation patterns for
-Indonesian (Bahasa Indonesia) in ASCII encoding.  They are probably also
-usable for Malay (Bahasa Melayu).")
-    (license license:gpl2)))
-
-(define-public texlive-hyphen-interlingua
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-interlingua" "ia"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ia.tex")
-              (base32
-               "0a9na20vjnzhgjbicaxay0jk4rm5zg1rjyiswr377mjhd9mx5cg3")))
-    (synopsis "Interlingua hyphenation patterns")
-    (description "This package provides hyphenation patterns for Interlingua
-in ASCII encoding.")
-    (license license:lppl1.3+)))
-
-(define-public texlive-hyphen-irish
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-irish" "ga"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ga.tex")
-              (base32
-               "1h1l9jzkpsb91nyhz6s6c9jfrbz8jx5ip8vyq3dkz0rl6g960i6b")))
-    (synopsis "Irish hyphenation patterns")
-    (description "This package provides hyphenation patterns for
-Irish (Gaeilge) in T1/EC and UTF-8 encodings.")
-    ;; Either of these licenses
-    (license (list license:gpl2+ license:expat))))
-
-(define-public texlive-hyphen-italian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-italian" "it"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-it.tex")
-              (base32
-               "03c7jiqslfxvl3gbdx79hggbvrfi2l4z2bnwxc0na8f8lkp1m787")))
-    (synopsis "Italian hyphenation patterns")
-    (description "This package provides hyphenation patterns for Italian in
-ASCII encoding.  Compliant with the Recommendation UNI 6461 on hyphenation
-issued by the Italian Standards Institution (Ente Nazionale di Unificazione
-UNI).")
-    (license license:lppl1.3+)))
-
-(define-public texlive-hyphen-kurmanji
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-kurmanji" "kmr"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-kmr.tex")
-              (base32
-               "01ylbsi5wymrdrxr9b28nmjmcj72mdhqr657lwsb6m9aj33c9ql6")))
-    (synopsis "Kurmanji hyphenation patterns")
-    (description "This package provides hyphenation patterns for
-Kurmanji (Northern Kurdish) as spoken in Turkey and by the Kurdish diaspora in
-Europe, in T1/EC and UTF-8 encodings.")
-    (license license:lppl1.3)))
-
-(define-public texlive-hyphen-latin
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-latin" '("la-x-classic" "la-x-liturgic" "la")
-              '("/tex/generic/hyph-utf8/patterns/tex/hyph-la-x-classic.tex"
-                "/tex/generic/hyph-utf8/patterns/tex/hyph-la-x-liturgic.tex"
-                "/tex/generic/hyph-utf8/patterns/tex/hyph-la.tex"
-                "/tex/generic/hyph-utf8/patterns/tex-8bit/hyph-la-x-classic.ec.tex")
-              (base32
-               "119rf6sk1f639ky6zr9njn21nsxzgfmjci94y26745qs8w08ilkl")))
-    (synopsis "Liturgical Latin hyphenation patterns")
-    (description "This package provides hyphenation patterns for Latin in
-T1/EC and UTF-8 encodings, mainly in modern spelling (u when u is needed and v
-when v is needed), medieval spelling with the ligatures @code{\\ae} and
-@code{\\oe} and the (uncial) lowercase 'v' written as a 'u' is also supported.
-Apparently there is no conflict between the patterns of modern Latin and those
-of medieval Latin.  It also includes hyphenation patterns for the Classical
-Latin in T1/EC and UTF-8 encodings.  Classical Latin hyphenation patterns are
-different from those of 'plain' Latin, the latter being more adapted to modern
-Latin.  It also provides hyphenation patterns for the Liturgical Latin in
-T1/EC and UTF-8 encodings.")
-    ;; Either of these licenses
-    (license (list license:lppl1.0+ license:expat))))
-
-(define-public texlive-hyphen-latvian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-latvian" "lv"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-lv.tex")
-              (base32
-               "00jf8xma4ldz0zpqwma97k9q3j0mqx7qdj6b7baph3n5xgc24aaw")))
-    (synopsis "Latvian hyphenation patterns")
-    (description "This package provides hyphenation patterns for Latvian in
-L7X and UTF-8 encodings.")
-    ;; Either of these licenses.
-    (license (list license:gpl2 license:lgpl2.1))))
-
-(define-public texlive-hyphen-lithuanian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-lithuanian" "lt"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-lt.tex")
-              (base32
-               "1kfq7j2ajg6nj952s1ygd520sj9z9kl0bqvd291a36ni2b1frzgd")))
-    (synopsis "Lithuanian hyphenation patterns")
-    (description "This package provides hyphenation patterns for Lithuanian in
-L7X and UTF-8 encodings.")
-    ;; "Do ... whatever ... as long as you respect the copyright"; as part of
-    ;; the hyph-utf8 package we choose the LPPL license.
-    (license license:lppl)))
-
-(define-public texlive-hyphen-macedonian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-macedonian" "mk"
-              '("/tex/generic/hyph-utf8/patterns/tex/hyph-mk.tex"
-                "/tex/generic/hyph-utf8/patterns/tex-8bit/hyph-mk.macedonian.tex")
-              (base32
-               "1fv6y8gpic5ciw8cclfxc8h3wr5xir1j0a7shixja1pmdyz7db2b")))
-    (synopsis "Macedonian hyphenation patterns")
-    (description "This package provides hyphenation patterns for Macedonian.")
-    ;; XXX: License just says 'GPL'.  Assume GPL2 since the file predates GPL3.
-    (license license:gpl2+)))
-
-(define-public texlive-hyphen-mongolian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-mongolian" '("mn-cyrl-x-lmc" "mn-cyrl")
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-mn-cyrl-x-lmc.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-mn-cyrl.tex")
-              (base32
-               "1y1b91ihrdl9bad3rxlsfjpd9wmyd5zzgci3qv9w8qqk33jxhwya")))
-    (synopsis "Mongolian hyphenation patterns in Cyrillic script")
-    (description "This package provides hyphenation patterns for Mongolian in
-T2A, LMC and UTF-8 encodings.")
-    ;; Either of these licenses
-    (license (list license:lppl1.3+ license:expat))))
-
-(define-public texlive-hyphen-norwegian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-norwegian" '("nb" "nn" "no")
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-nb.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-nn.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-no.tex")
-              (base32
-               "08gbwj64p4fckm199k52yp5lx65h9f4wwdkvl4pv4aa7k370jq9y")))
-    (synopsis "Norwegian Bokmal and Nynorsk hyphenation patterns")
-    (description "This package provides hyphenation patterns for Norwegian
-Bokmal and Nynorsk in T1/EC and UTF-8 encodings.")
-    (license (license:non-copyleft
-              "/tex/generic/hyph-utf8/patterns/tex/hyph-no.tex"
-              "FSF All permissive license"))))
-
-(define-public texlive-hyphen-occitan
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-occitan" "oc"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-oc.tex")
-              (base32
-               "0vhjbq2nr58vhqwwky3cwx4dqiwjmmfwp81rb65mfpf0m8yypdfg")))
-    (synopsis "Occitan hyphenation patterns")
-    (description "This package provides hyphenation patterns for Occitan in
-T1/EC and UTF-8 encodings.  They are supposed to be valid for all the Occitan
-variants spoken and written in the wide area called 'Occitanie' by the French.
-It ranges from the Val d'Aran within Catalunya, to the South Western Italian
-Alps encompassing the southern half of the French pentagon.")
-    (license license:lppl1.0+)))
-
-(define-public texlive-hyphen-pali
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-pali" "pi"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-pi.tex")
-              (base32
-               "1fak853s4ijdqgrnhwymaq1lh8jab3qfyxapdmf6qpg6bqd20kxq")))
-    (synopsis "Panjabi hyphenation patterns")
-    (description "This package provides hyphenation patterns for Panjabi in
-T1/EC encoding.")
-    ;; Can be used with either license.
-    (license (list license:expat license:lgpl3+ license:gpl3+))))
-
-(define-public texlive-hyphen-piedmontese
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-piedmontese" "pms"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-pms.tex")
-              (base32
-               "0xva3l2gwzkqw1sz64k5g5iprhdyr27w1mv8rxp8x62i5y3aqr1k")))
-    (synopsis "Piedmontese hyphenation patterns")
-    (description "This package provides hyphenation patterns for Piedmontese
-in ASCII encoding.  Compliant with 'Gramatica dla lengua piemonteisa' by
-Camillo Brero.")
-    (license license:lppl1.3+)))
-
-(define-public texlive-hyphen-polish
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-polish" "pl"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-pl.tex")
-              (base32
-               "1c22g99isxapv4xjrmsw24hhp1xb83wbgcxyd8j24mxdnizywxzm")))
-    (synopsis "Polish hyphenation patterns")
-    (description "This package provides hyphenation patterns for Polish in QX
-and UTF-8 encodings.")
-    ;; No differing license declared, so we choose the project license.
-    (license license:lppl)))
-
-(define-public texlive-hyphen-portuguese
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-portuguese" "pt"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-pt.tex")
-              (base32
-               "00rkjy4p7893zs940bq3s4hp7al0skgxqggj5qfax0bx8karf30b")))
-    (synopsis "Portuguese hyphenation patterns")
-    (description "This package provides hyphenation patterns for Portuguese in
-T1/EC and UTF-8 encodings.")
-    (license license:bsd-3)))
-
-(define-public texlive-hyphen-romanian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-romanian" "ro"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ro.tex")
-              (base32
-               "1ykb5v7ip6p3n34wq8qypfyrap4gg946by5rsl6ab0k5gv6ypsbf")))
-    (synopsis "Romanian hyphenation patterns")
-    (description "This package provides hyphenation patterns for Romanian in
-T1/EC and UTF-8 encodings.")
-    ;; No differing license declared, so we choose the project license.
-    (license license:lppl)))
-
-(define-public texlive-hyphen-romansh
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-romansh" "rm"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-rm.tex")
-              (base32
-               "0a1q9p6sp5n6a9w6xhwk03vmkrrmnh2md7g1k4qhnf0dc4h7dy9r")))
-    (synopsis "Romansh hyphenation patterns")
-    (description "This package provides hyphenation patterns for Romansh in
-ASCII encodings.  They are supposed to comply with the rules indicated by the
-Lia Rumantscha (Romansh language society).")
-    (license license:lppl1.3+)))
-
-(define-public texlive-hyphen-russian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-russian" "ru"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ru.tex")
-              (base32
-               "00sy7qh5f8ryxw36fwbyd1yi2hxhv7hmk99yp7dwh73n4mxv6lpl")))
-    (synopsis "Russian hyphenation patterns")
-    (description "This package provides hyphenation patterns for Russian in
-T2A and UTF-8 encodings.")
-    (license license:lppl1.2+)))
-
-(define-public texlive-hyphen-sanskrit
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-sanskrit" "sa"
-              (list "/doc/generic/hyph-utf8/languages/sa/hyphenmin.txt"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-sa.tex")
-              (base32
-               "1bkzj8swj4lbswf1vr4pb1jg6dixzs7p8h8zm8s8as52h442aida")))
-    (synopsis "Sanskrit hyphenation patterns")
-    (description "This package provides hyphenation patterns for Sanskrit and
-Prakrit in longdesc transliteration, and in Devanagari, Bengali, Kannada,
-Malayalam longdesc and Telugu scripts for Unicode engines.")
-    ;; "You may freely use, copy, modify and/or distribute this file."
-    (license (license:non-copyleft
-              "file:///tex/generic/hyph-utf8/patterns/tex/hyph-sa.tex"))))
-
-(define-public texlive-hyphen-serbian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-serbian" '("sh-cyrl" "sh-latn" "sr-cyrl")
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-sh-cyrl.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-sh-latn.tex"
-                    "/tex/generic/hyph-utf8/patterns/tex/hyph-sr-cyrl.tex")
-              (base32
-               "0pwc9z0m5y6acq1vqm0da9akg156jbhxzvsfp2f8bsz5b99y5z45")))
-    (synopsis "Serbian hyphenation patterns")
-    (description "This package provides hyphenation patterns for Serbian in
-T1/EC, T2A and UTF-8 encodings.")
-    ;; Any version of the GPL.
-    (license license:gpl3+)))
-
-(define-public texlive-hyphen-slovak
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-slovak" "sk"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-sk.tex")
-              (base32
-               "0ppp53bbclp5c8wvx748krvrp5y5053khgkjnnv966a90fvp3vgd")))
-    (synopsis "Slovak hyphenation patterns")
-    (description "This package provides hyphenation patterns for Slovak in
-T1/EC and UTF-8 encodings.")
-    (license license:gpl2+)))
-
-(define-public texlive-hyphen-slovenian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-slovenian" "sl"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-sl.tex")
-              (base32
-               "02n8l9yf4hqyhbpsc1n6b2mggy09z6lq4dcb8ndiwawb6h0mp7s4")))
-    (synopsis "Slovenian hyphenation patterns")
-    (description "This package provides hyphenation patterns for Slovenian in
-T1/EC and UTF-8 encodings.")
-    ;; Either license
-    (license (list license:lppl1.0+ license:expat))))
-
-(define-public texlive-hyphen-spanish
-  (package
-    ;; The source files "eshyph-make.lua" and "eshyph.src" are provided to
-    ;; generate obsolete hyphenation patterns, which aren't included in a
-    ;; default TeX Live distribution, so we don't include them either.
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-spanish" "es"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-es.tex")
-              (base32
-               "05lbvjkj304xxghyihk8js0kmg97ddlgijld3bp81bc28h4cav0v")))
-    (synopsis "Hyphenation patterns for Spanish")
-    (description "The package provides hyphenation patterns for Spanish in
-T1/EC and UTF-8 encodings.")
-    (license license:expat)))
-
-(define-public texlive-hyphen-swedish
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-swedish" "sv"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-sv.tex")
-              (base32
-               "1n7incy7n24pix1q2i8c3h7i78zpql5ayhskavlmy6mhd7ayncaw")))
-    (synopsis "Swedish hyphenation patterns")
-    (description "This package provides hyphenation patterns for Swedish in
-T1/EC and UTF-8 encodings.")
-    (license license:lppl1.2+)))
-
-(define-public texlive-hyphen-thai
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-thai" "th"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-th.tex")
-              (base32
-               "00gxcs4jfqifd5cnrjipn77m73fmpw2qms4lp216jj3kz4a7h9kf")))
-    (synopsis "Thai hyphenation patterns")
-    (description "This package provides hyphenation patterns for Thai in LTH
-and UTF-8 encodings.")
-    (license license:lppl1.3+)))
-
-(define-public texlive-hyphen-turkish
-  (let ((template (texlive-hyphen-package
-                   "texlive-hyphen-turkish" "tr"
-                   (list "/tex/generic/hyph-utf8/patterns/tex/hyph-tr.tex")
-                   (base32
-                    "04sihjgpm31i5bi67rrfp15w3imn7hxwwk70v0vhx053ghxy72vh"))))
-    (package
-      (inherit template)
-      (synopsis "Hyphenation patterns for Turkish")
-      (description "The package provides hyphenation patterns for Turkish in
-T1/EC and UTF-8 encodings.  The patterns for Turkish were first produced for
-the Ottoman Texts Project in 1987 and were suitable for both Modern Turkish
-and Ottoman Turkish in Latin script, however the required character set didn't
-fit into EC encoding, so support for Ottoman Turkish had to be dropped to keep
-compatibility with 8-bit engines.")
-      (license license:lppl1.0+))))
-
-(define-public texlive-hyphen-turkmen
-  (let ((template (texlive-hyphen-package
-                   "texlive-hyphen-turkmen" "tk"
-                   (list "/tex/generic/hyph-utf8/patterns/tex/hyph-tk.tex")
-                   (base32
-                    "0g5ip2lw9g47s61mv3cypswc6qm7zy9c4iqq4h19ysvds81adzkr"))))
-    (package
-      (inherit template)
-      (synopsis "Hyphenation patterns for Turkmen")
-      (description "The package provides hyphenation patterns for Turkmen in
-T1/EC and UTF-8 encodings.")
-      (license license:expat))))
-
-(define-public texlive-hyphen-ukrainian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-ukrainian" "uk"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-uk.tex")
-              (base32
-               "0fbfhx1fmbshxr4ihsjaqgx251h69h7i288p8gh3w6ysgxr53p60")))
-    (synopsis "Ukrainian hyphenation patterns")
-    (description "This package provides hyphenation patterns for Ukrainian in
-T2A and UTF-8 encodings.")
-    ;; No version specified
-    (license license:lppl)))
-
-(define-public texlive-hyphen-uppersorbian
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-uppersorbian" "hsb"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-hsb.tex")
-              (base32
-               "0x0051wph3sqmzzw6prvjy6bp7gn02rbmys1bmbc210jk3pkylfj")))
-    (synopsis "Upper Sorbian hyphenation patterns")
-    (description "This package provides hyphenation patterns for Upper Sorbian
-in T1/EC and UTF-8 encodings.")
-    (license license:lppl1.3a+)))
-
-(define-public texlive-hyphen-welsh
-  (package
-    (inherit (texlive-hyphen-package
-              "texlive-hyphen-welsh" "cy"
-              (list "/tex/generic/hyph-utf8/patterns/tex/hyph-cy.tex")
-              (base32
-               "1bpxp3jiifdw7waw2idz5j9xgi3526nkxm8mbmsspr4mlf2xyr76")))
-    (synopsis "Welsh hyphenation patterns")
-    (description "This package provides hyphenation patterns for Welsh in
-T1/EC and UTF-8 encodings.")
-    ;; Either license
-    (license (list license:lppl1.0+ license:expat))))
-
-(define-public texlive-hyph-utf8
-  (package
-    (name "texlive-hyph-utf8")
-    (version (number->string %texlive-revision))
-    (source (texlive-origin
-             name version
-             (list "doc/luatex/hyph-utf8/"
-                   "source/generic/hyph-utf8/"
-                   "source/generic/hyph-utf8/contributed/"
-                   "source/generic/hyph-utf8/data/"
-                   "source/luatex/hyph-utf8/"
-                   "tex/luatex/hyph-utf8/"
-                   ;; Documentation; we can't use the whole directory because
-                   ;; it includes files from other packages.
-                   "doc/generic/hyph-utf8/CHANGES"
-                   "doc/generic/hyph-utf8/HISTORY"
-                   "doc/generic/hyph-utf8/hyph-utf8.pdf"
-                   "doc/generic/hyph-utf8/hyph-utf8.tex"
-                   "doc/generic/hyph-utf8/hyphenation-distribution.pdf"
-                   "doc/generic/hyph-utf8/hyphenation-distribution.tex"
-                   "doc/generic/hyph-utf8/img/miktex-languages.png"
-                   "doc/generic/hyph-utf8/img/texlive-collection.png")
-             (base32
-              "1dm023k05c0pnnyqgbsy1cbpq8layabdp8acln0v59kpsx7flmj9")))
-    (outputs '("out" "doc"))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f                       ; there are none
-      #:modules '((guix build gnu-build-system)
-                  (guix build utils)
-                  (ice-9 match))
-      #:make-flags
-      #~(list "-C" "source/luatex/hyph-utf8/"
-              (string-append "DO_TEX = tex --interaction=nonstopmode '&tex' $<")
-              (string-append "RUNDIR =" (assoc-ref %outputs "out") "/share/texmf-dist/tex/luatex/hyph-utf8/")
-              (string-append "DOCDIR =" (assoc-ref %outputs "doc") "/share/texmf-dist/doc/luatex/hyph-utf8/")
-              ;; hyphen.cfg is neither included nor generated, so let's only build the lua file.
-              (string-append "UNPACKED = $(NAME).lua"))
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; TeX isn't usable at this point, so we first need to generate the
-          ;; tex.fmt.
-          (replace 'configure
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              ;; Target directories must exist.
-              (mkdir-p (string-append (assoc-ref %outputs "out")
-                                      "/share/texmf-dist/tex/luatex/hyph-utf8/"))
-              (mkdir-p (string-append (assoc-ref %outputs "doc")
-                                      "/share/texmf-dist/doc/luatex/hyph-utf8/"))
-
-              ;; We cannot build the documentation because that requires a
-              ;; fully functional pdflatex, which depends on this package.
-              (substitute* "source/luatex/hyph-utf8/Makefile"
-                (("all: .*") "all: $(RUNFILES)\n"))
-
-              ;; Find required fonts for building tex.fmt
-              (setenv "TFMFONTS"
-                      (string-append (assoc-ref inputs "texlive-cm")
-                                     "/share/texmf-dist/fonts/tfm/public/cm:"
-                                     (assoc-ref inputs "texlive-knuth-lib")
-                                     "/share/texmf-dist/fonts/tfm/public/knuth-lib"))
-              ;; ...and find all tex files in this environment.
-              (setenv "TEXINPUTS"
-                      (string-append
-                       (getcwd) ":"
-                       (string-join
-                        (map (match-lambda ((_ . dir) dir)) inputs)
-                        "//:")))
-
-              ;; Generate tex.fmt.
-              (let ((where "source/luatex/hyph-utf8"))
-                (mkdir-p where)
-                (with-directory-excursion where
-                  (invoke "tex" "-ini"
-                          (string-append (assoc-ref inputs "texlive-plain")
-                                         "/share/texmf-dist/tex/plain/config/tex.ini"))))))
-          (add-before 'build 'build-loaders-and-converters
-            (lambda _
-              (let* ((root (string-append #$output "/share/texmf-dist"))
-                     (conv
-                      (string-append root "/tex/generic/hyph-utf8/conversions")))
-
-                ;; Build converters
-                (mkdir-p conv)
-                (with-directory-excursion "source/generic/hyph-utf8"
-                  (substitute* "generate-converters.rb"
-                    (("\\$path_root=File.*")
-                     (string-append "$path_root=\"" root "\"\n"))
-                    ;; Avoid error with newer Ruby.
-                    (("#1\\{%") "#1{%%"))
-                  (invoke "ruby" "generate-converters.rb")))))
-          (replace 'install
-            (lambda* (#:key source #:allow-other-keys)
-              (mkdir-p #$output:doc)
-              (copy-recursively
-               (string-append source "/doc")
-               (string-append #$output:doc "/doc"))
-              (install-file
-               (string-append source "/tex/luatex/hyph-utf8/etex.src")
-               (string-append #$output "/share/texmf-dist/tex/luatex/hyph-utf8/")))))))
-    (native-inputs
-     (list ruby-2.7
-           texlive-bin
-           ;; The following packages are needed for build "tex.fmt", which we
-           ;; need for a working "tex".
-           texlive-cm
-           texlive-docstrip
-           texlive-knuth-lib
-           texlive-hyphen-base
-           texlive-plain))
-    (home-page "https://ctan.org/pkg/hyph-utf8")
-    (synopsis "Hyphenation patterns expressed in UTF-8")
-    (description "Modern native UTF-8 engines such as XeTeX and LuaTeX need
-hyphenation patterns in UTF-8 format, whereas older systems require
-hyphenation patterns in the 8-bit encoding of the font in use (such encodings
-are codified in the LaTeX scheme with names like OT1, T2A, TS1, OML, LY1,
-etc).  The present package offers a collection of conversions of existing
-patterns to UTF-8 format, together with converters for use with 8-bit fonts in
-older systems.  Since hyphenation patterns for Knuthian-style TeX systems are
-only read at iniTeX time, it is hoped that the UTF-8 patterns, with their
-converters, will completely supplant the older patterns.")
-    ;; Individual files each have their own license.  Most of these files are
-    ;; independent hyphenation patterns.
-    (license (list license:lppl1.0+
-                   license:lppl1.2+
-                   license:lppl1.3
-                   license:lppl1.3+
-                   license:lppl1.3a+
-                   license:lgpl2.1
-                   license:lgpl2.1+
-                   license:lgpl3+
-                   license:gpl2+
-                   license:gpl3+
-                   license:mpl1.1
-                   license:asl2.0
-                   license:expat
-                   license:bsd-3
-                   license:cc0
-                   license:public-domain
-                   license:wtfpl2))))
-
-(define-deprecated-package texlive-generic-hyph-utf8 texlive-hyph-utf8)
-
-(define-public texlive-dehyph
-  (package
-    (name "texlive-dehyph")
-    (version (number->string %texlive-revision))
-    (source (texlive-origin
-             name version
-             (list "tex/generic/dehyph/")
-             (base32
-              "0fkqlsknrlxk8zazcqy4q3nisxr3a4x21aiwqhz8s237rdf3w39g")))
-    (build-system texlive-build-system)
-    (home-page "https://ctan.org/pkg/dehyph")
-    (synopsis "German hyphenation patterns for traditional orthography")
-    (description
-     "The package provides older hyphenation patterns for the German language.
-Please note that by default only pdfLaTeX uses these patterns (mainly for
-backwards compatibility).  The older packages ghyphen and gnhyph are now
-bundled together with dehyph, and are no longer be updated.  Both XeLaTeX and
-LuaLaTeX use the current German hyphenation patterns taken from Hyphenation
-patterns in UTF-8, and using the Experimental hyphenation patterns for the
-German language package it is possible to make pdfLaTeX use the new German
-patterns as well.")
-    (license license:lppl1.0+)))
-
-(define-public texlive-dehyph-exptl
-  (package
-    (name "texlive-dehyph-exptl")
-    (version (number->string %texlive-revision))
-    (source (texlive-origin
-             name version
-             (list "doc/generic/dehyph-exptl/"
-                   "tex/generic/dehyph-exptl/")
-             (base32
-              "0l57a0r4gycp94kz6lrxqvh9m57j2shmbr2laf5zjb0qnrisq46d")))
-    (outputs '("out" "doc"))
-    (build-system texlive-build-system)
-    (arguments (list #:texlive-latex-base #f))
-    (propagated-inputs (list texlive-hyph-utf8 texlive-hyphen-base))
-    (home-page "https://ctan.org/pkg/dehyph-exptl")
-    (synopsis "Hyphenation patterns for German")
-    (description
-     "The package provides experimental hyphenation patterns for the German
-language, covering both traditional and reformed orthography.  The patterns
-can be used with packages Babel and @code{hyphsubst} from the Oberdiek
-bundle.")
-    ;; Hyphenation patterns are under the Expat license; documentation is
-    ;; under LPPL.
-    (license (list license:expat license:lppl))))
-
-(define-deprecated-package texlive-generic-dehyph-exptl texlive-dehyph-exptl)
-
-(define-public texlive-ukrhyph
-  (package
-    (name "texlive-ukrhyph")
-    (version (number->string %texlive-revision))
-    (source (texlive-origin
-             name version
-             (list "doc/generic/ukrhyph/" "tex/generic/ukrhyph/")
-             (base32
-              "01ma274sixcrbpb7fpqkxwfvrnzfj2srv9b4a42rfnph1pdql74z")))
-    (outputs '("out" "doc"))
-    (build-system texlive-build-system)
-    (arguments (list #:texlive-latex-base #f))
-    (home-page "https://ctan.org/pkg/ukrhyph")
-    (synopsis "Hyphenation Patterns for Ukrainian")
-    (description "The package provides a range of hyphenation patterns for
-Ukrainian, depending on the encoding of the output font including the standard
-T2A.")
-    (license license:lppl)))
-
-(define-public texlive-ruhyphen
-  (package
-    (name "texlive-ruhyphen")
-    (version (number->string %texlive-revision))
-    (source (texlive-origin
-             name version
-             (list "source/generic/ruhyphen/"
-                   "tex/generic/ruhyphen/")
-             (base32
-              "18n1bqhh8jv765vz3a3fjwffy7m71vhwx9yq8zl0p5j7p72q9qcn")))
-    (build-system texlive-build-system)
-    (arguments (list #:texlive-latex-base #f))
-    (home-page "https://ctan.org/pkg/ruhyphen")
-    (synopsis "Hyphenation patterns for Russian")
-    (description "The package provides a collection of Russian hyphenation
-patterns supporting a number of Cyrillic font encodings, including T2,
-UCY (Omega Unicode Cyrillic), LCY, LWN (OT2), and koi8-r.")
-    (license license:lppl)))
-
 (define-public texlive-inputenx
   (package
     (name "texlive-inputenx")
-- 
cgit 1.4.1


From 5f51601bd90ae05547313a36cce590c26bd6a6b2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 6 Jun 2023 13:49:00 +0200
Subject: guix: texlive importer ignores dependencies unnecessary in Guix.

* guix/import/texlive.scm (translate-depends): New function.
(tlpdb->package): Use new function.
* tests/texlive.scm (%fake-tlpdb): Add test data.
("texlive->guix-package, translate dependencies"):
("texlive->guix-package, lonely `hyphen-base' dependency and ARCH"): New tests.
---
 guix/import/texlive.scm | 45 +++++++++++++++++++--------
 tests/texlive.scm       | 83 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+), 13 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 36c6f3efb1..3b0f5cf5c1 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -125,6 +125,33 @@
                                (chr (char-downcase chr)))
                              name)))
 
+(define* (translate-depends depends #:optional texlive-only)
+  "Translate TeX Live packages DEPENDS into their equivalent Guix names
+in `(gnu packages tex)' module, without \"texlive-\" prefix.  The function
+also removes packages not necessary in Guix.
+
+When TEXLIVE-ONLY is true, only TeX Live packages are returned."
+  (delete-duplicates
+   (filter-map (match-lambda
+                 ;; Hyphenation.  Every TeX Live package is replaced with
+                 ;; "hyphen-complete", unless "hyphen-base" is the sole
+                 ;; dependency.
+                 ("hyphen-base"
+                  (and (not (member "hyph-utf8" depends))
+                       "hyphen-base"))
+                 ((or (? (cut string-prefix? "hyphen-" <>))
+                      "hyph-utf8" "dehyph" "dehyph-exptl" "ruhyphen" "ukrhyph")
+                  (and (not texlive-only) "hyphen-complete"))
+                 ;; Binaries placeholders are ignored.
+                 ((? (cut string-suffix? ".ARCH" <>)) #f)
+                 ;; So are TeX Live specific packages.
+                 ((or (? (cut string-prefix? "texlive-" <>))
+                      "tlshell" "texlive.infra")
+                  #f)
+                 ;; Others.
+                 (name name))
+               depends)))
+
 (define (tlpdb-file)
   (define texlive-bin
     ;; Resolve this variable lazily so that (gnu packages ...) does not end up
@@ -293,11 +320,7 @@ of those files are returned that are unexpectedly installed."
                    (locations locs)
                    (revision %texlive-revision)))
              ;; Ignore arch-dependent packages.
-             (filtered-depends
-              (or (and=> (assoc-ref data 'depend)
-                         (lambda (inputs)
-                           (remove (cut string-suffix? ".ARCH" <>) inputs)))
-                  '()))
+             (depends (or (assoc-ref data 'depend) '()))
              (source (with-store store
                        (download-multi-svn-to-store
                         store ref (string-append name "-svn-multi-checkout")))))
@@ -352,16 +375,12 @@ of those files are returned that are unexpectedly installed."
                                  runfiles)))
                   '((native-inputs (list texlive-metafont))))
                 '())
-          ,@(match filtered-depends
+          ,@(match (translate-depends depends)
               (() '())
               (inputs
                `((propagated-inputs
-                  (list ,@(filter-map
-                           (lambda (tex-name)
-                             (let ((name (guix-name tex-name)))
-                               (string->symbol name)))
-                           ;; Sort inputs alphabetically.
-                           (reverse inputs)))))))
+                  (list ,@(map (compose string->symbol guix-name)
+                               (sort inputs string<?)))))))
           (home-page
            ,(cond
              (meta-package? "https://www.tug.org/texlive/")
@@ -376,7 +395,7 @@ of those files are returned that are unexpectedly installed."
               '(license:fsf-free "https://www.tug.org/texlive/copying.html"))
              ((assoc-ref data 'catalogue-license) => string->license)
              (else #f))))
-       filtered-depends))))
+       (translate-depends depends #t)))))
 
 (define texlive->guix-package
   (memoize
diff --git a/tests/texlive.scm b/tests/texlive.scm
index 6633895ae1..975f36c1be 100644
--- a/tests/texlive.scm
+++ b/tests/texlive.scm
@@ -81,6 +81,12 @@
          .
          ("texmf-dist/tex/latex/chs-physics-report/chs-physics-report.sty"))
         (catalogue-license . "pd cc-by-sa-3")))
+    ("collection-basic"
+     (name . "collection-basic")
+     (shortdesc . "Essential programs and files")
+     (longdesc . "These files are regarded as basic...")
+     (depend "amsfonts" "hyph-utf8" "hyphen-base" "texlive-common"
+             "texlive.infra" "tlshell"))
     ("collection-texworks"
      (name . "collection-texworks")
      (shortdesc . "TeXworks editor...")
@@ -146,6 +152,17 @@ stuff like \\newcommand\\pi'12{\\pi '_{12}}.")
          . ("texmf-dist/tex/lualatex/stricttex/stricttex.lua"
             "texmf-dist/tex/lualatex/stricttex/stricttex.sty"))
         (catalogue-license . "lppl1.3c")))
+    ("tex"
+     (name . "tex")
+     (shortdesc . "A sophisticated typesetting engine")
+     (longdesc . "TeX is a typesetting system that incorporates...")
+     (depend "cm" "hyphen-base" "tex.ARCH")
+     (docfiles
+      "texmf-dist/doc/man/man1/initex.1"
+      "texmf-dist/doc/man/man1/initex.man1.pdf"
+      "texmf-dist/doc/man/man1/tex.1"
+      "texmf-dist/doc/man/man1/tex.man1.pdf")
+     (catalogue-license . "knuth"))
     ("texsis"
      . ((name
          . "texsis")
@@ -561,4 +578,70 @@ completely compatible with Plain TeX.")
                (format #t "~s~%" result)
                (pk 'fail result #f)))))))
 
+(test-assert "texlive->guix-package, translate dependencies"
+  ;; Replace network resources with sample data.
+  (mock ((guix build svn) svn-fetch
+         (lambda* (url revision directory
+                       #:key (svn-command "svn")
+                       (user-name #f)
+                       (password #f)
+                       (recursive? #t))
+           (mkdir-p directory)
+           (with-output-to-file (string-append directory "/foo")
+             (lambda ()
+               (display "source")))))
+        (let ((result (texlive->guix-package "collection-basic"
+                                             #:package-database
+                                             (lambda _ %fake-tlpdb))))
+          (match result
+            (('package
+               ('name "texlive-collection-basic")
+               ('version _)
+               ('source _)
+               ('build-system 'texlive-build-system)
+               ('propagated-inputs
+                ('list 'texlive-amsfonts 'texlive-hyphen-complete))
+               ('home-page (? string?))
+               ('synopsis (? string?))
+               ('description (? string?))
+               ('license _))
+             #true)
+            (_
+             (begin
+               (format #t "~s~%" result)
+               (pk 'fail result #f)))))))
+
+(test-assert "texlive->guix-package, lonely `hyphen-base' dependency and ARCH"
+  ;; Replace network resources with sample data.
+  (mock ((guix build svn) svn-fetch
+         (lambda* (url revision directory
+                       #:key (svn-command "svn")
+                       (user-name #f)
+                       (password #f)
+                       (recursive? #t))
+           (mkdir-p directory)
+           (with-output-to-file (string-append directory "/foo")
+             (lambda ()
+               (display "source")))))
+        (let ((result (texlive->guix-package "tex"
+                                             #:package-database
+                                             (lambda _ %fake-tlpdb))))
+          (match result
+            (('package
+               ('name "texlive-tex")
+               ('version _)
+               ('source _)
+               ('build-system 'texlive-build-system)
+               ('propagated-inputs
+                ('list 'texlive-cm 'texlive-hyphen-base))
+               ('home-page (? string?))
+               ('synopsis (? string?))
+               ('description (? string?))
+               ('license _))
+             #true)
+            (_
+             (begin
+               (format #t "~s~%" result)
+               (pk 'fail result #f)))))))
+
 (test-end "texlive")
-- 
cgit 1.4.1


From 0224a8f400278c0afafc0aa4d45ee5ee261df59b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 10:09:21 +0200
Subject: guix: texlive importer: Fix build system and arguments for
 meta-packages.

* guix/import/texlive.scm (tlpdb->package): Meta packages should use trivial
build system and an appropriate builder.
* tests/texlive.scm ("texlive->guix-package, meta-package"):
("texlive->guix-package, translate dependencies"): Update tests.
---
 guix/import/texlive.scm | 38 ++++++++++++++++++++++----------------
 tests/texlive.scm       | 15 ++++++++-------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 3b0f5cf5c1..a39e327d45 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -342,24 +342,30 @@ of those files are returned that are unexpectedly installed."
           ,@(if (assoc-ref data 'docfiles)
                 '((outputs '("out" "doc")))
                 '())
-          (build-system texlive-build-system)
+          (build-system ,(if meta-package?
+                             'trivial-build-system
+                             'texlive-build-system))
           ;; Translate AddFormat execute actions into a `#:create-formats'
           ;; argument.
-          ,@(or (and-let*
-                    ((actions (assoc-ref data 'execute))
-                     (formats
-                      (delete-duplicates
-                       (filter-map (lambda (action)
-                                     (match (string-split action #\space)
-                                       (("AddFormat" name . _)
-                                        (string-drop name
-                                                     (string-length "name=")))
-                                       (  #f)))
-                                   actions)))
-                     ((not (null? formats))))
-                  `((arguments
-                     (list #:create-formats #~(list ,@(reverse formats))))))
-                '())
+          ,@(cond
+             (meta-package? '((arguments (list #:builder #~(mkdir #$output)))))
+             ((and-let* ((actions (assoc-ref data 'execute))
+                         (formats
+                          (delete-duplicates
+                           (filter-map
+                            (lambda (action)
+                              (match (string-split action #\space)
+                                (("AddFormat" name . _)
+                                 (string-drop name (string-length "name=")))
+                                (  #f)))
+                            actions)))
+                         ((not (null? formats))))
+                formats)
+              =>
+              (lambda (formats)
+                `((arguments
+                   (list #:create-formats #~(list ,@(reverse formats)))))))
+             (else '()))
           ;; Texlive build system generates font metrics whenever a font
           ;; metrics file has the same base name as a Metafont file.
           ,@(or (and-let* ((runfiles (assoc-ref data 'runfiles))
diff --git a/tests/texlive.scm b/tests/texlive.scm
index 975f36c1be..64ab6a2e2e 100644
--- a/tests/texlive.scm
+++ b/tests/texlive.scm
@@ -157,11 +157,7 @@ stuff like \\newcommand\\pi'12{\\pi '_{12}}.")
      (shortdesc . "A sophisticated typesetting engine")
      (longdesc . "TeX is a typesetting system that incorporates...")
      (depend "cm" "hyphen-base" "tex.ARCH")
-     (docfiles
-      "texmf-dist/doc/man/man1/initex.1"
-      "texmf-dist/doc/man/man1/initex.man1.pdf"
-      "texmf-dist/doc/man/man1/tex.1"
-      "texmf-dist/doc/man/man1/tex.man1.pdf")
+     (docfiles "texmf-dist/doc/man/man1/tex.1")
      (catalogue-license . "knuth"))
     ("texsis"
      . ((name
@@ -495,7 +491,9 @@ completely compatible with Plain TeX.")
                ('name "texlive-collection-texworks")
                ('version _)
                ('source #f)
-               ('build-system 'texlive-build-system)
+               ('build-system 'trivial-build-system)
+               ('arguments
+                ('list '#:builder ('gexp ('mkdir ('ungexp 'output)))))
                ('propagated-inputs
                 ('list 'texlive-collection-basic 'texlive-texworks))
                ('home-page "https://www.tug.org/texlive/")
@@ -598,7 +596,9 @@ completely compatible with Plain TeX.")
                ('name "texlive-collection-basic")
                ('version _)
                ('source _)
-               ('build-system 'texlive-build-system)
+               ('build-system 'trivial-build-system)
+               ('arguments
+                ('list '#:builder ('gexp ('mkdir ('ungexp 'output)))))
                ('propagated-inputs
                 ('list 'texlive-amsfonts 'texlive-hyphen-complete))
                ('home-page (? string?))
@@ -631,6 +631,7 @@ completely compatible with Plain TeX.")
                ('name "texlive-tex")
                ('version _)
                ('source _)
+               ('outputs _)
                ('build-system 'texlive-build-system)
                ('propagated-inputs
                 ('list 'texlive-cm 'texlive-hyphen-base))
-- 
cgit 1.4.1


From 09283bb0ab560ae50b33a504368d8769a7d04a50 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 8 Jun 2023 23:15:55 +0200
Subject: gnu: Add texlive-luahbtex.

* gnu/packages/tex.scm (texlive-luahbtex): New variable.
---
 gnu/packages/tex.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 21593d190e..effec09698 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3492,6 +3492,38 @@ 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-luahbtex
+  (package
+    (name "texlive-luahbtex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/luahbtex.1"
+                   "doc/man/man1/luahbtex.man1.pdf")
+             (base32
+              "0w4hfjmjgiw42bpz1b59cla8v4s6kik54q6wdhmdjy6jp91rfl2i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:texlive-latex-base #f
+      #:create-formats #~(list "luahbtex")))
+    (propagated-inputs
+     (list texlive-cm
+           texlive-etex
+           texlive-hyphen-complete
+           texlive-knuth-lib
+           texlive-luatex
+           texlive-plain
+           texlive-tex-ini-files
+           texlive-unicode-data))
+    (home-page "https://ctan.org/pkg/luahbtex")
+    (synopsis "LuaTeX with HarfBuzz library for glyph shaping")
+    (description
+     "LuaHBTeX is a LuaTeX variant that can use the HarfBuzz engine for glyph
+shaping, instead of LuaTeX's built-in shaper.")
+    (license (package-license texlive-luatex))))
+
 ;; TODO: We should be able to build this from the sources on Github with
 ;; texlive-l3build, but I haven't been able to get it to work.
 (define-public texlive-luaotfload
-- 
cgit 1.4.1


From 3556df7323637d23c1b38e6adccdac45745810aa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 07:21:47 +0200
Subject: gnu: Add texlive-hyphenex.

* gnu/packages/tex.scm (texlive-hyphenex): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index effec09698..f89084b2e5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -982,6 +982,27 @@ the autogenerated files @file{language.dat} and @file{language.def} (and
 default versions of those), etc.")
     (license license:knuth)))
 
+(define-public texlive-hyphenex
+  (package
+    (name "texlive-hyphenex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "source/generic/hyphenex/"
+                   "tex/generic/hyphenex/")
+             (base32
+              "1v1p93i56xgp01zly30bkfgb9py8nav1r620dbgz1q7438zbhzpp")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hyphenex")
+    (synopsis "US English hyphenation exceptions file")
+    (description
+     "Exceptions for American English hyphenation patterns are occasionally
+published in the TeX User Group journal TUGboat.  This bundle provides
+alternative Perl and Bourne shell scripts to convert the source of such an
+article into an exceptions file, together with a recent copy of the article
+and machine-readable files.")
+    (license license:public-domain)))
+
 (define-public texlive-dvipdfmx
   (package
     (name "texlive-dvipdfmx")
-- 
cgit 1.4.1


From a2e8d5d62e76ac50791d1641edc0087677d13912 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 07:35:51 +0200
Subject: gnu: Add texlive-makeindex.

* gnu/packages/tex.scm (texlive-makeindex): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f89084b2e5..c545f1c381 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5501,6 +5501,30 @@ always (re)defines a command.  There is also @code{\\makeenvironment} and
 @code{\\provideenvironment} for environments.")
     (license license:lppl1.3c+)))
 
+(define-public texlive-makeindex
+  (package
+    (name "texlive-makeindex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/makeindex.1"
+                   "doc/man/man1/makeindex.man1.pdf"
+                   "doc/man/man1/mkindex.1"
+                   "doc/man/man1/mkindex.man1.pdf"
+                   "doc/support/makeindex/"
+                   "makeindex/base/"
+                   "tex/plain/makeindex/")
+             (base32
+              "197zgsrca14paavzknjx2q4ayl0lrma0z8q78ir6536s9xwn0w33")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/makeindexk")
+    (synopsis "Makeindex development sources")
+    (description
+     "The package contains the development sources of MakeIndex.")
+    (license
+     (license:fsf-free "https://mirrors.ctan.org/indexing/makeindex/COPYING"))))
+
 (define-public texlive-marginfix
   (package
     (name "texlive-marginfix")
-- 
cgit 1.4.1


From d224cf077b1d7629a478b4f0f9a8a3c85bb7ca51 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 08:30:19 +0200
Subject: gnu: Add texlive-xdvi.

* gnu/packages/tex.scm (texlive-xdvi): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c545f1c381..acc8b4b7ed 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12592,6 +12592,28 @@ reporting the number of the last page, as does @code{lastpage}).  The counter
 itself may be shipped out to the DVI file.")
     (license license:lppl)))
 
+(define-public texlive-xdvi
+  (package
+    (name "texlive-xdvi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/xdvi.1"
+                   "doc/man/man1/xdvi.man1.pdf" "dvips/xdvi/"
+                   "xdvi/")
+             (base32
+              "17cqim8dwsbpcr7cd97fklsyaiwj7d7d0k2zkcv7981fcqinw5pn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xdvi")
+    (synopsis "DVI previewer for the X Window System")
+    (description
+     "Xdvi is the canonical DVI previewer for use on Unix and other X-windows
+based systems.  The distribution has been integrated with that of Xdvik, so
+that it will build with web2c out of the box.")
+    ;; Xdvi is under MIT terms, whereas Xdvik extensions use BS2-2.
+    (license (list license:expat license:bsd-2))))
+
 (define-public texlive-xetexconfig
   (package
     (name "texlive-xetexconfig")
-- 
cgit 1.4.1


From 4b61118ead54c7843d30b8009b15858f9a6683ae Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 08:47:54 +0200
Subject: gnu: Add texlive-collection-basic.

* gnu/packages/tex.scm (texlive-collection-basic): New variable.
---
 gnu/packages/tex.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index acc8b4b7ed..35fdb2a50e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10859,6 +10859,55 @@ Arguments may contain verbatim material or other special use of characters.
 The macros were designed for use within other macros.")
     (license license:lppl1.3)))
 
+(define-public texlive-collection-basic
+  (package
+    (name "texlive-collection-basic")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+   (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-amsfonts
+           texlive-bibtex
+           texlive-cm
+           texlive-colorprofiles
+           texlive-dvipdfmx
+           texlive-dvips
+           texlive-ec
+           texlive-enctex
+           texlive-etex
+           texlive-etex-pkg
+           texlive-glyphlist
+           texlive-graphics-def
+           texlive-hyphen-complete
+           texlive-hyphenex
+           texlive-ifplatform
+           texlive-iftex
+           texlive-knuth-lib
+           texlive-knuth-local
+           texlive-kpathsea
+           texlive-lua-alt-getopt
+           texlive-luahbtex
+           texlive-luatex
+           texlive-makeindex
+           texlive-metafont
+           texlive-mflogo
+           texlive-mfware
+           texlive-modes
+           texlive-pdftex
+           texlive-plain
+           texlive-tex
+           texlive-tex-ini-files
+           texlive-unicode-data
+           texlive-xdvi))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Essential programs and files")
+    (description
+     "These files are regarded as basic for any TeX system, covering plain TeX
+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-grfext
   (package
     (name "texlive-grfext")
-- 
cgit 1.4.1


From 59b6b27a03bb467781d0f0087bf11d608e78f0e2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 08:50:53 +0200
Subject: gnu: Add texlive-babelbib.

* gnu/packages/tex.scm (texlive-babelbib): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 35fdb2a50e..144dbd9b4f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3744,6 +3744,28 @@ polyglossia package rather than Babel.")
 
 (define-deprecated-package texlive-latex-babel texlive-babel)
 
+(define-public texlive-babelbib
+  (package
+    (name "texlive-babelbib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/babelbib/"
+                   "doc/bibtex/babelbib/" "tex/latex/babelbib/")
+             (base32
+              "0q65qy0jmy98zfaha26b09hzr7v02jn8i6942y51hfaphbgh8kpx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babelbib")
+    (synopsis "Multilingual bibliographies")
+    (description
+     "This package enables the user to generate multilingual bibliographies in
+cooperation with @code{babel}.  Two approaches are possible: each citation may
+be written in another language, or the whole bibliography can be typeset in
+a language chosen by the user.  In addition, the package supports commands to
+change the typography of the bibliographies.")
+    (license license:lppl1.0+)))
+
 (define-public texlive-cmexb
   (package
     (name "texlive-cmexb")
-- 
cgit 1.4.1


From 07e76f9e06479f60b4f29758395c76e4ddc4e6a5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 08:53:55 +0200
Subject: gnu: Add texlive-fix2col.

* gnu/packages/tex.scm (texlive-fix2col): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 144dbd9b4f..6a9cdc68eb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4567,6 +4567,31 @@ but non-expandable ones.")
 
 (define-deprecated-package texlive-latex-filemod texlive-filemod)
 
+(define-public texlive-fix2col
+  (package
+    (name "texlive-fix2col")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fix2col/" "source/latex/fix2col/"
+                   "tex/latex/fix2col/")
+             (base32
+              "04mzs1qn9ish5sdp1v9adqvl92ljbs9rjxxfsqskalm4g9ckn8dy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fix2col")
+    (synopsis "Fix miscellaneous two column mode features")
+    (description
+     "This package is obsolete; do not use in new documents.  It will do
+nothing in LaTeX formats after 2015/01/01 as the fixes that it implements were
+incorporated into the @code{fixltx2e} package, which is itself obsolete as
+since the 2015/01/01 release these fixes are in the LaTeX format itself.
+
+Fix mark handling so that @code{\\firstmark} is taken from the first column if
+that column has any marks at all; keep two column floats like @code{figure*}
+in sequence with single column floats like figure.")
+    (license license:lppl)))
+
 (define-public texlive-hanging
   (package
     (name "texlive-hanging")
-- 
cgit 1.4.1


From 752779d98ad050810fe8b6e8ead9d16b1c6b308d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 08:58:05 +0200
Subject: gnu: Add texlive-latex-bin.

* gnu/packages/tex.scm (texlive-latex-bin): New variable.
---
 gnu/packages/tex.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6a9cdc68eb..133a394b98 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2267,6 +2267,57 @@ the required packages, constitutes what every LaTeX distribution should
 contain.")
     (license license:lppl1.3c+)))
 
+(define-public texlive-latex-bin
+  (package
+    (name "texlive-latex-bin")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/dvilualatex.1"
+                   "doc/man/man1/dvilualatex.man1.pdf"
+                   "doc/man/man1/latex.1"
+                   "doc/man/man1/latex.man1.pdf"
+                   "doc/man/man1/lualatex.1"
+                   "doc/man/man1/lualatex.man1.pdf"
+                   "doc/man/man1/pdflatex.1"
+                   "doc/man/man1/pdflatex.man1.pdf")
+             (base32
+              "1mkiqwq28lbw9iaisfza1xg9wss4zazx9i2szprqgjfkw5c0yipi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:texlive-latex-base #f
+      #:create-formats #~(list "dvilualatex" "latex" "lualatex" "pdflatex")))
+    (propagated-inputs
+     (list texlive-atbegshi
+           texlive-atveryend
+           texlive-babel
+           texlive-cm
+           texlive-everyshi
+           texlive-firstaid
+           texlive-graphics
+           texlive-hyphen-complete
+           texlive-l3backend
+           texlive-l3kernel
+           texlive-l3packages
+           texlive-latex
+           texlive-latex-fonts
+           texlive-latexconfig
+           texlive-lm
+           texlive-luahbtex
+           texlive-luaotfload
+           texlive-luatex
+           texlive-pdftex
+           texlive-tex-ini-files
+           texlive-unicode-data))
+    (home-page "https://ctan.org/pkg/latex-bin")
+    (synopsis "LaTeX formats and man pages")
+    (description
+     "This package provides LaTeX format files and man pages along with
+several packages that are considered as part of the LaTeX kernel.")
+    (license license:lppl1.3c+)))
+
 (define-public texlive-atenddvi
   (package
     (name "texlive-atenddvi")
-- 
cgit 1.4.1


From 6eb4a3e4925450be9cb08c9f624be8d495e198e1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 09:11:04 +0200
Subject: gnu: Add texlive-mfnfss.

* gnu/packages/tex.scm (texlive-mfnfss): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 133a394b98..619ddcdb67 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1187,6 +1187,28 @@ word in the phrase, where the words are separated by regular
 spaces.  (Exceptions can be made for words that shouldn't be converted.)")
     (license license:lppl1.3+)))
 
+(define-public texlive-mfnfss
+  (package
+    (name "texlive-mfnfss")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mfnfss/" "source/latex/mfnfss/"
+                   "tex/latex/mfnfss/")
+             (base32
+              "1775vg12sk38givqq2zjapx4nxlyl95rf596r2inf8mv5phsi704")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mfnfss")
+    (synopsis "Packages to typeset old german and Pandora fonts in LaTeX")
+    (description
+     "This bundle contains two packages: @code{oldgerm}, a package to typeset
+with old german fonts designed by Yannis Haralambous, and @code{pandora},
+a package to typeset with Pandora fonts designed by Neena Billawala.  Note
+that support for the Pandora fonts is also available via the
+@code{pandora-latex} package.")
+    (license license:lppl)))
+
 (define-public texlive-modes
   (package
     (name "texlive-modes")
-- 
cgit 1.4.1


From 3a6a5d1661cc6ea064a8cbbc954036e7b2be36b8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 09:13:51 +0200
Subject: gnu: Add texlive-ltxmisc.

* gnu/packages/tex.scm (texlive-ltxmisc): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 619ddcdb67..dcde3a0a9e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9050,6 +9050,32 @@ plain TeX.")
 
 (define-deprecated-package texlive-generic-ltxcmds texlive-ltxcmds)
 
+(define-public texlive-ltxmisc
+  (package
+    (name "texlive-ltxmisc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/latex/ltxmisc/")
+             (base32
+              "14llkpla8gpx7q6a53sd8a0a42wgk93fg4mbl6pc0v7v1kjblr5m")))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'delete-non-free-file
+                 ;; This file has a non-commercial license.
+                 (lambda _ (delete-file "tex/latex/ltxmisc/vrbexin.sty"))))))
+    (home-page "https://ctan.org/pkg/ltxmisc")
+    (synopsis "Miscellaneous LaTeX packages")
+    (description
+     "This package provides miscellaneous LaTeX packages and classes.")
+    (license (list license:public-domain ;beletter.cls
+                   license:gpl2+         ;bibcheck.sty
+                   license:lppl          ;iagproc.cls
+                   (license:fsf-free "file:/linsys.sty")
+                   license:lppl1.0+)))) ;topcapt.sty
+
 (define-public texlive-pdfescape
   (package
     (name "texlive-pdfescape")
-- 
cgit 1.4.1


From b27c1f572355f3ab33e9a258cc2d59700baf4b0d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 09:14:01 +0200
Subject: gnu: Add texlive-pagesel.

* gnu/packages/tex.scm (texlive-pagesel): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dcde3a0a9e..3f68e4bdd0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10899,6 +10899,25 @@ whether an argument is empty.")
 page (also known as end notes).")
     (license license:lppl1.3c+)))
 
+(define-public texlive-pagesel
+  (package
+    (name "texlive-pagesel")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pagesel/" "source/latex/pagesel/"
+                   "tex/latex/pagesel/")
+             (base32
+              "1x4nb53d5gm0vrhiinaqf6ai63bgjpbw0b5kk3c2f6j6gfvp0n53")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pagesel")
+    (synopsis "Select pages of a document for output")
+    (description
+     "This package selects single pages, ranges of pages, odd pages or even
+pages for output.  The package is part of the @code{oberdiek} bundle.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-titling
   (package
     (name "texlive-titling")
-- 
cgit 1.4.1


From ba03db6809135fa7eec33cca9a8a05c82b5d654b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 09:16:41 +0200
Subject: gnu: Add texlive-pslatex.

* gnu/packages/tex.scm (texlive-pslatex): New variable.
---
 gnu/packages/tex.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3f68e4bdd0..9f9a8628ae 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12121,6 +12121,39 @@ attribute.  Pages with this attribute will be displayed in landscape
 orientation by conforming PDF viewers.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pslatex
+  (package
+    (name "texlive-pslatex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/map/dvips/pslatex/"
+                   "fonts/tfm/public/pslatex/"
+                   "fonts/vf/public/pslatex/"
+                   "source/latex/pslatex/fontinst/"
+                   "source/latex/pslatex/shell/"
+                   "tex/latex/pslatex/")
+             (base32
+              "1jazd3wl614c7nxl89aj7bhdahhq3h6rrs3p5cyzwqmw3b8h2zrl")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pslatex")
+    (synopsis "Use PostScript fonts by default")
+    (description
+     "This package provides a small package that makes LaTeX default to
+standard PostScript fonts.  It is basically a merger of the @code{times} and
+the (obsolete) @code{mathptm} packages from the @code{psnfss} suite.  You must
+have installed standard LaTeX and the @code{psnfss} PostScript fonts to use
+this package.  The main novel feature is that the @code{pslatex} package tries
+to compensate for the visual differences between the Adobe fonts by scaling
+Helvetica by 90%, and condensing Courier (i.e.  scaling horizontally) by 85%.
+The package is supplied with a (unix) shell file for a @command{pslatex}
+command that allows standard LaTeX documents to be processed, without needing
+to edit the file.  Note that current @code{psnfss} uses a different technique
+for scaling Helvetica, and treats Courier as a lost cause (there are better
+free fixed-width available now, than there were when @code{pslatex} was
+designed).  As a result, @code{pslatex} is widely considered obsolete.")
+    (license license:lppl)))
+
 (define-public texlive-datetime2
   (package
     (name "texlive-datetime2")
-- 
cgit 1.4.1


From 95c473ad8b88235da459873791d6243b9f5a7ef6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 09:18:18 +0200
Subject: gnu: Add texlive-pspicture.

* gnu/packages/tex.scm (texlive-pspicture): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9f9a8628ae..b10aba3b4b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12154,6 +12154,27 @@ free fixed-width available now, than there were when @code{pslatex} was
 designed).  As a result, @code{pslatex} is widely considered obsolete.")
     (license license:lppl)))
 
+(define-public texlive-pspicture
+  (package
+    (name "texlive-pspicture")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pspicture/" "dvips/pspicture/"
+                   "source/latex/pspicture/"
+                   "tex/latex/pspicture/")
+             (base32
+              "06wlnwyn45873zghnbw16lzmfj98r9il218z84p1ixw6jwkwlkh8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pspicture")
+    (synopsis "PostScript picture support")
+    (description
+     "This package provides a replacement for LaTeX's picture macros, that
+uses PostScript @code{\\special} commands.  The package is now largely
+superseded by @code{pict2e}.")
+    (license license:lppl)))
+
 (define-public texlive-datetime2
   (package
     (name "texlive-datetime2")
-- 
cgit 1.4.1


From 975ddd136dc5f02f9ff86ee01f655df5650019b3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 09:18:57 +0200
Subject: gnu: Add texlive-collection-latex.

* gnu/packages/tex.scm (texlive-collection-latex): New variable.
---
 gnu/packages/tex.scm | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b10aba3b4b..ee123263a9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11073,6 +11073,78 @@ 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-latex
+  (package
+    (name "texlive-collection-latex")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-ae
+           texlive-amscls
+           texlive-amsmath
+           texlive-atbegshi
+           texlive-atveryend
+           texlive-auxhook
+           texlive-babel
+           texlive-babel-english
+           texlive-babelbib
+           texlive-bigintcalc
+           texlive-bitset
+           texlive-bookmark
+           texlive-carlisle
+           texlive-collection-basic
+           texlive-colortbl
+           texlive-epstopdf-pkg
+           texlive-etexcmds
+           texlive-fancyhdr
+           texlive-firstaid
+           texlive-fix2col
+           texlive-geometry
+           texlive-gettitlestring
+           texlive-graphics
+           texlive-graphics-cfg
+           texlive-grfext
+           texlive-hopatch
+           texlive-hycolor
+           texlive-hyperref
+           texlive-intcalc
+           texlive-kvdefinekeys
+           texlive-kvoptions
+           texlive-kvsetkeys
+           texlive-l3backend
+           texlive-l3kernel
+           texlive-l3packages
+           texlive-latex
+           texlive-latex-bin
+           texlive-latex-fonts
+           texlive-latexconfig
+           texlive-letltxmacro
+           texlive-ltxcmds
+           texlive-ltxmisc
+           texlive-mfnfss
+           texlive-mptopdf
+           texlive-natbib
+           texlive-oberdiek
+           texlive-pagesel
+           texlive-pdfescape
+           texlive-pslatex
+           texlive-psnfss
+           texlive-pspicture
+           texlive-refcount
+           texlive-rerunfilecheck
+           texlive-stringenc
+           texlive-tools
+           texlive-uniquecounter
+           texlive-url))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "LaTeX fundamental packages")
+    (description
+     "These packages are either mandated by the core LaTeX team, or very widely
+used and strongly recommended in practice.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-grfext
   (package
     (name "texlive-grfext")
-- 
cgit 1.4.1


From 14e6091b841371a6e6a97b3088c24f487d6560ac Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 17:40:53 +0200
Subject: gnu: Add texlive-scheme-basic.

* gnu/packages/tex.scm (texlive-scheme-basic): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ee123263a9..0932f535fe 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11034,6 +11034,7 @@ The macros were designed for use within other macros.")
     (propagated-inputs
      (list texlive-amsfonts
            texlive-bibtex
+           texlive-bin                  ;set GUIX TEXMF and engines
            texlive-cm
            texlive-colorprofiles
            texlive-dvipdfmx
@@ -13043,6 +13044,23 @@ break statement, except that the loop does not terminate until the end of the
 current iteration.")
     (license license:lppl)))
 
+(define-public texlive-scheme-basic
+  (package
+    (name "texlive-scheme-basic")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs (list texlive-collection-basic texlive-collection-latex))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Basic scheme (plain and latex)")
+    (description
+     "This is the basic TeX Live scheme: it is a small set of files sufficient
+to typeset plain TeX or LaTeX documents in PostScript or PDF, using the
+Computer Modern fonts.  This scheme corresponds to @code{collection-basic} and
+@code{collection-latex}.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 ;;;
 ;;; 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
-- 
cgit 1.4.1


From 7e92d1c84fa73fc1a8fa48dad6462eec01ca2003 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 9 Jun 2023 18:30:51 +0200
Subject: gnu: Add texlive-scheme-minimal.

* gnu/packages/tex.scm (texlive-scheme-minimal): New variable.
---
 gnu/packages/tex.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0932f535fe..7e0c1261f5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13044,6 +13044,23 @@ break statement, except that the loop does not terminate until the end of the
 current iteration.")
     (license license:lppl)))
 
+(define-public texlive-scheme-minimal
+  (package
+    (name "texlive-scheme-minimal")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs (list texlive-collection-basic))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Minimal scheme (plain only)")
+    (description
+     "This is the minimal TeX Live scheme, with support for only plain
+TeX. (No LaTeX macros.) LuaTeX is included because Lua scripts are used in TeX
+Live infrastructure.  This scheme corresponds exactly to
+@code{collection-basic}.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-scheme-basic
   (package
     (name "texlive-scheme-basic")
-- 
cgit 1.4.1


From 016fd706b344177b493fccf93033628ddafe44ad Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 11 Jun 2023 17:52:09 +0200
Subject: gnu: Add texlive-aeguill.

* gnu/packages/tex.scm (texlive-aeguill): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7e0c1261f5..9b0c10e14a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6488,6 +6488,26 @@ fonts.  Note that direct substitutes for the bitmapped EC fonts are available,
 via the CM-super, Latin Modern and (in a restricted way) CM-LGC font sets.")
     (license license:lppl1.3+)))
 
+(define-public texlive-aeguill
+  (package
+    (name "texlive-aeguill")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/aeguill/" "tex/latex/aeguill/")
+             (base32
+              "0dbl2dky8gbax9blj0nvk23y2pwkmyikxnbbn27zivpamwc0j8nc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/aeguill")
+    (synopsis "Add several kinds of guillemets to the @code{ae} fonts")
+    (description
+     "The package enables the user to add guillemets from several
+source (Polish cmr, Cyrillic cmr, lasy and ec) to the @code{ae} fonts.  This
+was useful when the @code{ae} fonts were used to produce PDF files, since the
+additional guillemets exist in fonts available in Adobe Type 1 format.")
+    (license license:lppl)))
+
 (define-public texlive-incgraph
   (package
     (name "texlive-incgraph")
-- 
cgit 1.4.1


From f1b21bcfb1c024a2830d3e2817970bd9056a7756 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 12 Jun 2023 16:38:37 +0200
Subject: gnu: Install missing files for updmap in texlive-bin.

* gnu/packages/tex.scm (texlive-scripts): New variable.
(texlive-bin)[inputs]: Use new variable.
[arguments]<#:phases>: Copy font files in addition to scripts.
(texlive-tetex): Remove variable.
(texlive-base): Remove reference to TEXLIVE-TETEX.
---
 gnu/packages/tex.scm | 72 ++++++++++++++++++++--------------------------------
 1 file changed, 28 insertions(+), 44 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9b0c10e14a..63b835c6bb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -108,6 +108,16 @@
   (define-deprecated/public old-name name
     (deprecated-package (symbol->string 'old-name) name)))
 
+(define texlive-scripts
+  (texlive-origin
+   "texlive-scripts" (number->string %texlive-revision)
+   (list "dvips/tetex/"
+         "fonts/enc/dvips/tetex/"
+         "fonts/map/dvips/tetex/"
+         "scripts/texlive/")
+   (base32
+    "0y571gddch111r2chjfkyjsm4zk24xxiv2rcczb5apf6d0g211b9")))
+
 (define-public texlive-hyphen-complete
   (package
     (name "texlive-hyphen-complete")
@@ -369,20 +379,7 @@ and should be preferred to it whenever a package would otherwise depend on
     (inputs
      `(("texlive-extra-src" ,texlive-extra-src)
        ("config" ,config)
-       ("texlive-scripts"
-        ,(origin
-           (method svn-fetch)
-           (uri (svn-reference
-                 (url (string-append "svn://www.tug.org/texlive/tags/"
-                                     %texlive-tag "/Master/texmf-dist/"
-                                     "/scripts/texlive"))
-                 (revision %texlive-revision)))
-           (file-name (string-append "texlive-scripts-"
-                                     (number->string %texlive-revision)
-                                     "-checkout"))
-           (sha256
-            (base32
-             "1jrphfjhmw17rp1yqsl70shmvka3vg0g8841q6zx2lfn48p7vqf3"))))
+       ("texlive-scripts" ,texlive-scripts)
        ("cairo" ,cairo)
        ("fontconfig" ,fontconfig)
        ("fontforge" ,fontforge)
@@ -505,12 +502,14 @@ and should be preferred to it whenever a package would otherwise depend on
              (with-directory-excursion "texlive-extra"
                (apply (assoc-ref %standard-phases 'unpack)
                       (list #:source (assoc-ref inputs "texlive-extra-src"))))))
-         (add-after 'unpack-texlive-extra 'unpack-texlive-scripts
+         (add-after 'unpack-texlive-extra 'copy-texlive-scripts
            (lambda* (#:key inputs #:allow-other-keys)
              (mkdir "texlive-scripts")
              (with-directory-excursion "texlive-scripts"
-               (apply (assoc-ref %standard-phases 'unpack)
-                      (list #:source (assoc-ref inputs "texlive-scripts")))
+               (let ((scripts (string-append
+                               (assoc-ref inputs "texlive-scripts")
+                               "/scripts/texlive")))
+                 (copy-recursively scripts "."))
                ;; Configure the version string for some scripts.
                ;; Normally this would be done by Subversion.
                ;; See <https://issues.guix.gnu.org/43442#15>.
@@ -536,7 +535,7 @@ and should be preferred to it whenever a package would otherwise depend on
                            "tlmgr.pl"
                            "tlmgrgui.pl"
                            "updmap.pl")))))
-         (add-after 'unpack-texlive-scripts 'patch-scripts
+         (add-after 'copy-texlive-scripts 'patch-scripts
            (lambda _
              (let* ((scripts (append (find-files "texk/kpathsea" "^mktex")
                                      (find-files "texk/texlive/linked_scripts"
@@ -640,10 +639,17 @@ and should be preferred to it whenever a package would otherwise depend on
                ;; Install tlpkg.
                (copy-recursively tlpkg-src (string-append share "/tlpkg"))
 
-               ;; Install texlive-scripts.
-               (copy-recursively (string-append
-                                  source "/texlive-scripts/source/")
+               ;; Install texlive-scripts and associated files.
+               (copy-recursively (string-append source "/texlive-scripts")
                                  scripts)
+               (for-each
+                (lambda (dir)
+                  (mkdir-p dir)
+                  (copy-recursively (string-append
+                                     (assoc-ref inputs "texlive-scripts")
+                                     "/" dir)
+                                    (string-append share "/texmf-dist/" dir)))
+                '("dvips" "fonts"))
 
                ;; Patch them.
                (let ((dirs (map dirname (list (which "sed") (which "awk")))))
@@ -3089,27 +3095,6 @@ of file names.")
 
 (define-deprecated-package texlive-latex-url texlive-url)
 
-(define-public texlive-tetex
-  (package
-    (name "texlive-tetex")
-    (version (number->string %texlive-revision))
-    (source (texlive-origin
-             name version
-             (list "dvips/tetex/"
-                   "fonts/enc/dvips/tetex/"
-                   "fonts/map/dvips/tetex/")
-             (base32
-              "05mf8yqdj2wrc1zm3al2j4aam2wx0ky6a7slxw17pkd1c7rmvjrq")))
-    (build-system texlive-build-system)
-    (arguments (list #:texlive-latex-base #f))
-    (home-page "https://www.ctan.org/pkg/tetex")
-    (synopsis "Font maps originally from teTeX")
-    (description
-     "This package provides font maps that were originally part of the now
-obsolete teTeX distributions but are still used at the core of the TeX Live
-distribution.")
-    (license license:public-domain)))
-
 (define-public texlive-l3kernel
   (package
     (name "texlive-l3kernel")
@@ -4170,8 +4155,7 @@ part of the LaTeX required set of packages.")
                 texlive-babel-english
                 texlive-cyrillic
                 texlive-psnfss
-                texlive-tools
-                texlive-tetex)))
+                texlive-tools)))
     (package
       (name "texlive-base")
       (version (number->string %texlive-revision))
-- 
cgit 1.4.1


From 36d7acf003f14af2203f4a35cdf2a9801cb1c672 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 10 Jun 2023 09:40:38 +0200
Subject: gnu: Deprecate texlive-base in favor of texlive-scheme-basic.

* gnu/packages/tex.scm (texlive-base): Deprecate variable.
(texlive-updmap.cfg): Use default packages from now deprecated TEXLIVE-BASE.
Also remove already implemented TODO.
* doc/build.scm (pdf-manual):
* gnu/packages/statistics.scm: Replace TEXLIVE-BASE with call to
TEXLIVE-UPDMAP.CFG.
* guix/profiles.scm (texlive-font-maps): Trigger TeX Live hook whenever
a texlive package is included in the manifest.
---
 doc/build.scm               |  9 +++---
 gnu/packages/statistics.scm |  5 ++--
 gnu/packages/tex.scm        | 72 +++++++++++++--------------------------------
 guix/profiles.scm           |  4 +--
 4 files changed, 29 insertions(+), 61 deletions(-)

diff --git a/doc/build.scm b/doc/build.scm
index 9c0cc99404..577f900e20 100644
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -912,11 +912,10 @@ makeinfo OPTIONS."
                      sed
                      tar
                      texinfo
-                     texlive-base
-                     texlive-bin        ;for GUIX_TEXMF
-                     texlive-epsf
-                     texlive-ec
-                     texlive-texinfo)))))
+                     (texlive-updmap.cfg
+                      (list texlive-ec
+                            texlive-epsf
+                            texlive-texinfo)))))))
 
   (define build
     (with-imported-modules '((guix build utils))
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 11b57ae57a..a25b8d2cb3 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -4837,9 +4837,8 @@ from within R.")
      (list hevea
            perl
            swig
-           ;;texlive-aeguill    ;;FIXME: package me!
-           texlive-base
-           texlive-jknapltx))
+           (texlive-updmap.cfg
+            (list texlive-aeguill texlive-jknapltx))))
     (propagated-inputs
      (list r-lattice
            r-matrix))
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 63b835c6bb..19272dbbc5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4135,52 +4135,6 @@ part of the LaTeX required set of packages.")
 
 (define-deprecated-package texlive-latex-psnfss texlive-psnfss)
 
-;; For user profiles
-(define-public texlive-base
-  (let ((default-packages
-          (list texlive-bin
-                texlive-cm
-                texlive-cm-super        ; to avoid bitmap fonts
-                texlive-dvips
-                texlive-fontname
-                texlive-graphics
-                texlive-kpathsea        ;for mktex.opt
-                texlive-latex-base
-                texlive-latex-fonts
-                texlive-metafont
-                ;; LaTeX packages from the "required" set.
-                texlive-amsmath
-                texlive-amscls
-                texlive-babel
-                texlive-babel-english
-                texlive-cyrillic
-                texlive-psnfss
-                texlive-tools)))
-    (package
-      (name "texlive-base")
-      (version (number->string %texlive-revision))
-      (source #f)
-      (build-system trivial-build-system)
-      (arguments
-       '(#:builder
-         (begin (mkdir (assoc-ref %outputs "out")))))
-      (propagated-inputs
-       (map (lambda (package)
-              (list (package-name package) package))
-            default-packages))
-      (home-page (package-home-page texlive-bin))
-      (synopsis "TeX Live base packages")
-      (description "This is a very limited subset of the TeX Live distribution.
-It includes little more than the required set of LaTeX packages.")
-      (license (fold (lambda (package result)
-                       (match (package-license package)
-                         ((lst ...)
-                          (append lst result))
-                         ((? license:license? license)
-                          (cons license result))))
-                     '()
-                     default-packages)))))
-
 (define-public texlive-default-updmap.cfg
   (origin
     (method url-fetch)
@@ -4193,15 +4147,29 @@ It includes little more than the required set of LaTeX packages.")
      (base32
       "0zhpyld702im6352fwp41f2hgfkpj2b4j1kfsjqbkijlcmvb6w2c"))))
 
-;;; TODO: Add a TeX Live profile hook computing fonts maps (and others?)
-;;; configuration from the packages in the profile, similar to what's done
-;;; below.
 (define-public texlive-updmap.cfg
   (lambda* (#:optional (packages '()))
     "Return a 'texlive-updmap.cfg' package which contains the fonts map
 configuration of a base set of packages plus PACKAGES."
-    (let ((default-packages (match (package-propagated-inputs texlive-base)
-                              (((labels packages) ...) packages))))
+    (let ((default-packages
+            (list texlive-bin
+                  texlive-cm
+                  texlive-cm-super
+                  texlive-dvips
+                  texlive-fontname
+                  texlive-graphics
+                  texlive-kpathsea
+                  texlive-latex-base
+                  texlive-latex-fonts
+                  texlive-metafont
+                  ;; LaTeX packages from the "required" set.
+                  texlive-amsmath
+                  texlive-amscls
+                  texlive-babel
+                  texlive-babel-english
+                  texlive-cyrillic
+                  texlive-psnfss
+                  texlive-tools)))
       (package
         (version (number->string %texlive-revision))
         (source (origin
@@ -13082,6 +13050,8 @@ Computer Modern fonts.  This scheme corresponds to @code{collection-basic} and
 @code{collection-latex}.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-deprecated-package texlive-base texlive-scheme-basic)
+
 ;;;
 ;;; 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/guix/profiles.scm b/guix/profiles.scm
index 6467e464c8..05fa5fa862 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1868,8 +1868,8 @@ MANIFEST."
               (invoke mktexlsr b)
               (install-file (string-append b "/ls-R") a))))))
 
-  (mlet %store-monad ((texlive-base (manifest-lookup-package manifest "texlive-base")))
-    (if (and texlive-base (pair? texlive-inputs))
+  (with-monad %store-monad
+    (if (pair? texlive-inputs)
         (gexp->derivation "texlive-font-maps" build
                           #:substitutable? #f
                           #:local-build? #t
-- 
cgit 1.4.1


From 0d7e2380b626c7b367ebe4f5d7d7ba8fa487c283 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 12 Jun 2023 10:30:11 +0200
Subject: gnu: Simplify texlive-default-updmap.cfg.

* gnu/packages/tex.scm (texlive-default-updmap.cfg): Use TEXLIVE-ORIGIN.
(texlive-updmap.cfg):
* guix/profiles.scm (texlive-font-maps): Update accordingly.
---
 gnu/packages/tex.scm | 73 +++++++++++++++++++++-------------------------------
 guix/profiles.scm    |  3 +--
 2 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 19272dbbc5..57de356205 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4136,16 +4136,11 @@ part of the LaTeX required set of packages.")
 (define-deprecated-package texlive-latex-psnfss texlive-psnfss)
 
 (define-public texlive-default-updmap.cfg
-  (origin
-    (method url-fetch)
-    (uri (string-append "https://tug.org/svn/texlive/tags/"
-                        %texlive-tag "/Master/texmf-dist/web2c/updmap.cfg"
-                        "?revision=" (number->string %texlive-revision)))
-    (file-name (string-append "updmap.cfg-"
-                              (number->string %texlive-revision)))
-    (sha256
-     (base32
-      "0zhpyld702im6352fwp41f2hgfkpj2b4j1kfsjqbkijlcmvb6w2c"))))
+  (texlive-origin
+   "updmap.cfg" (number->string %texlive-revision)
+   (list "web2c/updmap.cfg")
+   (base32
+    "1bb9nmvr14f3lam627mq030hh08h7wsy8i6884q2kvppbpf2a3mf")))
 
 (define-public texlive-updmap.cfg
   (lambda* (#:optional (packages '()))
@@ -4172,16 +4167,7 @@ configuration of a base set of packages plus PACKAGES."
                   texlive-tools)))
       (package
         (version (number->string %texlive-revision))
-        (source (origin
-                  (method url-fetch)
-                  (uri (string-append "https://tug.org/svn/texlive/tags/"
-                                      %texlive-tag
-                                      "/Master/texmf-dist/web2c/updmap.cfg"
-                                      "?revision=" version))
-                  (file-name "updmap.cfg")
-                  (sha256
-                   (base32
-                    "0zhpyld702im6352fwp41f2hgfkpj2b4j1kfsjqbkijlcmvb6w2c"))))
+        (source texlive-default-updmap.cfg)
         (name "texlive-updmap.cfg")
         (build-system copy-build-system)
         (arguments
@@ -4189,33 +4175,34 @@ configuration of a base set of packages plus PACKAGES."
                       (guix build utils)
                       (ice-9 popen)
                       (ice-9 textual-ports))
-           #:install-plan '(("updmap.cfg" "share/texmf-config/web2c/")
-                            ("map" "share/texmf-dist/fonts/map"))
+           #:install-plan '(("web2c/updmap.cfg" "share/texmf-config/web2c/")
+                            ("web2c/map" "share/texmf-dist/fonts/map"))
            #:phases
            (modify-phases %standard-phases
              (add-before 'install 'regenerate-updmap.cfg
                (lambda _
-                 (make-file-writable "updmap.cfg")
-
-                 ;; Disable unavailable map files.
-                 (let* ((port (open-pipe* OPEN_WRITE "updmap-sys"
-                                          "--syncwithtrees"
-                                          "--nohash"
-                                          "--cnffile" "updmap.cfg")))
-                   (display "Y\n" port)
-                   (when (not (zero? (status:exit-val (close-pipe port))))
-                     (error "failed to filter updmap.cfg")))
-
-                 ;; Set TEXMFSYSVAR to a sane and writable value; updmap fails
-                 ;; if it cannot create its log file there.
-                 (setenv "TEXMFSYSVAR" (getcwd))
-
-                 ;; Generate maps.
-                 (invoke "updmap-sys"
-                         "--cnffile"           "updmap.cfg"
-                         "--dvipdfmxoutputdir" "map/dvipdfmx/updmap/"
-                         "--dvipsoutputdir"    "map/dvips/updmap/"
-                         "--pdftexoutputdir"   "map/pdftex/updmap/"))))))
+                 (with-directory-excursion "web2c"
+                   (make-file-writable "updmap.cfg")
+
+                   ;; Disable unavailable map files.
+                   (let* ((port (open-pipe* OPEN_WRITE "updmap-sys"
+                                            "--syncwithtrees"
+                                            "--nohash"
+                                            "--cnffile" "updmap.cfg")))
+                     (display "Y\n" port)
+                     (when (not (zero? (status:exit-val (close-pipe port))))
+                       (error "failed to filter updmap.cfg")))
+
+                   ;; Set TEXMFSYSVAR to a sane and writable value; updmap fails
+                   ;; if it cannot create its log file there.
+                   (setenv "TEXMFSYSVAR" (getcwd))
+
+                   ;; Generate maps.
+                   (invoke "updmap-sys"
+                           "--cnffile"           "updmap.cfg"
+                           "--dvipdfmxoutputdir" "map/dvipdfmx/updmap/"
+                           "--dvipsoutputdir"    "map/dvips/updmap/"
+                           "--pdftexoutputdir"   "map/pdftex/updmap/")))))))
         (propagated-inputs (map (lambda (package)
                                   (list (package-name package) package))
                                 (append default-packages packages)))
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 05fa5fa862..30ac0d52e4 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1831,8 +1831,7 @@ MANIFEST."
           (let* ((web2c (string-append #$output "/share/texmf-dist/web2c/"))
                  (maproot (string-append #$output "/share/texmf-dist/fonts/map/"))
                  (updmap.cfg (string-append web2c "updmap.cfg")))
-            (mkdir-p web2c)
-            (copy-file #$updmap.cfg updmap.cfg)
+            (install-file #$(file-append updmap.cfg "/web2c/updmap.cfg") web2c)
             (make-file-writable updmap.cfg)
             (let* ((port (open-pipe* OPEN_WRITE
                                      #$(file-append texlive-bin "/bin/updmap-sys")
-- 
cgit 1.4.1


From 520551a59699e0c23c429a83a50be057f0160f5c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 13 Jun 2023 16:36:03 +0200
Subject: gnu: Replace texlive-latex-base with texlive-latex-bin.

Although `latex-base' is clearly defined on CTAN, it isn't a proper TeX Live
package.  Since we're trying to follow as closely as possible this TeX
distribution, we replace the package with the closest one, which is
`texlive-latex-bin'.  As a consequence, the #:TEXLIVE-LATEX-BASE argument
becomes #:TEXLIVE-LATEX-BIN?, emphasizing the fact that the meaningful values
for it are booleans.

* gnu/packages/graphviz.scm (dot2tex)[propagated-inputs]: Remove
TEXLIVE-GRAPHICS, TEXLIVE-LATEX-BASE.  Add TEXLIVE-LATEX-BIN.
* gnu/packages/plotutils.scm (asymptote)[native-inputs]: Remove
TEXLIVE-LATEX-BASE, TEXLIVE-GRAPHICS, TEXLIVE-L3BACKEND.  Use
TEXLIVE-UPDMAP.CFG.
* gnu/packages/sphinx.scm (python-sphinx)[propagated-inputs]: Remove
TEXLIVE-GRAPHICS, TEXLIVE-LATEX-BASE.  Add TEXLIVE-LATEX-BIN.
* gnu/packages/tex.scm (texlive-latex-base): Deprecate variable.
(texlive-hyphen-complete):
(texlive-tex):
(texlive-latex):
(texlive-docstrip):
(texlive-unicode-data):
(texlive-hyphen-base):
(texlive-tex-ini-files):
(texlive-metafont):
(texlive-modes):
(texlive-knuth-lib):
(texlive-latex-fonts):
(texlive-etex):
(texlive-plain):
(texlive-kpathsea):
(texlive-latexconfig):
(texlive-latex-bin):
(texlive-l3kernel):
(texlive-l3backend):
(texlive-l3packages):
(texlive-luatex):
(texlive-luahbtex):
(texlive-babel):
(texlive-cyrillic):
(texlive-pdftex):
(texlive-cm)[arguments]: Replace #:TEXLIVE-LATEX-BASE with #:TEXLIVE-LATEX-BIN?.
(texlive-lm):
(texlive-lua-alt-getopt):
(texlive-luaotfload):
(texlive-graphics-def):
(texlive-graphics-cfg): Set #:TEXLIVE-LATEX-BIN? to #F.
(texlive-graphics):
(texlive-lualibs):
(texlive-firstaid):
(texlive-atveryend)[arguments]: Set #:TEXLIVE-LATEX-BIN? to #F.
[native-inputs]: Add TEXLIVE-DOCSTRIP, TEXLIVE-PDFTEX.
(texlive-updmap.cfg): Remove TEXLIVE-CM, TEXLIVE-GRAPHICS,
TEXLIVE-LATEX-BASE.  Add TEXLIVE-LATEX-BIN.
(texlive-atbegshi)[arguments]: Set #:TEXLIVE-LATEX-BIN? to #F.
[native-inputs]: Add TEXLIVE-DOCSTRIP, TEXLIVE-PDFTEX.
[propagated-inputs]: Remove TEXLIVE-IFTEX, TEXLIVE-INFWARERR and
TEXLIVE-LTXCMDS.
(texlive-everyshi)[arguments]: Build package with a temporary "latex.fmt"
file.
(texlive-cyrillic): Set #:TEXLIVE-LATEX-BIN? to #T.
* guix/build-system/texlive.scm (default-texlive-latex-base): Rename to
TEXLIVE-LATEX-BIN.
(lower): Set default value for TEXLIVE-LATEX-BIN? to #TRUE.
* gnu/packages/statistics.scm (r-with-tests): Remove TEXLIVE-LATEX-BASE and
TEXLIVE-GRAPHICS.
* doc/guix.texi (Build Systems): Document #:TEXLIVE-LATEX-BIN? argument.
Remove reference to #:TEXLIVE-LATEX-BASE.
---
 doc/guix.texi                 |  14 ++--
 gnu/packages/graphviz.scm     |   3 +-
 gnu/packages/plotutils.scm    |   3 -
 gnu/packages/sphinx.scm       |   3 +-
 gnu/packages/statistics.scm   |  27 ++++----
 gnu/packages/tex.scm          | 153 ++++++++++++++++++++----------------------
 guix/build-system/texlive.scm |  14 ++--
 7 files changed, 105 insertions(+), 112 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index e58bb65bd1..213c183e1f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10012,10 +10012,16 @@ files whenever possible.  Likewise, it can also create TeX formats
 (i.e., @file{.fmt} files) listed in the @code{#:create-formats}
 argument.
 
-The build system adds only @code{texlive-bin} and
-@code{texlive-latex-base} (both from @code{(gnu packages tex}) to the
-inputs.  Both can be overridden with the arguments @code{#:texlive-bin}
-and @code{#:texlive-latex-base}, respectively.
+The build system adds @code{texlive-bin} from @code{(gnu packages tex)}
+to the native inputs.  It can be overridden with the
+@code{#:texlive-bin} argument.
+
+The package @code{texlive-latex-bin}, from the same module, contains
+most of the tools for building TeX Live packages; for convenience, it is
+also added by default to the native inputs.  However, this can be
+troublesome when building a dependency of @code{texlive-latex-bin}
+itself.  In this particular situation, the @code{#:texlive-latex-bin?}
+argument should be set to @code{#f}.
 @end defvar
 
 @defvar ruby-build-system
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 658cc494d1..61e4ec7a9f 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -388,8 +388,7 @@ graphs in Graphviz's DOT language, written in pure Python.")
            texlive-amsmath
            texlive-bin
            texlive-geometry
-           texlive-graphics
-           texlive-latex-base
+           texlive-latex-bin
            texlive-pgf
            texlive-pstricks
            texlive-preview
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index db14272804..00ddd34355 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -312,14 +312,11 @@ colors, styles, options and details.")
                   texlive-epsf
                   texlive-etoolbox
                   texlive-geometry
-                  texlive-graphics
                   texlive-grfext
                   texlive-hyperref
                   texlive-infwarerr
                   texlive-kvdefinekeys
                   texlive-kvoptions
-                  texlive-l3backend
-                  texlive-latex-base
                   texlive-media9
                   texlive-oberdiek      ;for ifluatex
                   texlive-ocgx2
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index b2ad5d99e8..173accd768 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -117,10 +117,9 @@
            texlive-fncychap
            texlive-framed
            texlive-geometry
-           texlive-graphics             ;graphicx, color
            texlive-hyperref
            texlive-kvoptions
-           texlive-latex-base           ;alltt, atbegshi, makeidx, textcomp
+           texlive-latex-bin
            texlive-ltxcmds
            texlive-needspace
            texlive-oberdiek             ;hypcap
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index a25b8d2cb3..1cea3afda5 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -388,20 +388,19 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
            perl
            pkg-config
            texinfo                      ; for building HTML manuals
-           (texlive-updmap.cfg (list texlive-ae
-                                     texlive-amsfonts
-                                     texlive-ec
-                                     texlive-fancyvrb
-                                     texlive-graphics
-                                     texlive-grfext
-                                     texlive-hyperref
-                                     texlive-inconsolata
-                                     texlive-latex-base
-                                     texlive-oberdiek
-                                     texlive-tools
-                                     texlive-upquote
-                                     texlive-url
-                                     texlive-xkeyval))
+           (texlive-updmap.cfg
+            (list texlive-ae
+                  texlive-amsfonts
+                  texlive-ec
+                  texlive-fancyvrb
+                  texlive-grfext
+                  texlive-hyperref
+                  texlive-inconsolata
+                  texlive-oberdiek
+                  texlive-tools
+                  texlive-upquote
+                  texlive-url
+                  texlive-xkeyval))
            tzdata-for-tests
            xz))
     (inputs
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 57de356205..e66993e492 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -147,7 +147,7 @@
     (build-system texlive-build-system)
     (arguments
      (list
-      #:texlive-latex-base #f
+      #:texlive-latex-bin? #f
       #:tex-engine "tex"
       #:phases
       #~(modify-phases %standard-phases
@@ -715,7 +715,7 @@ This package contains the binaries.")
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     (list #:texlive-latex-base #f
+     (list #:texlive-latex-bin? #f
            #:create-formats #~(list "tex")))
     (propagated-inputs
      (list texlive-cm
@@ -751,7 +751,7 @@ it should not be processed without Knuth's direct permission.")
     (build-system texlive-build-system)
     (arguments
      (list
-      #:texlive-latex-base #f
+      #:texlive-latex-bin? #f
       #:tex-engine "tex"
       #:tex-format #f
       #:build-targets #~(list "unpack.ins")
@@ -879,7 +879,7 @@ a replacement for LaTeX's @code{\\@@alph} and @code{\\@@Alph} macros.")
               "1pxbqbia0727vg01xv8451szm55z2w8sb0vv3kf4iqx5ibb6m0d2")))
     (build-system texlive-build-system)
     (arguments
-     (list #:texlive-latex-base #f))
+     (list #:texlive-latex-bin? #f))
     (home-page "https://www.ctan.org/texlive")
     (synopsis "Utility to strip documentation from TeX files")
     (description "This package provides the docstrip utility to strip
@@ -921,7 +921,7 @@ affected).")
               "1d41zvjsig7sqf2j2m89dnbv3gicpb16r04b4ikps4gabhbky83k")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments (list #:texlive-latex-base #f))
+    (arguments (list #:texlive-latex-bin? #f))
     (home-page "https://ctan.org/pkg/unicode-data")
     (synopsis "Unicode data and loaders for TeX")
     (description "This bundle provides generic access to Unicode Consortium
@@ -979,7 +979,7 @@ until the package appears.")
              (base32
               "1nad1bqpjsywm49hlv7d75mqvgha3j5vayvkvfhv8wwzgdb3mk84")))
     (build-system texlive-build-system)
-    (arguments (list #:texlive-latex-base #f))
+    (arguments (list #:texlive-latex-bin? #f))
     (home-page "https://tug.org/texlive/")
     (synopsis "Core hyphenation support files")
     (description "This package includes Knuth's original @file{hyphen.tex},
@@ -1094,7 +1094,7 @@ PostScript.")
               "0a18k27fz1vjha5blwskxpnd715k08hmfm7d1yc2f7adaf0rwl3m")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments (list #:texlive-latex-base #f))
+    (arguments (list #:texlive-latex-bin? #f))
     (home-page "https://www.ctan.org/pkg/tex-ini-files")
     (synopsis "Files for creating TeX formats")
     (description
@@ -1128,7 +1128,7 @@ adapt the plain e-TeX source file to work with XeTeX and LuaTeX.")
     (build-system texlive-build-system)
     (arguments
      (list
-      #:texlive-latex-base #f
+      #:texlive-latex-bin? #f
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'build 'generate-mf.base
@@ -1228,7 +1228,7 @@ that support for the Pandora fonts is also available via the
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     (list #:texlive-latex-base #f))
+     (list #:texlive-latex-bin? #f))
     (home-page "https://ctan.org/pkg/modes")
     (synopsis "Collection of Metafont @code{mode_def}'s")
     (description
@@ -1426,7 +1426,7 @@ part of the cite bundle of the author's citation-related packages.")
     (build-system texlive-build-system)
     (arguments
      (list
-      #:texlive-latex-base #f
+      #:texlive-latex-bin? #f
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'generate-font-metrics 'generate-pk
@@ -1632,6 +1632,7 @@ in LuaTeX.  It is required by the @code{luatexbase} package which uses
               "0yyk0dr4yms82mwy4dc03zf5igyhgcb65icdah042rk23rlpxygv")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-bin? #f))
     (home-page "https://ctan.org/pkg/lm")
     (synopsis "Latin Modern family of fonts")
     (description "The Latin Modern fonts are derived from the famous Computer
@@ -1709,7 +1710,7 @@ conversion software and word processors.")
              (base32
               "0dl8z340n6m6xn7wari4hir0syxqi0kl2fhnf0bvnmkqhqwyzpca")))
     (build-system texlive-build-system)
-    (arguments (list #:texlive-latex-base #f))
+    (arguments (list #:texlive-latex-bin? #f))
     (native-inputs (list texlive-cm texlive-metafont))
     (home-page "https://ctan.org/pkg/knuth-lib")
     (synopsis "Small library of METAFONT sources")
@@ -1755,7 +1756,7 @@ directories.")
               "1bzqzzhs15w7dqz90hfjnaffjqh24q14w2h1h8vnxzvrlsyv21vq")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments (list #:texlive-latex-base #f))
+    (arguments (list #:texlive-latex-bin? #f))
     (native-inputs (list texlive-cm texlive-metafont))
     (home-page "https://ctan.org/pkg/latex-fonts")
     (synopsis "Collection of fonts used in LaTeX distributions")
@@ -1943,7 +1944,7 @@ features generation of clean UTF-8 patterns.")
               "17pvh7i9zw8qa5hr53kci7di64fqzx4j35gsn28s36b74x6xj4bc")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments (list #:texlive-latex-base #f))
+    (arguments (list #:texlive-latex-bin? #f))
     (native-inputs (list texlive-cm texlive-metafont))
     (home-page "https://www.ctan.org/pkg/etex")
     (synopsis "Extended version of TeX")
@@ -1991,7 +1992,7 @@ e-TeX's facilities.")
      (list
       #:tex-engine "tex"
       #:tex-format #f
-      #:texlive-latex-base #f))
+      #:texlive-latex-bin? #f))
     (home-page "https://ctan.org/pkg/plain")
     (synopsis "Plain TeX format and supporting files")
     (description
@@ -2174,7 +2175,7 @@ replacement for the @code{inputenc} package.")
     (build-system texlive-build-system)
     (arguments
      (list
-      #:texlive-latex-base #f
+      #:texlive-latex-bin? #f
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-references
@@ -2240,61 +2241,13 @@ default and narrow versions of multiple integrals.")
              (base32
               "1x5fyr2185nx3qlyariykdz44hcy5azimrk9db2p707dg08bjhsd")))
     (build-system texlive-build-system)
-    (arguments (list #:texlive-latex-base #f))
+    (arguments (list #:texlive-latex-bin? #f))
     (home-page "https://ctan.org/pkg/latexconfig")
     (synopsis "Configuration files for LaTeX-related formats")
     (description "The package provides configuration files for LaTeX-related
 formats.")
     (license license:lppl)))
 
-(define-public texlive-latex-base
-  (package
-    (name "texlive-latex-base")
-    (version (number->string %texlive-revision))
-    (source (texlive-origin
-             name version
-             (list "doc/latex/base/" "makeindex/latex/"
-                   "source/latex/base/" "tex/latex/base/")
-             (base32
-              "0k2b6qi281cl4zml6l537iyps1zwaq7pip81qq8vlkhb9h5ggpnw")))
-    (build-system texlive-build-system)
-    (outputs '("out" "doc"))
-    (arguments
-     (list
-      #:texlive-latex-base #f
-      #:tex-engine "tex"
-      #:tex-format #f
-      #:build-targets #~(list "unpack.ins")
-      #:create-formats #~(list "dvilualatex" "latex" "lualatex" "pdflatex")))
-    (propagated-inputs
-     (list texlive-babel
-           texlive-cm
-           texlive-etex
-           texlive-hyphen-complete
-           texlive-knuth-lib
-           texlive-kpathsea
-           texlive-l3backend
-           texlive-l3kernel
-           texlive-latex-fonts
-           texlive-latexconfig
-           texlive-luatex
-           texlive-pdftex
-           texlive-plain
-           texlive-tex-ini-files
-           texlive-unicode-data
-           ;; TODO: This dependency isn't needed for LaTeX version 2021-06-01
-           ;; and later. See:
-           ;; <https://tug.org/pipermail/tex-live/2021-June/047180.html>
-           texlive-l3packages))
-    (home-page "https://www.ctan.org/pkg/latex-base")
-    (synopsis "Base sources of LaTeX")
-    (description
-     "This bundle comprises the source of LaTeX itself, together with several
-packages which are considered part of the kernel.  This bundle, together with
-the required packages, constitutes what every LaTeX distribution should
-contain.")
-    (license license:lppl1.3c+)))
-
 (define-public texlive-latex-bin
   (package
     (name "texlive-latex-bin")
@@ -2315,7 +2268,7 @@ contain.")
     (build-system texlive-build-system)
     (arguments
      (list
-      #:texlive-latex-base #f
+      #:texlive-latex-bin? #f
       #:create-formats #~(list "dvilualatex" "latex" "lualatex" "pdflatex")))
     (propagated-inputs
      (list texlive-atbegshi
@@ -2346,6 +2299,8 @@ contain.")
 several packages that are considered as part of the LaTeX kernel.")
     (license license:lppl1.3c+)))
 
+(define-deprecated-package texlive-latex-base texlive-latex-bin)
+
 (define-public texlive-atenddvi
   (package
     (name "texlive-atenddvi")
@@ -2416,6 +2371,8 @@ customize their appearance in the enclosing document.")
               "1rp805h0m99rxs107a798l951lyahlnp7irfklfadn2a2ljzhafn")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-bin? #f))
+    (native-inputs (list texlive-docstrip texlive-pdftex))
     (home-page "https://ctan.org/pkg/atveryend")
     (synopsis "Hooks at the very end of a document")
     (description
@@ -2636,6 +2593,7 @@ Unicode points; it is maintained by Adobe.  The additional
               "0b66fy06safyrd717rfr476g1gz6nqfv1vqvam7ac2yy0g0djb17")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-bin? #f))
     (home-page "https://ctan.org/pkg/graphics-def")
     (synopsis "Colour and graphics option files")
     (description
@@ -2657,6 +2615,7 @@ packages.")
               "00n63adb2laf43lzix39xl68aq0k5k80mmrw602w99w5n7f96gsf")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-bin? #f))
     (home-page "https://ctan.org/pkg/graphics-cfg")
     (synopsis "Sample configuration files for LaTeX color and graphics")
     (description
@@ -2677,6 +2636,8 @@ set default \"driver\" options for the color and graphics packages.")
               "0prw1zcv4fcj3zg0kyhj0k7ax0530adl60bajzvbv3fi16d7rqlq")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-bin? #f))
+    (native-inputs (list texlive-docstrip texlive-pdftex))
     (propagated-inputs
      (list texlive-graphics-def texlive-graphics-cfg))
     (home-page "https://ctan.org/macros/latex/required/graphics")
@@ -3112,7 +3073,7 @@ of file names.")
      (list
       #:tex-engine "tex"
       #:tex-format #f
-      #:texlive-latex-base #f))
+      #:texlive-latex-bin? #f))
     (native-inputs
      (list texlive-docstrip))
     (propagated-inputs
@@ -3147,7 +3108,7 @@ LaTeX3 conventions can be used with regular LaTeX2e packages.")
      (list
       #:tex-engine "tex"
       #:tex-format #f
-      #:texlive-latex-base #f))
+      #:texlive-latex-bin? #f))
     (native-inputs
      (list texlive-docstrip))
     (home-page "https://ctan.org/pkg/l3backend")
@@ -3194,7 +3155,7 @@ an independent schedule.")
              "xtemplate.ins")
       #:tex-engine "tex"
       #:tex-format #f
-      #:texlive-latex-base #f))
+      #:texlive-latex-bin? #f))
     (native-inputs
      (list texlive-docstrip))
     (propagated-inputs
@@ -3450,6 +3411,8 @@ they are not directly related to Unicode mathematics typesetting.")
               "0gf60vj9y75a7dlrmpbyqgsa00s1717r6if3lm5ldm41i9fm8ywz")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-bin? #f))
+    (native-inputs (list texlive-docstrip texlive-pdftex))
     (home-page "https://ctan.org/pkg/lualibs")
     (synopsis "Additional Lua functions for LuaTeX macro programmers")
     (description
@@ -3472,6 +3435,7 @@ this bundle for use independent of ConTeXt.")
               "0cizxzn33n3pn98xkqnxb8s6vdwkar3xrwhraqrs05pjfdn9d4wz")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-bin? #f))
     (home-page "https://ctan.org/pkg/lua-alt-getopt")
     (synopsis "Process application arguments as @code{getopt_long}")
     (description
@@ -3502,7 +3466,7 @@ in the same way as BSD/GNU @code{getopt_long(3)} functions do.")
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     (list #:texlive-latex-base #f
+     (list #:texlive-latex-bin? #f
            #:create-formats #~(list "dviluatex" "luatex")))
     (propagated-inputs
      (list texlive-cm
@@ -3585,7 +3549,7 @@ upgrade smoothly to the new support structure.")
     (build-system texlive-build-system)
     (arguments
      (list
-      #:texlive-latex-base #f
+      #:texlive-latex-bin? #f
       #:create-formats #~(list "luahbtex")))
     (propagated-inputs
      (list texlive-cm
@@ -3623,6 +3587,7 @@ shaping, instead of LuaTeX's built-in shaper.")
               "15xhnb4kyzmr11lj0md1d502cqrxyq6zdcq738z9394k6bas377f")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-bin? #f))
     (propagated-inputs (list texlive-lm texlive-lua-alt-getopt texlive-lualibs))
     (home-page "https://ctan.org/pkg/luaotfload")
     (synopsis "OpenType font loader for LuaTeX")
@@ -3772,7 +3737,7 @@ available as part of the AMS-LaTeX distribution.")
     (build-system texlive-build-system)
     (arguments
      (list
-      #:texlive-latex-base #f
+      #:texlive-latex-bin? #f
       #:phases
       #~(modify-phases %standard-phases
           ;; This package tries to produce babel.aux twice but refuses to
@@ -4029,8 +3994,7 @@ German.")
     (arguments
      (list
       #:tex-engine "tex"
-      #:tex-format #f
-      #:texlive-latex-base #f))
+      #:tex-format #f))
     (native-inputs
      (list texlive-docstrip))
     (home-page "https://ctan.org/pkg/cyrillic")
@@ -4148,13 +4112,11 @@ part of the LaTeX required set of packages.")
 configuration of a base set of packages plus PACKAGES."
     (let ((default-packages
             (list texlive-bin
-                  texlive-cm
                   texlive-cm-super
                   texlive-dvips
                   texlive-fontname
-                  texlive-graphics
                   texlive-kpathsea
-                  texlive-latex-base
+                  texlive-latex-bin
                   texlive-latex-fonts
                   texlive-metafont
                   ;; LaTeX packages from the "required" set.
@@ -4673,6 +4635,8 @@ corresponding italics: light, regular, medium, bold, ...")
               "1ahn47kz8a2qdmzdfdgjanf6h5bn8f2rzp1zvwgjpk1plcix8k90")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-bin? #f))
+    (native-inputs (list texlive-docstrip texlive-pdftex))
     (home-page "https://ctan.org/pkg/firstaid")
     (synopsis
      "First aid for external LaTeX files and packages that need updating")
@@ -7772,7 +7736,7 @@ e-TeX.")
     (build-system texlive-build-system)
     (arguments
      (list
-      #:texlive-latex-base #f
+      #:texlive-latex-bin? #f
       #:create-formats #~(list "etex" "pdfetex" "pdftex")))
     (propagated-inputs
      (list texlive-cm
@@ -8733,8 +8697,8 @@ not only with KOMA-Script classes but also with the standard classes.")
               "0vd90wdjwj5w4g4xka4nms3rgixjw63iwf0hj0v1akcfflwvgn69")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-iftex texlive-infwarerr texlive-ltxcmds))
+    (arguments (list #:texlive-latex-bin? #f))
+    (native-inputs (list texlive-docstrip texlive-pdftex))
     (home-page "https://ctan.org/pkg/atbegshi")
     (synopsis "Execute commands at @code{\\shipout} time")
     (description
@@ -12422,8 +12386,37 @@ compatibility reasons.")
               "11y6xazv1nk0m2hzsainjr8ijn5cff04xfccm6a65hzg7ipggraj")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    ;; Building `texlive-everyshi' requires "latex" format, provided by
+    ;; `texlive-latex-bin'.  However, `texlive-everyshi' is also a propagated
+    ;; inputs from `texlive-latex-bin'.  To work around this cycle, build
+    ;; a temporary "latex.fmt" format file, and use it to build the package.
+    ;; At the end of the process, remove that temporary format file.
     (arguments
-     (list #:tex-format "latex"))
+     (list
+      #:texlive-latex-bin? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'create-latex-format
+            (lambda* (#:key inputs #:allow-other-keys)
+              (apply (assoc-ref %standard-phases 'create-formats)
+                     (list #:inputs inputs #:create-formats '("latex")))))
+          (replace 'build
+            (lambda* (#:key inputs build-targets tex-engine #:allow-other-keys)
+              (apply (assoc-ref %standard-phases 'build)
+                     (list #:inputs inputs
+                           #:build-targets build-targets
+                           #:tex-engine tex-engine
+                           #:tex-format (string-append (getcwd)
+                                                       "/web2c/pdftex/latex")))))
+          (add-after 'build 'remove-latex-format
+            (lambda _
+              (delete-file-recursively "web2c"))))))
+    (native-inputs
+     (list texlive-l3kernel
+           texlive-l3packages
+           texlive-latex
+           texlive-latexconfig
+           texlive-tex-ini-files))
     (home-page "https://ctan.org/pkg/everyshi")
     (synopsis "Take action at every @code{\\shipout}")
     (description
diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm
index e68cb87589..19bf459dc2 100644
--- a/guix/build-system/texlive.scm
+++ b/guix/build-system/texlive.scm
@@ -88,24 +88,24 @@ level package ID."
   (let ((tex-mod (resolve-interface '(gnu packages tex))))
     (module-ref tex-mod 'texlive-bin)))
 
-(define (default-texlive-latex-base)
-  "Return the default texlive-latex-base package."
+(define (texlive-latex-bin)
+  "Return the default texlive-latex-bin package."
   ;; Lazily resolve the binding to avoid a circular dependency.
   (let ((tex-mod (resolve-interface '(gnu packages tex))))
-    (module-ref tex-mod 'texlive-latex-base)))
+    (module-ref tex-mod 'texlive-latex-bin)))
 
 (define* (lower name
                 #:key
                 source inputs native-inputs outputs
                 system target
-                (texlive-latex-base (default-texlive-latex-base))
+                (texlive-latex-bin? #true)
                 (texlive-bin (default-texlive-bin))
                 #:allow-other-keys
                 #:rest arguments)
   "Return a bag for NAME."
   (define private-keywords
     '(#:target #:inputs #:native-inputs
-      #:texlive-latex-base #:texlive-bin))
+      #:texlive-latex-bin? #:texlive-bin))
 
   (bag
     (name name)
@@ -118,8 +118,8 @@ level package ID."
                    ;; Keep the standard inputs of 'gnu-build-system'.
                    ,@(standard-packages)))
     (build-inputs `(("texlive-bin" ,texlive-bin)
-                    ,@(if texlive-latex-base
-                          `(("texlive-latex-base" ,texlive-latex-base))
+                    ,@(if texlive-latex-bin?
+                          `(("texlive-latex-bin" ,(texlive-latex-bin)))
                           '())
                     ,@native-inputs))
     (outputs outputs)
-- 
cgit 1.4.1


From ecc1c3af11724ff95439b044244e733c997b8211 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 14 Jun 2023 10:28:55 +0200
Subject: guix: texlive importer: Set #:texlive-latex-bin? when appropriate.

* guix/import/texlive.scm (latex-bin-dependency-tree): New function.
(tlpdb->package): Set #:TEXLIVE-LATEX-BIN? when appropriate.
* tests/texlive.scm ("texlive->guix-package, lonely `hyphen-base' dependency
and ARCH"): Update test.
---
 guix/import/texlive.scm | 77 +++++++++++++++++++++++++++++++++++--------------
 tests/texlive.scm       |  1 +
 2 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index a39e327d45..5458a43456 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -241,6 +241,29 @@ When TEXLIVE-ONLY is true, only TeX Live packages are returned."
                          (loop all (record key value current field-type) key))))
                      (loop all current #false))))))))))))
 
+;; Packages listed below are used to build "latex-bin" package, and therefore
+;; cannot provide it automatically as a native input.  Consequently, the
+;; importer sets TEXLIVE-LATEX-BIN? argument to #F for all of them.
+(define latex-bin-dependency-tree
+  (memoize
+   (lambda (package-database)
+     ;; Start out with "latex-bin", but also provide native inputs, which do
+     ;; not appear as dependents, as roots for the search.
+     (let loop ((packages
+                 (list "latex-bin" "metafont" "modes" "tex"))
+                (deps '()))
+       (if (null? packages)
+           ;; `translate-depends' will always translate "hyphen-base" into
+           ;; "hyphen-complete".  Make sure plain hyphen-base appears in the
+           ;; dependency tree.
+           (cons "hyphen-base" (translate-depends deps))
+           (loop (append-map (lambda (name)
+                               (let ((data (assoc-ref package-database name)))
+                                 (or (assoc-ref data 'depend)
+                                     '())))
+                             packages)
+                 (append packages deps)))))))
+
 (define* (files-differ? directory package-name
                         #:key
                         (package-database tlpdb)
@@ -310,6 +333,7 @@ of those files are returned that are unexpectedly installed."
                                 (append (or (assoc-ref data 'docfiles) (list))
                                         (or (assoc-ref data 'runfiles) (list))
                                         (or (assoc-ref data 'srcfiles) (list))))))
+             (texlive-name name)
              (name (guix-name name))
              ;; TODO: we're ignoring the VERSION argument because that
              ;; information is distributed across %texlive-tag and
@@ -345,27 +369,38 @@ of those files are returned that are unexpectedly installed."
           (build-system ,(if meta-package?
                              'trivial-build-system
                              'texlive-build-system))
-          ;; Translate AddFormat execute actions into a `#:create-formats'
-          ;; argument.
-          ,@(cond
-             (meta-package? '((arguments (list #:builder #~(mkdir #$output)))))
-             ((and-let* ((actions (assoc-ref data 'execute))
-                         (formats
-                          (delete-duplicates
-                           (filter-map
-                            (lambda (action)
-                              (match (string-split action #\space)
-                                (("AddFormat" name . _)
-                                 (string-drop name (string-length "name=")))
-                                (  #f)))
-                            actions)))
-                         ((not (null? formats))))
-                formats)
-              =>
-              (lambda (formats)
-                `((arguments
-                   (list #:create-formats #~(list ,@(reverse formats)))))))
-             (else '()))
+          ,@(if meta-package?
+                '((arguments (list #:builder #~(mkdir #$output))))
+                (let* ((formats
+                        ;; Translate AddFormat execute actions into
+                        ;; a #:create-formats argument.
+                        (and-let*
+                            ((actions (assoc-ref data 'execute))
+                             (formats
+                              (delete-duplicates
+                               (filter-map
+                                (lambda (action)
+                                  (match (string-split action #\space)
+                                    (("AddFormat" fmt . _)
+                                     (string-drop fmt (string-length "name=")))
+                                    (_ #f)))
+                                actions)))
+                             ((pair? formats)))
+                          (reverse formats)))
+                       ;; Check if setting #:texlive-latex-bin? is appropriate.
+                       (latex-bin-dependency?
+                        (member texlive-name
+                                (latex-bin-dependency-tree package-database)))
+                       (arguments
+                        (append (if latex-bin-dependency?
+                                    '(#:texlive-latex-bin? #f)
+                                    '())
+                                (if formats
+                                    `(#:create-formats #~(list ,@formats))
+                                    '()))))
+                  (if (pair? arguments)
+                      `((arguments (list ,@arguments)))
+                      '())))
           ;; Texlive build system generates font metrics whenever a font
           ;; metrics file has the same base name as a Metafont file.
           ,@(or (and-let* ((runfiles (assoc-ref data 'runfiles))
diff --git a/tests/texlive.scm b/tests/texlive.scm
index 64ab6a2e2e..063cde6465 100644
--- a/tests/texlive.scm
+++ b/tests/texlive.scm
@@ -633,6 +633,7 @@ completely compatible with Plain TeX.")
                ('source _)
                ('outputs _)
                ('build-system 'texlive-build-system)
+               ('arguments ('list '#:texlive-latex-bin? #f))
                ('propagated-inputs
                 ('list 'texlive-cm 'texlive-hyphen-base))
                ('home-page (? string?))
-- 
cgit 1.4.1


From e99e70503e080e3107e92eab06879259cb59a1a2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 15 Jun 2023 10:17:25 +0200
Subject: gnu: texlive-bin: Update to 20230313.

* gnu/packages/tex.scm (texlive-bin): Update to 20230313.
[arguments]<#:parallel-tests?>:  Disable them to prevent a test failure.
<#:phases>: Do not link manpages, which are taken care of in their respective
texlive package.
(texlive-extra-src): Remove variable.  Actually merge it within TEXLIVE-BIN so
the version string is used only once.
* gnu/packages/tex.scm (texlive-texmf): Update it too.
---
 gnu/packages/tex.scm | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e66993e492..91ec097d70 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -342,25 +342,19 @@ and should be preferred to it whenever a package would otherwise depend on
 (define-deprecated-package texlive-ruhyphen texlive-hyphen-complete)
 (define-deprecated-package texlive-ukrhyph texlive-hyphen-complete)
 
-(define texlive-extra-src
-  (origin
-    (method url-fetch)
-    (uri "ftp://tug.org/historic/systems/texlive/2021/texlive-20210325-extra.tar.xz")
-    (sha256 (base32
-             "171kg1n9zapw3d2g47d8l0cywa99bl9m54xkqvp9625ks22z78s6"))))
-
 (define-public texlive-bin
   (package
     (name "texlive-bin")
-    (version "20210325")
+    (version "20230313")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "ftp://tug.org/historic/systems/texlive/2021/"
-                           "texlive-" version "-source.tar.xz"))
+       (uri (string-append "ftp://tug.org/historic/systems/texlive/"
+                           (string-take version 4)
+                           "/texlive-" version "-source.tar.xz"))
        (sha256
         (base32
-         "0jsq1p66l46k2qq0gbqmx25flj2nprsz4wrd1ybn286p11kdkvvs"))
+         "1fbrkv7g9j6ipmwjx27l8l9l974rmply8bhf7c2iqc6h3q7aly1q"))
        (modules '((guix build utils)
                   (ice-9 ftw)))
        (snippet
@@ -377,7 +371,15 @@ and should be preferred to it whenever a package would otherwise depend on
                                        (eq? 'directory (stat:type (stat file))))))))))))
     (build-system gnu-build-system)
     (inputs
-     `(("texlive-extra-src" ,texlive-extra-src)
+     `(("texlive-extra-src"
+        ,(origin
+           (method url-fetch)
+           (uri (string-append "ftp://tug.org/historic/systems/texlive/"
+                               (string-take version 4)
+                               "/texlive-" version "-extra.tar.xz"))
+           (sha256
+            (base32
+             "1hiqvdg679yadygf23f37b3dz5ick258k1qcam9nhkhprkx7d9l0"))))
        ("config" ,config)
        ("texlive-scripts" ,texlive-scripts)
        ("cairo" ,cairo)
@@ -413,6 +415,7 @@ and should be preferred to it whenever a package would otherwise depend on
                   (srfi srfi-1)
                   (srfi srfi-26))
        #:out-of-source? #t
+       #:parallel-tests? #f             ;bibtex8.test fails otherwise
        #:configure-flags
        '("--disable-static"
          "--disable-native-texlive-build"
@@ -626,15 +629,12 @@ and should be preferred to it whenever a package would otherwise depend on
                     (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.
+               ;; Create symbolic links for the latex variants.  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"))
@@ -684,7 +684,12 @@ and should be preferred to it whenever a package would otherwise depend on
                ;; time.
                (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))
                (with-directory-excursion out
-                 (patch-source-shebangs))))))))
+                 (patch-source-shebangs))
+
+               ;; The line below generates an error when running "fmtutil".
+               (substitute*
+                   (string-append share "/texmf-dist/scripts/texlive/fmtutil.pl")
+                 (("require TeXLive::TLWinGoo if .*") ""))))))))
     (native-search-paths
      (list (search-path-specification
             (variable "GUIX_TEXMF")
@@ -7766,7 +7771,7 @@ documents as well as DVI output.")
                                   "/texlive-" version "-texmf.tar.xz"))
               (sha256
                (base32
-                "070gczcm1h9rx29w2f02xd3nhd84c4k28nfmm8qgp69yq8vd84pz"))))
+                "0lqjm11pr9vasvivaci3k9xcmdyd08ldnh31zf8avjjs09xcfkac"))))
     (build-system gnu-build-system)
     (inputs
      (list lua
-- 
cgit 1.4.1


From 24e6732b15b158c2560a01f3861517a0d7c5f1c6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 17 Jun 2023 10:03:58 +0200
Subject: doc: texlive-build-system: Mention #:tex-engine argument.

* doc/guix.texi (Build Systems): Mention #:TEX-ENGINE.  Also fix
capitalization for Metafont.
---
 doc/guix.texi | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 213c183e1f..0339525b7d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10003,11 +10003,12 @@ files in the inputs.
 
 By default it tries to run @code{luatex} on all @file{.ins} files, and
 if it fails to find any, on all @file{.dtx} files.  A different engine
-and format can be specified with the @code{#:tex-format} argument.
-Different build targets can be specified with the @code{#:build-targets}
-argument, which expects a list of file names.
+and format can be specified with, respectively, the @code{#:tex-engine}
+and @code{#:tex-format} arguments.  Different build targets can be
+specified with the @code{#:build-targets} argument, which expects a list
+of file names.
 
-It also generates font metrics (i.e., @file{.tfm} files) out of METAFONT
+It also generates font metrics (i.e., @file{.tfm} files) out of Metafont
 files whenever possible.  Likewise, it can also create TeX formats
 (i.e., @file{.fmt} files) listed in the @code{#:create-formats}
 argument.
-- 
cgit 1.4.1


From c8e75dfa2439cbd9bc5ca9a4d849d76250809dc8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 17 Jun 2023 10:18:51 +0200
Subject: guix: texlive-build-system: Add #:link-scripts argument.

* doc/guix.texi (Build Systems): Document argument.
* guix/build-system/texlive.scm (texlive-build): Add #:LINK-SCRIPTS argument.
* guix/build/texlive-build-system.scm (link-scripts):
(patch-shell-scripts): New function.
(%standard-phases): Add new functions as phases.
---
 doc/guix.texi                       |  4 +++-
 guix/build-system/texlive.scm       |  2 ++
 guix/build/texlive-build-system.scm | 44 ++++++++++++++++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 0339525b7d..2c460cbc08 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10011,7 +10011,9 @@ of file names.
 It also generates font metrics (i.e., @file{.tfm} files) out of Metafont
 files whenever possible.  Likewise, it can also create TeX formats
 (i.e., @file{.fmt} files) listed in the @code{#:create-formats}
-argument.
+argument, and generate a symbolic link from @file{bin/} directory to any
+script located in located in @file{texmf-dist/scripts/}, provided its
+file name is listed in @code{#:link-scripts} argument.
 
 The build system adds @code{texlive-bin} from @code{(gnu packages tex)}
 to the native inputs.  It can be overridden with the
diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm
index 19bf459dc2..cbe4cefe24 100644
--- a/guix/build-system/texlive.scm
+++ b/guix/build-system/texlive.scm
@@ -132,6 +132,7 @@ level package ID."
                         (tests? #f)
                         (build-targets #f)
                         (create-formats #f)
+                        (link-scripts #f)
                         (tex-engine #f)
 
                         ;; FIXME: This would normally default to "luatex" but
@@ -163,6 +164,7 @@ level package ID."
                                #:source #+source
                                #:build-targets #$build-targets
                                #:create-formats #$create-formats
+                               #:link-scripts #$link-scripts
                                #:tex-engine #$(if tex-engine
                                                   tex-engine
                                                   tex-format)
diff --git a/guix/build/texlive-build-system.scm b/guix/build/texlive-build-system.scm
index 8c56131051..a9fe9c80cc 100644
--- a/guix/build/texlive-build-system.scm
+++ b/guix/build/texlive-build-system.scm
@@ -79,6 +79,18 @@ runfile to replace.  If a file has no matching runfile, it is ignored."
                            (basename file)))))
               (find-files dir regexp))))
 
+(define* (patch-shell-scripts #:rest _)
+  "Expand filenames for usual tools in shell scripts."
+  (when (file-exists? "scripts")
+    (let* ((commands '("awk" "basename" "cat" "grep" "mkdir" "rm" "sed" "sort"
+                       "uname"))
+           (command-regexp (format #f
+                                   "\\b(~a)\\b"
+                                   (string-join commands "|"))))
+      (substitute* (find-files "scripts" "\\.sh$")
+        ((command-regexp _ command)
+         (which command))))))
+
 (define* (delete-drv-files #:rest _)
   "Delete pre-generated \".drv\" files in order to prevent build failures."
   (when (file-exists? "source")
@@ -244,16 +256,46 @@ runfile to replace.  If a file has no matching runfile, it is ignored."
                     (copy-recursively root destination)))
                 (runfiles-root-directories)))))
 
+(define* (link-scripts #:key link-scripts outputs #:allow-other-keys)
+  (when (pair? link-scripts)
+    (unless (file-exists? "scripts")
+      (error "missing \"scripts\" directory: no script to link"))
+    (let ((bin (string-append (assoc-ref outputs "out") "/bin"))
+          (filenames
+           (filter (lambda (f) (any (cut string-suffix? <> f) link-scripts))
+                   (find-files "scripts"))))
+      ;; Sanity check: make sure no provided script is ignored.
+      (let ((unknown (lset-difference string=?
+                                      (map basename link-scripts)
+                                      (map basename filenames))))
+        (when (pair? unknown)
+          (error (format #f "cannot find script(s): ~a~%"
+                         (string-join unknown)))))
+      ;; All lights are green.  Create "bin/" and the symlinks.
+      (mkdir-p bin)
+      (for-each
+       (lambda (script)
+         ;; Remove extension, if any.
+         (let ((name (match (string-split (basename script) #\.)
+                       ((name) name)
+                       (tokens (string-join (drop-right tokens 1)))))
+               (origin (string-append "../share/texmf-dist/" script)))
+           (format #t "linking bin/~s to ~s~%" name origin)
+           (symlink origin (string-append bin "/" name))))
+       filenames))))
+
 (define %standard-phases
   (modify-phases gnu:%standard-phases
     (delete 'bootstrap)
     (delete 'configure)
+    (add-after 'unpack 'patch-shell-scripts patch-shell-scripts)
     (add-before 'build 'delete-drv-files delete-drv-files)
     (add-after 'delete-drv-files 'generate-font-metrics generate-font-metrics)
     (replace 'build build)
     (add-after 'build 'create-formats create-formats)
     (delete 'check)
-    (replace 'install install)))
+    (replace 'install install)
+    (add-after 'install 'link-scripts link-scripts)))
 
 (define* (texlive-build #:key inputs (phases %standard-phases)
                         #:allow-other-keys #:rest args)
-- 
cgit 1.4.1


From ec97cf15693a0567daa741ecf6d21e6e7ec68134 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 22:45:43 +0200
Subject: guix: Let texlive importer handle linked scripts.

* guix/import/texlive.scm (tlpdb): Also retrieve so-called binfiles.
(formats):
(linked-scripts): New functions.
(tlpdb->package): Use new functions to set #:LINK-SCRIPTS argument and
possibly INPUTS.
* tests/texlive.scm (%fake-tlpdb): Add test data.
("texlive->guix-package, single script, no extension"):
("texlive->guix-package, multiple scripts, with extensions"):
("texlive->guix-package, script with associated input"):  New tests.
---
 guix/import/texlive.scm |  83 +++++++++++++++++++-------
 tests/texlive.scm       | 152 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 215 insertions(+), 20 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 5458a43456..554258f20d 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -183,6 +183,7 @@ When TEXLIVE-ONLY is true, only TeX Live packages are returned."
               (srcfiles . list)
               (runfiles . list)
               (docfiles . list)
+              (binfiles . list)
               (depend   . simple-list)
               (execute  . simple-list)))
            (record
@@ -264,6 +265,46 @@ When TEXLIVE-ONLY is true, only TeX Live packages are returned."
                              packages)
                  (append packages deps)))))))
 
+(define (formats package-data)
+  "Return a list of formats to build according to PACKAGE-DATA."
+  (and=> (assoc-ref package-data 'execute)
+         (lambda (actions)
+           (delete-duplicates
+            (filter-map
+             (lambda (action)
+               (match (string-split action #\space)
+                 (("AddFormat" fmt . _)
+                  (string-drop fmt (string-length "name=")))
+                 (_ #f)))
+             ;; Get the right (alphabetic) order.
+             (reverse actions))))))
+
+(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\" extensions, and files without extension."
+  (and-let* ((data (assoc-ref package-database name))
+             ;; Check if binaries are associated to the package.
+             (depend (assoc-ref data 'depend))
+             ((member (string-append name ".ARCH") depend))
+             ;; List those binaries.
+             (bin-data (assoc-ref package-database
+                                  ;; Any *nix-like architecture will do.
+                                  (string-append name ".x86_64-linux")))
+             (binaries (map basename (assoc-ref bin-data 'binfiles)))
+             ;; List scripts candidates.  Bail out if there are none.
+             (runfiles (assoc-ref data 'runfiles))
+             (scripts (filter (cut string-prefix? "texmf-dist/scripts/" <>)
+                              runfiles))
+             ((pair? scripts)))
+    (filter-map (lambda (script)
+                  (and (any (lambda (ext)
+                              (member (basename script ext) binaries))
+                            '(".lua" ".pl" ".py" ".sh"))
+                       (basename script)))
+                ;; Get the right (alphabetic) order.
+                (reverse scripts))))
+
 (define* (files-differ? directory package-name
                         #:key
                         (package-database tlpdb)
@@ -348,7 +389,9 @@ of those files are returned that are unexpectedly installed."
              (source (with-store store
                        (download-multi-svn-to-store
                         store ref (string-append name "-svn-multi-checkout")))))
-    (let ((meta-package? (null? locs)))
+    (let* ((meta-package? (null? locs))
+           (scripts (and (not meta-package?)
+                         (linked-scripts texlive-name package-database))))
       (values
        `(package
           (name ,name)
@@ -369,25 +412,10 @@ of those files are returned that are unexpectedly installed."
           (build-system ,(if meta-package?
                              'trivial-build-system
                              'texlive-build-system))
+          ;; Generate arguments field.
           ,@(if meta-package?
                 '((arguments (list #:builder #~(mkdir #$output))))
-                (let* ((formats
-                        ;; Translate AddFormat execute actions into
-                        ;; a #:create-formats argument.
-                        (and-let*
-                            ((actions (assoc-ref data 'execute))
-                             (formats
-                              (delete-duplicates
-                               (filter-map
-                                (lambda (action)
-                                  (match (string-split action #\space)
-                                    (("AddFormat" fmt . _)
-                                     (string-drop fmt (string-length "name=")))
-                                    (_ #f)))
-                                actions)))
-                             ((pair? formats)))
-                          (reverse formats)))
-                       ;; Check if setting #:texlive-latex-bin? is appropriate.
+                (let* ((formats (formats data))
                        (latex-bin-dependency?
                         (member texlive-name
                                 (latex-bin-dependency-tree package-database)))
@@ -395,14 +423,20 @@ of those files are returned that are unexpectedly installed."
                         (append (if latex-bin-dependency?
                                     '(#:texlive-latex-bin? #f)
                                     '())
-                                (if formats
+                                (if (pair? scripts)
+                                    `(#:link-scripts #~(list ,@scripts))
+                                    '())
+                                (if (pair? formats)
                                     `(#:create-formats #~(list ,@formats))
                                     '()))))
                   (if (pair? arguments)
                       `((arguments (list ,@arguments)))
                       '())))
+          ;; Native inputs.
+          ;;
           ;; Texlive build system generates font metrics whenever a font
-          ;; metrics file has the same base name as a Metafont file.
+          ;; metrics file has the same base name as a Metafont file.  In this
+          ;; case, provide `texlive-metafont'.
           ,@(or (and-let* ((runfiles (assoc-ref data 'runfiles))
                            (metrics
                             (filter-map (lambda (f)
@@ -416,6 +450,15 @@ of those files are returned that are unexpectedly installed."
                                  runfiles)))
                   '((native-inputs (list texlive-metafont))))
                 '())
+          ;; Inputs.
+          ,@(match (filter-map (lambda (s)
+                                 (cond ((string-suffix? ".pl" s) 'perl)
+                                       ((string-suffix? ".py" s) 'python)
+                                       (else #f)))
+                               (or scripts '()))
+              (() '())
+              (inputs `((inputs (list ,@inputs)))))
+          ;; Propagated inputs.
           ,@(match (translate-depends depends)
               (() '())
               (inputs
diff --git a/tests/texlive.scm b/tests/texlive.scm
index 063cde6465..98461f7e51 100644
--- a/tests/texlive.scm
+++ b/tests/texlive.scm
@@ -69,6 +69,19 @@
       "texmf-dist/tex/latex/adforn/adforn.sty"
       "texmf-dist/tex/latex/adforn/uornementsadf.fd")
      (catalogue-license . "lppl gpl2"))
+    ("authorindex"
+     (name . "authorindex")
+     (shortdesc . "Index citations by author names")
+     (longdesc . "This package allows the user to...")
+     (depend "authorindex.ARCH")
+     (docfiles "texmf-dist/doc/latex/authorindex/COPYING")
+     (runfiles
+      "texmf-dist/scripts/authorindex/authorindex"
+      "texmf-dist/tex/latex/authorindex/authorindex.sty")
+     (catalogue-license . "lppl"))
+    ("authorindex.x86_64-linux"
+     (name . "authorindex.x86_64-linux")
+     (binfiles "bin/amd64-netbsd/authorindex"))
     ("chs-physics-report"
      . ((name . "ch-physics-report")
         (shortdesc . "Physics lab reports...")
@@ -92,6 +105,22 @@
      (shortdesc . "TeXworks editor...")
      (longdesc . "See http...")
      (depend "texworks" "collection-basic"))
+    ("cyrillic-bin"
+     (name . "cyrillic-bin")
+     (shortdesc . "Cyrillic bibtex and makeindex")
+     (depend "cyrillic-bin.ARCH")
+     (docfiles
+      "texmf-dist/doc/man/man1/rubibtex.1"
+      "texmf-dist/doc/man/man1/rubibtex.man1.pdf")
+     (runfiles
+      "texmf-dist/scripts/texlive-extra/rumakeindex.sh"
+      "texmf-dist/scripts/texlive-extra/rubibtex.sh"))
+    ("cyrillic-bin.x86_64-linux"
+     (name . "cyrillic-bin.x86_64-linux")
+     (shortdesc . "x86_64-linux files of cyrillic-bin")
+     (binfiles
+      "bin/x86_64-linux/rubibtex"
+      "bin/x86_64-linux/rumakeindex"))
     ("example"
      . ((name . "example")
         (shortdesc . "Typeset examples...")
@@ -133,6 +162,24 @@
       "texmf-dist/tex/lollipop/lollipop.ini"
       "texmf-dist/tex/lollipop/lollipop.tex")
      (catalogue-license . "gpl3"))
+    ("pax"
+     (name . "pax")
+     (shortdesc . "Extract and reinsert PDF...")
+     (longdesc . "If PDF files are...")
+     (depend "pax.ARCH")
+     (docfiles
+      "texmf-dist/doc/latex/pax/README")
+     (srcfiles
+      "texmf-dist/source/latex/pax/Makefile"
+      "texmf-dist/source/latex/pax/build.xml")
+     (runfiles
+      "texmf-dist/scripts/pax/pdfannotextractor.pl")
+     (catalogue-license . "lppl gpl"))
+    ("pax.x86_64-linux"
+     (name . "pax.x86_64-linux")
+     (shortdesc . "x86_64-linux files of pax")
+     (binfiles
+      "bin/x86_64-linux/pdfannotextractor"))
     ("stricttex"
      . ((name
          . "stricttex")
@@ -646,4 +693,109 @@ completely compatible with Plain TeX.")
                (format #t "~s~%" result)
                (pk 'fail result #f)))))))
 
+(test-assert "texlive->guix-package, single script, no extension"
+  ;; Replace network resources with sample data.
+  (mock ((guix build svn) svn-fetch
+         (lambda* (url revision directory
+                       #:key (svn-command "svn")
+                       (user-name #f)
+                       (password #f)
+                       (recursive? #t))
+           (mkdir-p directory)
+           (with-output-to-file (string-append directory "/foo")
+             (lambda ()
+               (display "source")))))
+        (let ((result (texlive->guix-package "authorindex"
+                                             #:package-database
+                                             (lambda _ %fake-tlpdb))))
+          (match result
+            (('package
+               ('name "texlive-authorindex")
+               ('version _)
+               ('source _)
+               ('outputs _)
+               ('build-system 'texlive-build-system)
+               ('arguments
+                ('list '#:link-scripts ('gexp ('list "authorindex"))))
+               ('home-page (? string?))
+               ('synopsis (? string?))
+               ('description (? string?))
+               ('license _))
+             #true)
+            (_
+             (begin
+               (format #t "~s~%" result)
+               (pk 'fail result #f)))))))
+
+(test-assert "texlive->guix-package, multiple scripts, with extensions"
+  ;; Replace network resources with sample data.
+  (mock ((guix build svn) svn-fetch
+         (lambda* (url revision directory
+                       #:key (svn-command "svn")
+                       (user-name #f)
+                       (password #f)
+                       (recursive? #t))
+           (mkdir-p directory)
+           (with-output-to-file (string-append directory "/foo")
+             (lambda ()
+               (display "source")))))
+        (let ((result (texlive->guix-package "cyrillic-bin"
+                                             #:package-database
+                                             (lambda _ %fake-tlpdb))))
+          (match result
+            (('package
+               ('name "texlive-cyrillic-bin")
+               ('version _)
+               ('source _)
+               ('outputs _)
+               ('build-system 'texlive-build-system)
+               ('arguments
+                ('list '#:link-scripts
+                       ('gexp ('list "rubibtex.sh" "rumakeindex.sh"))))
+               ('home-page _)
+               ('synopsis _)
+               ('description _)
+               ('license _))
+             #true)
+            (_
+             (begin
+               (format #t "~s~%" result)
+               (pk 'fail result #f)))))))
+
+(test-assert "texlive->guix-package, script with associated input"
+  ;; Replace network resources with sample data.
+  (mock ((guix build svn) svn-fetch
+         (lambda* (url revision directory
+                       #:key (svn-command "svn")
+                       (user-name #f)
+                       (password #f)
+                       (recursive? #t))
+           (mkdir-p directory)
+           (with-output-to-file (string-append directory "/foo")
+             (lambda ()
+               (display "source")))))
+        (let ((result (texlive->guix-package "pax"
+                                             #:package-database
+                                             (lambda _ %fake-tlpdb))))
+          (match result
+            (('package
+               ('name "texlive-pax")
+               ('version _)
+               ('source _)
+               ('outputs _)
+               ('build-system 'texlive-build-system)
+               ('arguments
+                ('list '#:link-scripts ('gexp ('list "pdfannotextractor.pl"))))
+               ('inputs
+                ('list 'perl))
+               ('home-page _)
+               ('synopsis _)
+               ('description _)
+               ('license _))
+             #true)
+            (_
+             (begin
+               (format #t "~s~%" result)
+               (pk 'fail result #f)))))))
+
 (test-end "texlive")
-- 
cgit 1.4.1


From 9fadbf759c7ae0c4555bf43883f3f0a0d8a4e6a6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 17 Jun 2023 11:34:23 +0200
Subject: gnu: texlive-bin: Do not install all linked scripts.

* gnu/packages/tex.scm (texlive-scripts): Include only core scripts along with
their man pages and their dependencies.  Also patch them for use in Guix.
(texlive-bin): Simplify package.
[inputs]: Remove "texlive-extra-src" and "texlive-scripts" inputs.  Remove
labels from other inputs.
[propagated-inputs]: Add TEXLIVE-SCRIPTS.
[arguments]: Use G-expressions.
<#:configure-flags>: Add "--disable-linked-scripts".
<#:phases>: Remove phases relative to scripts.
* guix/profiles.scm (texlive-font-maps): Fetch executables from both
TEXLIVE-SCRIPTS and TEXLIVE-BIN.
* guix/import/texlive.scm (tlpdb-file): Grab file from TEXLIVE-SCRIPTS instead
of TEXLIVE-BIN.
---
 gnu/packages/tex.scm    | 650 ++++++++++++++++++++++++------------------------
 guix/import/texlive.scm |   8 +-
 guix/profiles.scm       |  14 +-
 3 files changed, 333 insertions(+), 339 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 91ec097d70..9e7e77b3e7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -108,15 +108,145 @@
   (define-deprecated/public old-name name
     (deprecated-package (symbol->string 'old-name) name)))
 
-(define texlive-scripts
-  (texlive-origin
-   "texlive-scripts" (number->string %texlive-revision)
-   (list "dvips/tetex/"
-         "fonts/enc/dvips/tetex/"
-         "fonts/map/dvips/tetex/"
-         "scripts/texlive/")
-   (base32
-    "0y571gddch111r2chjfkyjsm4zk24xxiv2rcczb5apf6d0g211b9")))
+(define-public texlive-scripts
+  (package
+    (name "texlive-scripts")
+    (version (number->string %texlive-revision))
+    ;; We cannot use `texlive-origin' because its locations start out in
+    ;; "texmf-dist" directory which is one level below "tlpkg" that we also
+    ;; need to pull here.
+    (source (origin
+              (method svn-multi-fetch)
+              (uri (svn-multi-reference
+                    (url (string-append "svn://www.tug.org/texlive/tags/"
+                                        %texlive-tag "/Master/"))
+                    (locations
+                     (list "texmf-dist/doc/man/man1/fmtutil-sys.1"
+                           "texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf"
+                           "texmf-dist/doc/man/man1/fmtutil-user.1"
+                           "texmf-dist/doc/man/man1/fmtutil-user.man1.pdf"
+                           "texmf-dist/doc/man/man1/fmtutil.1"
+                           "texmf-dist/doc/man/man1/fmtutil.man1.pdf"
+                           "texmf-dist/doc/man/man1/install-tl.1"
+                           "texmf-dist/doc/man/man1/install-tl.man1.pdf"
+                           "texmf-dist/doc/man/man1/mktexfmt.1"
+                           "texmf-dist/doc/man/man1/mktexfmt.man1.pdf"
+                           "texmf-dist/doc/man/man1/mktexlsr.1"
+                           "texmf-dist/doc/man/man1/mktexlsr.man1.pdf"
+                           "texmf-dist/doc/man/man1/mktexmf.1"
+                           "texmf-dist/doc/man/man1/mktexmf.man1.pdf"
+                           "texmf-dist/doc/man/man1/mktexpk.1"
+                           "texmf-dist/doc/man/man1/mktexpk.man1.pdf"
+                           "texmf-dist/doc/man/man1/mktextfm.1"
+                           "texmf-dist/doc/man/man1/mktextfm.man1.pdf"
+                           "texmf-dist/doc/man/man1/texhash.1"
+                           "texmf-dist/doc/man/man1/texhash.man1.pdf"
+                           "texmf-dist/doc/man/man1/tlmgr.1"
+                           "texmf-dist/doc/man/man1/tlmgr.man1.pdf"
+                           "texmf-dist/doc/man/man1/updmap-sys.1"
+                           "texmf-dist/doc/man/man1/updmap-sys.man1.pdf"
+                           "texmf-dist/doc/man/man1/updmap-user.1"
+                           "texmf-dist/doc/man/man1/updmap-user.man1.pdf"
+                           "texmf-dist/doc/man/man1/updmap.1"
+                           "texmf-dist/doc/man/man1/updmap.man1.pdf"
+                           "texmf-dist/doc/man/man5/fmtutil.cnf.5"
+                           "texmf-dist/doc/man/man5/fmtutil.cnf.man5.pdf"
+                           "texmf-dist/doc/man/man5/updmap.cfg.5"
+                           "texmf-dist/doc/man/man5/updmap.cfg.man5.pdf"
+                           "texmf-dist/dvips/tetex/"
+                           "texmf-dist/fonts/enc/dvips/tetex/"
+                           "texmf-dist/fonts/map/dvips/tetex/"
+                           "texmf-dist/scripts/texlive/fmtutil-sys.sh"
+                           "texmf-dist/scripts/texlive/fmtutil-user.sh"
+                           "texmf-dist/scripts/texlive/fmtutil.pl"
+                           "texmf-dist/scripts/texlive/mktexlsr.pl"
+                           "texmf-dist/scripts/texlive/mktexmf"
+                           "texmf-dist/scripts/texlive/mktexpk"
+                           "texmf-dist/scripts/texlive/mktextfm"
+                           "texmf-dist/scripts/texlive/tlmgr.pl"
+                           "texmf-dist/scripts/texlive/updmap-sys.sh"
+                           "texmf-dist/scripts/texlive/updmap-user.sh"
+                           "texmf-dist/scripts/texlive/updmap.pl"
+                           "texmf-dist/web2c/fmtutil-hdr.cnf"
+                           "texmf-dist/web2c/updmap-hdr.cfg"
+                           "tlpkg/gpg/"
+                           "tlpkg/installer/config.guess"
+                           "tlpkg/installer/curl/curl-ca-bundle.crt"
+                           "tlpkg/TeXLive/"
+                           "tlpkg/texlive.tlpdb"))
+                    (revision %texlive-revision)))
+              (sha256
+               "1igdbnp37c5ajdp17bmcdgkm5s2fyph5v9gk8svhwaamwazk7xg5")))
+    (outputs '("out" "doc"))
+    (build-system copy-build-system)
+    (arguments
+     (list
+      #:imported-modules `(,@%copy-build-system-modules
+                           (guix build texlive-build-system)
+                           (guix build union))
+      #:modules '((guix build copy-build-system)
+                  ((guix build texlive-build-system) #:prefix tex:)
+                  (guix build utils))
+      #:install-plan
+      #~'(("texmf-dist/dvips/"   "share/texmf-dist/dvips")
+          ("texmf-dist/fonts/"   "share/texmf-dist/fonts")
+          ("texmf-dist/scripts/" "share/texmf-dist/scripts")
+          ("texmf-dist/web2c/"   "share/texmf-dist/web2c")
+          ("tlpkg/"              "share/tlpkg"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-scripts
+            (lambda _
+              ;; First patch shell scripts with ".sh" extension.
+              (with-directory-excursion "texmf-dist"
+                ((assoc-ref tex:%standard-phases 'patch-shell-scripts)))
+              ;; Then patch scripts without such extension.
+              (let ((dirs (map (compose dirname which)
+                               (list "awk" "cat" "grep" "sed"))))
+                (substitute*
+                    (find-files "texmf-dist/scripts/" "^mktex(mf|pk|tfm)$")
+                  (("^version=" m)
+                   (format #false "PATH=\"~{~a:~}$PATH\"; export PATH~%~a"
+                           dirs m))))
+              ;; Make sure that fmtutil can find its Perl modules.
+              (substitute* "texmf-dist/scripts/texlive/fmtutil.pl"
+                (("\\$TEXMFROOT/")
+                 (string-append #$output "/share/")))
+              ;; Likewise for updmap.pl.
+              (substitute* "texmf-dist/scripts/texlive/updmap.pl"
+                (("\\$TEXMFROOT/tlpkg")
+                 (string-append #$output "/share/tlpkg")))
+              ;; Likewise for the tlmgr.
+              (substitute* "texmf-dist/scripts/texlive/tlmgr.pl"
+                ((".*\\$::installerdir = \\$Master.*" all)
+                 (format #f "  $Master = ~s;~%~a"
+                         (string-append #$output "/share")
+                         all)))))
+          (add-after 'unpack 'fix-fmtutil
+            ;; The line below generates an error when running "fmtutil".
+            (lambda _
+              (substitute* "texmf-dist/scripts/texlive/fmtutil.pl"
+                (("require TeXLive::TLWinGoo if .*") ""))))
+          (add-after 'install 'install-doc
+            (lambda _
+              (let ((doc (string-append #$output:doc "/share/texmf-dist/doc")))
+                (mkdir-p doc)
+                (copy-recursively "texmf-dist/doc/" doc))))
+          (add-after 'install-doc 'link-scripts
+            (lambda* (#:key outputs #:allow-other-keys)
+              (with-directory-excursion "texmf-dist"
+                (apply (assoc-ref tex:%standard-phases 'link-scripts)
+                       (list #:outputs outputs
+                             #:link-scripts
+                             (find-files "scripts")))))))))
+    (inputs (list perl))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "TeX Live infrastructure programs")
+    (description
+     "This package provides core TeX Live scripts such as @code{updmap},
+@code{fmtutil}, and @code{tlmgr}.  It is is automatically installed alongside
+@code{texlive-bin}.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
 (define-public texlive-hyphen-complete
   (package
@@ -359,337 +489,197 @@ and should be preferred to it whenever a package would otherwise depend on
                   (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))))))))))))
+        #~(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)
+    (native-inputs (list pkg-config))
     (inputs
-     `(("texlive-extra-src"
-        ,(origin
-           (method url-fetch)
-           (uri (string-append "ftp://tug.org/historic/systems/texlive/"
-                               (string-take version 4)
-                               "/texlive-" version "-extra.tar.xz"))
-           (sha256
-            (base32
-             "1hiqvdg679yadygf23f37b3dz5ick258k1qcam9nhkhprkx7d9l0"))))
-       ("config" ,config)
-       ("texlive-scripts" ,texlive-scripts)
-       ("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))
+     (list config
+           cairo
+           fontconfig
+           fontforge
+           freetype
+           gd
+           gmp
+           ghostscript
+           graphite2
+           harfbuzz
+           icu4c
+           libpaper
+           libpng
+           libxaw
+           libxt
+           mpfr
+           perl
+           pixman
+           potrace
+           python
+           ruby-2.7
+           tcsh
+           teckit
+           zlib
+           zziplib))
+    (propagated-inputs (list texlive-scripts))
     (arguments
-     `(#:modules ((guix build gnu-build-system)
+     (list
+      #:modules '((guix build gnu-build-system)
                   (guix build utils)
                   (ice-9 ftw)
                   (srfi srfi-1)
                   (srfi srfi-26))
-       #:out-of-source? #t
-       #:parallel-tests? #f             ;bibtex8.test fails otherwise
-       #: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-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"
-         ;; LuaJIT is not ported to some architectures yet.
-         ,@(if (or (target-ppc64le?)
-                   (target-riscv64?))
-             '("--disable-luajittex"
-               "--disable-luajithbtex"
-               "--disable-mfluajit")
-             '()))
-
+      #:out-of-source? #t
+      #:parallel-tests? #f              ;bibtex8.test fails otherwise
+      #:configure-flags
+      #~(list "--disable-static"
+              ;; "Linked scripts" are taken care of in their respective
+              ;; packages.
+              "--disable-linked-scripts"
+              "--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-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"
+              ;; LuaJIT is not ported to some architectures yet.
+              #$@(if (or (target-ppc64le?)
+                         (target-riscv64?))
+                     '("--disable-luajittex"
+                       "--disable-luajithbtex"
+                       "--disable-mfluajit")
+                     '()))
       ;; Disable tests on some architectures to cope with a failure of
       ;; luajiterr.test.
+      ;;
       ;; XXX FIXME fix luajit properly on these architectures.
-      #:tests? ,(let ((s (or (%current-target-system)
-                             (%current-system))))
-                  (not (or (string-prefix? "aarch64" s)
-                           (string-prefix? "mips64" s)
-                           (string-prefix? "powerpc64le" s))))
-
-       #: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 'patch-dvisvgm-build-files
-           (lambda _
-             ;; XXX: Ghostscript is detected, but HAVE_LIBGS is never set, so
-             ;; the appropriate linker flags are not added.
-             (substitute* "texk/dvisvgm/configure"
-               (("^have_libgs=yes" all)
-                (string-append all "\nHAVE_LIBGS=1")))))
-         (add-after 'unpack 'disable-failing-test
-           (lambda _
-             ;; FIXME: This test fails on 32-bit architectures since Glibc 2.28:
-             ;; <https://bugzilla.redhat.com/show_bug.cgi?id=1631847>.
-             (substitute* "texk/web2c/omegafonts/check.test"
-               (("^\\./omfonts -ofm2opl \\$srcdir/tests/check tests/xcheck \\|\\| exit 1")
-                "./omfonts -ofm2opl $srcdir/tests/check tests/xcheck || exit 77"))))
-         ,@(if (or (target-ppc32?)
-                   (target-riscv64?))
-             ;; Some mendex tests fail on some architectures.
-             `((add-after 'unpack 'skip-mendex-tests
-                 (lambda _
-                   (substitute* '("texk/mendexk/tests/mendex.test"
-                                  "texk/upmendex/tests/upmendex.test")
-                     (("srcdir/tests/pprecA-0.ind pprecA-0.ind1 \\|\\| exit 1")
-                      "srcdir/tests/pprecA-0.ind pprecA-0.ind1 || exit 77")))))
-             '())
-         (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 'unpack-texlive-extra 'copy-texlive-scripts
-           (lambda* (#:key inputs #:allow-other-keys)
-             (mkdir "texlive-scripts")
-             (with-directory-excursion "texlive-scripts"
-               (let ((scripts (string-append
-                               (assoc-ref inputs "texlive-scripts")
-                               "/scripts/texlive")))
-                 (copy-recursively scripts "."))
-               ;; Configure the version string for some scripts.
-               ;; Normally this would be done by Subversion.
-               ;; See <https://issues.guix.gnu.org/43442#15>.
-               (for-each (lambda (file)
-                           (substitute* file
-                             (("\\$Id\\$")
-                              (format #f "$Id: ~a ~a ~a nobody $"
-                                      file
-                                      ,%texlive-revision
-                                      ,%texlive-date))
-                             (("\\$Revision\\$")
-                              (format #f "$Revision: ~a $"
-                                      ,%texlive-revision))
-                             (("\\$Date\\$")
-                              (format #f "$Date: ~a $"
-                                      ,%texlive-date))))
-                         '("fmtutil.pl"
-                           "mktexlsr"
-                           "mktexlsr.pl"
-                           "mktexmf"
-                           "mktexpk"
-                           "mktextfm"
-                           "tlmgr.pl"
-                           "tlmgrgui.pl"
-                           "updmap.pl")))))
-         (add-after 'copy-texlive-scripts 'patch-scripts
-           (lambda _
-             (let* ((scripts (append (find-files "texk/kpathsea" "^mktex")
-                                     (find-files "texk/texlive/linked_scripts"
-                                                 "\\.sh$")
-                                     (find-files "texlive-scripts" "\\.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
-                     '("texk/texlive/linked_scripts/texlive-extra/rubibtex.sh"
-                       "texk/texlive/linked_scripts/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)))))
-         ;; When ST_NLINK_TRICK is set, kpathsea attempts to avoid work when
-         ;; searching files by assuming that a directory with exactly two
-         ;; links has no subdirectories.  This assumption does not hold in our
-         ;; case, so some directories with symlinked subdirectories would not
-         ;; be traversed.
-         (add-after 'patch-scripts 'patch-directory-traversal
-           (lambda _
-             (substitute* "texk/kpathsea/config.h"
-               (("#define ST_NLINK_TRICK") ""))))
-
-         ,@(if (target-arm32?)
-               `((add-after 'unpack 'skip-faulty-test
-                   (lambda _
-                     ;; Skip this faulty test on armhf-linux:
-                     ;;   https://issues.guix.gnu.org/54055
-                     (substitute* '("texk/mendexk/tests/mendex.test"
-                                    "texk/upmendex/tests/upmendex.test")
-                       (("^TEXMFCNF=" all)
-                        (string-append "exit 77 # skip\n" all))))))
-               '())
-
-         (add-after 'check 'customize-texmf.cnf
-           ;; The default texmf.cnf is provided by this package, texlive-bin.
-           ;; Every variable of interest is set relatively to the GUIX_TEXMF
-           ;; environment variable defined via a search path specification
-           ;; further below.  The configuration file is patched after the test
-           ;; suite has run, as it relies on the default configuration to find
-           ;; its paths (and the GUIX_TEXMF variable isn't set yet).
-           (lambda _
-             ;; The current directory is build/ because of the out-of-tree
-             ;; build.
-             (let* ((source    (first (scandir ".." (cut string-suffix?
-                                                         "source" <>))))
-                    (texmf.cnf (string-append "../" source
-                                              "/texk/kpathsea/texmf.cnf")))
-               (substitute* texmf.cnf
-                 (("^TEXMFROOT = .*")
-                  "TEXMFROOT = {$GUIX_TEXMF}/..\n")
-                 (("^TEXMF = .*")
-                  "TEXMF = {$GUIX_TEXMF}\n")
-                 (("^%TEXMFCNF = .*")
-                  "TEXMFCNF = {$GUIX_TEXMF}/web2c\n")
-                 ;; Don't truncate lines.
-                 (("^error_line = .*$") "error_line = 254\n")
-                 (("^half_error_line = .*$") "half_error_line = 238\n")
-                 (("^max_print_line = .*$") "max_print_line = 1000\n")))))
-         (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"))
-                    (scripts (string-append share
-                                            "/texmf-dist/scripts/texlive"))
-                    (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.  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")))
-
-               ;; Install tlpkg.
-               (copy-recursively tlpkg-src (string-append share "/tlpkg"))
-
-               ;; Install texlive-scripts and associated files.
-               (copy-recursively (string-append source "/texlive-scripts")
-                                 scripts)
-               (for-each
-                (lambda (dir)
-                  (mkdir-p dir)
-                  (copy-recursively (string-append
-                                     (assoc-ref inputs "texlive-scripts")
-                                     "/" dir)
-                                    (string-append share "/texmf-dist/" dir)))
-                '("dvips" "fonts"))
-
-               ;; Patch them.
-               (let ((dirs (map dirname (list (which "sed") (which "awk")))))
-                 (with-directory-excursion scripts
-                   (substitute* '("mktexpk" "mktexmf" "mktexlsr")
-                     (("^version=" m)
-                      (format #false "PATH=\"~{~a:~}$PATH\"; export PATH~%~a"
-                              dirs m)))))
-
-               ;; Make sure that fmtutil can find its Perl modules.
-               (substitute* (string-append scripts "/fmtutil.pl")
-                 (("\\$TEXMFROOT/")
-                  (string-append share "/")))
-
-               ;; Likewise for updmap.pl.
-               (substitute* (string-append scripts "/updmap.pl")
-                 (("\\$TEXMFROOT/tlpkg")
-                  (string-append share "/tlpkg")))
-
-               ;; Likewise for the tlmgr.
-               (substitute* (string-append scripts "/tlmgr.pl")
-                 ((".*\\$::installerdir = \\$Master.*" all)
-                  (format #f "  $Master = ~s;~%~a" share all)))
-
-               ;; Install the config.guess script, required by tlmgr.
-               (with-directory-excursion share
-                 (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))
-
-               ;; The line below generates an error when running "fmtutil".
-               (substitute*
-                   (string-append share "/texmf-dist/scripts/texlive/fmtutil.pl")
-                 (("require TeXLive::TLWinGoo if .*") ""))))))))
+      #:tests? (let ((s (or (%current-target-system)
+                            (%current-system))))
+                 (not (or (string-prefix? "aarch64" s)
+                          (string-prefix? "mips64" s)
+                          (string-prefix? "powerpc64le" s))))
+      #: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 _
+              (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl"
+                (("gswin32c") "gs"))))
+          (add-after 'unpack 'patch-dvisvgm-build-files
+            (lambda _
+              ;; XXX: Ghostscript is detected, but HAVE_LIBGS is never set, so
+              ;; the appropriate linker flags are not added.
+              (substitute* "texk/dvisvgm/configure"
+                (("^have_libgs=yes" all)
+                 (string-append all "\nHAVE_LIBGS=1")))))
+          (add-after 'unpack 'disable-failing-test
+            (lambda _
+              ;; FIXME: This test fails on 32-bit architectures since Glibc
+              ;; 2.28: <https://bugzilla.redhat.com/show_bug.cgi?id=1631847>.
+              (substitute* "texk/web2c/omegafonts/check.test"
+                (("^\\./omfonts -ofm2opl \\$srcdir/tests/check tests/xcheck \\|\\| exit 1")
+                 "./omfonts -ofm2opl $srcdir/tests/check tests/xcheck || exit 77"))))
+          #$@(if (or (target-ppc32?)
+                     (target-riscv64?))
+                 ;; Some mendex tests fail on some architectures.
+                 `((add-after 'unpack 'skip-mendex-tests
+                     (lambda _
+                       (substitute* '("texk/mendexk/tests/mendex.test"
+                                      "texk/upmendex/tests/upmendex.test")
+                         (("srcdir/tests/pprecA-0.ind pprecA-0.ind1 \\|\\| exit 1")
+                          "srcdir/tests/pprecA-0.ind pprecA-0.ind1 || exit 77")))))
+                 '())
+          ;; When ST_NLINK_TRICK is set, kpathsea attempts to avoid work when
+          ;; searching files by assuming that a directory with exactly two
+          ;; links has no subdirectories.  This assumption does not hold in our
+          ;; case, so some directories with symlinked subdirectories would not
+          ;; be traversed.
+          (add-after 'unpack 'patch-directory-traversal
+            (lambda _
+              (substitute* "texk/kpathsea/config.h"
+                (("#define ST_NLINK_TRICK") ""))))
+          #$@(if (target-arm32?)
+                 `((add-after 'unpack 'skip-faulty-test
+                     (lambda _
+                       ;; Skip this faulty test on armhf-linux:
+                       ;;   https://issues.guix.gnu.org/54055
+                       (substitute* '("texk/mendexk/tests/mendex.test"
+                                      "texk/upmendex/tests/upmendex.test")
+                         (("^TEXMFCNF=" all)
+                          (string-append "exit 77 # skip\n" all))))))
+                 '())
+          (add-after 'check 'customize-texmf.cnf
+            ;; The default texmf.cnf is provided by this package, texlive-bin.
+            ;; Every variable of interest is set relatively to the GUIX_TEXMF
+            ;; environment variable defined via a search path specification
+            ;; further below.  The configuration file is patched after the test
+            ;; suite has run, as it relies on the default configuration to find
+            ;; its paths (and the GUIX_TEXMF variable isn't set yet).
+            (lambda _
+              ;; The current directory is build/ because of the out-of-tree
+              ;; build.
+              (let* ((source    (first (scandir ".." (cut string-suffix?
+                                                          "source" <>))))
+                     (texmf.cnf (string-append "../" source
+                                               "/texk/kpathsea/texmf.cnf")))
+                (substitute* texmf.cnf
+                  (("^TEXMFROOT = .*")
+                   "TEXMFROOT = {$GUIX_TEXMF}/..\n")
+                  (("^TEXMF = .*")
+                   "TEXMF = {$GUIX_TEXMF}\n")
+                  (("^%TEXMFCNF = .*")
+                   "TEXMFCNF = {$GUIX_TEXMF}/web2c\n")
+                  ;; Don't truncate lines.
+                  (("^error_line = .*$") "error_line = 254\n")
+                  (("^half_error_line = .*$") "half_error_line = 238\n")
+                  (("^max_print_line = .*$") "max_print_line = 1000\n")))))
+          (add-after 'install 'post-install
+            (lambda _
+              ;; Create symbolic links for the latex variants.  We link
+              ;; lualatex to luahbtex; see issue #51252 for details.
+              (with-directory-excursion (string-append #$output "/bin/")
+                (for-each symlink
+                          '("pdftex" "pdftex"   "xetex"   "luahbtex")
+                          '("latex"  "pdflatex" "xelatex" "lualatex")))
+              ;; 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") ":" #$output "/bin"))
+              (with-directory-excursion #$output
+                (assoc-ref %standard-phases 'patch-source-shebangs)))))))
     (native-search-paths
      (list (search-path-specification
             (variable "GUIX_TEXMF")
diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 554258f20d..d4fa8bb674 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -153,20 +153,20 @@ When TEXLIVE-ONLY is true, only TeX Live packages are returned."
                depends)))
 
 (define (tlpdb-file)
-  (define texlive-bin
+  (define texlive-scripts
     ;; Resolve this variable lazily so that (gnu packages ...) does not end up
     ;; in the closure of this module.
     (module-ref (resolve-interface '(gnu packages tex))
-                'texlive-bin))
+                'texlive-scripts))
 
   (with-store store
     (run-with-store store
       (mlet* %store-monad
-          ((drv (lower-object texlive-bin))
+          ((drv (lower-object texlive-scripts))
            (built (built-derivations (list drv))))
         (match (derivation->output-paths drv)
           (((names . items) ...)
-           (return (string-append (first items)
+           (return (string-append (second items) ;"out"
                                   "/share/tlpkg/texlive.tlpdb"))))))))
 
 (define tlpdb
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 30ac0d52e4..35208dd0c9 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1789,6 +1789,8 @@ MANIFEST."
            '()))))
   (define texlive-inputs
     (append-map entry->texlive-input (manifest-entries manifest)))
+  (define texlive-scripts
+    (module-ref (resolve-interface '(gnu packages tex)) 'texlive-scripts))
   (define texlive-bin
     (module-ref (resolve-interface '(gnu packages tex)) 'texlive-bin))
   (define coreutils
@@ -1823,8 +1825,10 @@ MANIFEST."
                                  ":"
                                  #$(file-append grep "/bin")
                                  ":"
-                                 #$(file-append sed "/bin")))
-          (setenv "PERL5LIB" #$(file-append texlive-bin "/share/tlpkg"))
+                                 #$(file-append sed "/bin")
+                                 ":"
+                                 #$(file-append texlive-bin "/bin")))
+          (setenv "PERL5LIB" #$(file-append texlive-scripts "/share/tlpkg"))
           (setenv "GUIX_TEXMF" "/tmp/texlive/share/texmf-dist")
 
           ;; Remove invalid maps from config file.
@@ -1834,7 +1838,7 @@ MANIFEST."
             (install-file #$(file-append updmap.cfg "/web2c/updmap.cfg") web2c)
             (make-file-writable updmap.cfg)
             (let* ((port (open-pipe* OPEN_WRITE
-                                     #$(file-append texlive-bin "/bin/updmap-sys")
+                                     #$(file-append texlive-scripts "/bin/updmap-sys")
                                      "--syncwithtrees"
                                      "--nohash"
                                      "--force"
@@ -1844,7 +1848,7 @@ MANIFEST."
                 (error "failed to filter updmap.cfg")))
 
             ;; Generate font maps.
-            (invoke #$(file-append texlive-bin "/bin/updmap-sys")
+            (invoke #$(file-append texlive-scripts "/bin/updmap-sys")
                     (string-append "--cnffile=" updmap.cfg)
                     (string-append "--dvipdfmxoutputdir="
                                    maproot "dvipdfmx/updmap")
@@ -1862,7 +1866,7 @@ MANIFEST."
             ;; to /tmp and run mktexlsr only once.
             (let ((a (string-append #$output "/share/texmf-dist"))
                   (b "/tmp/texlive/share/texmf-dist")
-                  (mktexlsr #$(file-append texlive-bin "/bin/mktexlsr")))
+                  (mktexlsr #$(file-append texlive-scripts "/bin/mktexlsr")))
               (copy-recursively a b)
               (invoke mktexlsr b)
               (install-file (string-append b "/ls-R") a))))))
-- 
cgit 1.4.1


From 7b45ead9ec40a5ea1ef8332d55c2bb4beff85eb5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 01:12:02 +0200
Subject: gnu: Update TeX Live packages to 2023.0 (rev 66594).

In addition to refreshing the hashes, updating includes removing spurious
propagated inputs, deprecating removed packages, adding missing dependencies,
and fixing build issues.

* guix/build-system/texlive.scm (%texlive-tag):
(%texlive-revision): Update to 2023.0 (rev 66594).
(%texlive-date): Remove unused variable.
* gnu/packages/tex.scm (texlive-hypdoc):
(texlive-lua-uni-algos):
(texlive-cyrillic-bin):
(texlive-epstopdf): New package.
(texlive-soulutf8): Deprecate variable.
(texlive-scripts):
(texlive-hyphen-complete):
(texlive-tex):
(texlive-latex):
(texlive-bidi):
(texlive-alphalph):
(texlive-docstrip):
(texlive-unicode-data):
(texlive-hopatch):
(texlive-hyphen-base):
(texlive-dvipdfmx):
(texlive-dvips):
(texlive-metafont):
(texlive-mfirstuc):
(texlive-mptopdf):
(texlive-fontinst):
(texlive-tex-gyre):
(texlive-lm):
(texlive-lwarp):
(texlive-mflogo-font):
(texlive-mfware):
(texlive-etex):
(texlive-hardwrap):
(texlive-kpathsea):
(texlive-kpfonts):
(texlive-latex-bin):
(texlive-atenddvi):
(texlive-attachfile):
(texlive-epstopdf-pkg):
(texlive-filehook):
(texlive-fancyvrb):
(texlive-gincltex):
(texlive-graphics-def):
(texlive-graphics):
(texlive-greek-fontenc):
(texlive-hycolor):
(texlive-xcolor):
(texlive-hyperref):
(texlive-pdftex):
(texlive-acronym):
(texlive-preview):
(texlive-ucs):
(texlive-varwidth):
(texlive-acmart):
(texlive-titlesec):
(texlive-metapost):
(texlive-dejavu):
(texlive-libertine):
(texlive-hyperxmp):
(texlive-oberdiek):
(texlive-rerunfilecheck):
(texlive-onedown):
(texlive-tools):
(texlive-l3kernel):
(texlive-l3backend):
(texlive-l3packages):
(texlive-fontspec):
(texlive-sansmathfonts):
(texlive-l3build):
(texlive-lualatex-math):
(texlive-lualibs):
(texlive-luatex):
(texlive-luatexbase):
(texlive-luahbtex):
(texlive-luaotfload):
(texlive-amsmath):
(texlive-manfnt-font):
(texlive-babel):
(texlive-csplain):
(texlive-babel-french):
(texlive-cyrillic):
(texlive-default-updmap.cfg):
(texlive-blindtext):
(texlive-environ):
(texlive-etoc):
(texlive-hanging):
(texlive-fira):
(texlive-firstaid):
(texlive-newfloat):
(texlive-newunicodechar):
(texlive-newverbs):
(texlive-seminar):
(texlive-stackengine):
(texlive-currfile):
(texlive-carlisle):
(texlive-geometry):
(texlive-makeindex):
(texlive-paralist):
(texlive-polyglossia):
(texlive-texinfo):
(texlive-textcase):
(texlive-bookmark):
(texlive-changebar):
(texlive-colortbl):
(texlive-fancyhdr):
(texlive-footmisc):
(texlive-lipsum):
(texlive-listings):
(texlive-kvoptions):
(texlive-incgraph):
(texlive-zref):
(texlive-enotez):
(texlive-pdfpages):
(texlive-stix2-otf):
(texlive-sidecap):
(texlive-stmaryrd):
(texlive-media9):
(texlive-ocgx2):
(texlive-needspace):
(texlive-changepage):
(texlive-pgf):
(texlive-koma-script):
(texlive-bitset):
(texlive-kvsetkeys):
(texlive-listofitems):
(texlive-readarray):
(texlive-examplep):
(texlive-xunicode):
(texlive-bibtex):
(texlive-context):
(texlive-beamer):
(texlive-xmpincl):
(texlive-ydoc):
(texlive-pstricks):
(texlive-iftex):
(texlive-tabu):
(texlive-xkeyval):
(texlive-standalone):
(texlive-siunitx):
(texlive-csquotes):
(texlive-logreq):
(texlive-biblatex):
(texlive-biblatex-apa):
(texlive-todonotes):
(texlive-microtype):
(texlive-minted):
(texlive-caption):
(texlive-symbol):
(texlive-fourier):
(texlive-cabin):
(texlive-newtx):
(texlive-xcharter):
(texlive-ly1):
(texlive-ifmtarg):
(texlive-ifoddpage):
(texlive-storebox):
(texlive-collectbox):
(texlive-collection-basic):
(texlive-adjustbox):
(texlive-tcolorbox):
(texlive-eurosym):
(texlive-translations):
(texlive-translator):
(texlive-textpos):
(texlive-unicode-math):
(texlive-xindy):
(texlive-floatflt):
(texlive-fvextra):
(texlive-was):
(texlive-lineno):
(texlive-babel-dutch):
(texlive-babel-polish):
(texlive-setspace):
(texlive-pdflscape):
(texlive-datetime2):
(texlive-tracklang):
(texlive-ragged2e):
(texlive-everysel):
(texlive-breqn):
(texlive-datatool):
(texlive-lastpage):
(texlive-xstring):
(texlive-xetex):
(texlive-soul):
(texlive-xstring):
(texlive-totcount):
(texlive-totpages):
(texlive-xdvi): Update to 2023.0.
---
 gnu/packages/tex.scm          | 1629 ++++++++++++++---------------------------
 guix/build-system/texlive.scm |    8 +-
 2 files changed, 548 insertions(+), 1089 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9e7e77b3e7..80d1d33be2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -176,7 +176,7 @@
                            "tlpkg/texlive.tlpdb"))
                     (revision %texlive-revision)))
               (sha256
-               "1igdbnp37c5ajdp17bmcdgkm5s2fyph5v9gk8svhwaamwazk7xg5")))
+               "191p4rznf19wl9sbjm61v143wap3izhsql6s1bpq1nnbf1p4bakq")))
     (outputs '("out" "doc"))
     (build-system copy-build-system)
     (arguments
@@ -272,7 +272,7 @@
                    "tex/generic/ukrhyph/"
                    "tex/luatex/hyph-utf8/")
              (base32
-              "1k7rsi1a74xqvbqr7a84fyqj38jan82sz6h8dcxkx5cg3wa43pji")))
+              "1vzv92jvmnnga1xz5vrv8i6cy0dvrrly5x9nfrfzshlkm9bi3g4c")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
@@ -706,7 +706,7 @@ This package contains the binaries.")
                    "doc/man/man1/tex.1"
                    "doc/man/man1/tex.man1.pdf")
              (base32
-              "0njmxc6l84j44k48qh7d79n3qznzriz2pf8lkj09i7mkkj9fw9lf")))
+              "1n4jybv4qghg74anpj7n7kj4l908f476q597vyvvq59fd9k5m7mm")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
@@ -741,7 +741,7 @@ it should not be processed without Knuth's direct permission.")
              (list "doc/latex/base/" "makeindex/latex/"
                    "source/latex/base/" "tex/latex/base/")
              (base32
-              "0k2b6qi281cl4zml6l537iyps1zwaq7pip81qq8vlkhb9h5ggpnw")))
+              "0yqxf70rzhzyrr5jrcqmqay9zhjz8f3qhcxak01g5cywdgvzfmpq")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
@@ -773,35 +773,21 @@ document formating commands extended by a wide range of packages.")
 (define-public texlive-bidi
   (package
     (name "texlive-bidi")
-    ;; Take the version from texlive-2022.0 as the one from texlive 2021.0 is
-    ;; buggy.
-    (version "36.4")
-    (source (origin
-              (method svn-multi-fetch)
-              (uri (svn-multi-reference
-                    (url (string-append "svn://www.tug.org/texlive/tags/"
-                                        "texlive-2022.0/Master/texmf-dist"))
-                    (locations (list "doc/xelatex/bidi/"
-                                     "source/xelatex/bidi/"
-                                     "tex/xelatex/bidi/"))
-                    (revision 62885)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1s2p6zp64q6nh8r8hrdx7bbpzj90sq51jbwslh6zj281yx9mv61s"))))
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/bidi/" "source/xelatex/bidi/"
+                   "tex/xelatex/bidi/")
+             (base32
+              "0zrmdgzbd8shzv1m1xvfqz515mwy5igkjwnnc4jrm1csbjf7jnj8")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-iftex
-           texlive-ltxcmds
-           texlive-hyperref
-           texlive-xkeyval
-           texlive-zref))
     (home-page "https://ctan.org/pkg/bidi")
     (synopsis "Bidirectional typesetting in plain TeX and LaTeX using XeTeX")
-    (description "The @code{bidi} package provides a convenient interface for
-typesetting bidirectional texts with plain TeX and LaTeX.  The package
-includes adaptations for use with many other commonly-used packages.")
+    (description
+     "The @code{bidi} package provides a convenient interface for typesetting
+bidirectional texts with plain TeX and LaTeX.  The package includes
+adaptations for use with many other commonly-used packages.")
     (license license:lppl1.3+)))
 
 (define-public texlive-libkpathsea
@@ -851,8 +837,6 @@ executables.  It is maintained as a part of TeX Live.")))
               "0ap59hmg0brg2wlh3bl77jxfxrk7hphhdal8cr05mby9bw35gffy")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-intcalc texlive-infwarerr))
     (home-page "https://ctan.org/pkg/alphalph")
     (synopsis "Convert numbers to letters")
     (description
@@ -871,7 +855,7 @@ a replacement for LaTeX's @code{\\@@alph} and @code{\\@@Alph} macros.")
              name version
              (list "/tex/latex/base/docstrip.tex")
              (base32
-              "1pxbqbia0727vg01xv8451szm55z2w8sb0vv3kf4iqx5ibb6m0d2")))
+              "04cwvqs8cx8l60lrwn60krpjg1ada7i8g5mh6cb6bxaz08yvx9i4")))
     (build-system texlive-build-system)
     (arguments
      (list #:texlive-latex-bin? #f))
@@ -913,7 +897,7 @@ affected).")
              (list "doc/generic/unicode-data/"
                    "tex/generic/unicode-data/")
              (base32
-              "1d41zvjsig7sqf2j2m89dnbv3gicpb16r04b4ikps4gabhbky83k")))
+              "13zff8fk0fwa1ab8wc5yfbay0022jkk1j9zq5azn6gzcxs9szm6q")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments (list #:texlive-latex-bin? #f))
@@ -941,11 +925,9 @@ out to date by @code{unicode-letters.tex}.")
              (list "doc/latex/hopatch/" "source/latex/hopatch/"
                    "tex/latex/hopatch/")
              (base32
-              "1yc9pzh8h4caaxii197jzd8wmvj754ymdq5x2hvmn171mxqp4d3v")))
+              "03hafzf0kpjhn5x392bziwyx0vf6fwcsy0xrn0c0jzn5cq5nqhap")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-ltxcmds))
     (home-page "https://ctan.org/pkg/hopatch")
     (synopsis "Load patches for packages")
     (description
@@ -972,7 +954,7 @@ until the package appears.")
                    "/tex/generic/hyphen/hypht1.tex"
                    "/tex/generic/hyphen/zerohyph.tex")
              (base32
-              "1nad1bqpjsywm49hlv7d75mqvgha3j5vayvkvfhv8wwzgdb3mk84")))
+              "0p3p12pm9gyrhr1zzvzazfmybhavqd9hdi77ygm3ygq8km7raq3h")))
     (build-system texlive-build-system)
     (arguments (list #:texlive-latex-bin? #f))
     (home-page "https://tug.org/texlive/")
@@ -1028,7 +1010,7 @@ and machine-readable files.")
                    "fonts/cmap/dvipdfmx/"
                    "fonts/map/dvipdfmx/")
              (base32
-              "16qvi1id9qb8l337kl182qkl1di7wf16qbjw5k67x38g3p18qqna")))
+              "0p6mlpymrhsalisfda0gbqg6b941fd164kcw0nc51pzc98aws1xz")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
@@ -1068,7 +1050,7 @@ does pdfTeX.")
                    "fonts/enc/dvips/base/"
                    "tex/generic/dvips/")
              (base32
-              "0l4rvnb0m5y9rqibrdlbg3dijdzixjdx0nf69qjncvng5694p48m")))
+              "0x11wx9p16z4nxhlbfqlgi5svnr96j1hnvdl9fpv1sr3n1j8m79g")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/dvips")
@@ -1118,7 +1100,7 @@ adapt the plain e-TeX source file to work with XeTeX and LuaTeX.")
                    "metafont/config/"
                    "metafont/misc/")
              (base32
-              "1zzab3b8h2xsp88jqjr64i7f0yiqzd9rmzyvpgbfpyhd4sdl4fk4")))
+              "18pp6vcg1cv38yi39q9rvkv6w11mnxxd79fvf1yy01743jn7ngjh")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
@@ -1171,11 +1153,9 @@ build fonts using the Metafont system.")
                    "source/latex/mfirstuc/"
                    "tex/latex/mfirstuc/")
              (base32
-              "033ymwwc6q0v6saq0x2jc20vc94d38hna0vb8cymj3d8irqy97x2")))
+              "1fvdnfybfi7nych97i117s6wqf0w8drgzpf3qzfns9qxjxm0bv3l")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etoolbox))
     (home-page "https://ctan.org/pkg/mfirstuc")
     (synopsis "Uppercase the first letter of a word")
     (description
@@ -1248,13 +1228,15 @@ information in the TFM file.")
                    "doc/man/man1/mptopdf.1"
                    "doc/man/man1/mptopdf.man1.pdf"
                    "scripts/context/perl/"
-                   "scripts/context/stubs/mswin/"
                    "tex/context/base/mkii/"
                    "tex/generic/context/mptopdf/")
              (base32
-              "0gbc6si5i7pgh37lnh5fpgnjs9180vz0nxpj6qkz8z2yb84ikq7l")))
+              "08z0hxq0645lf8jyl0wq3kwn1f7xsvj736sqgfin9ldd89zc2ch3")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts #~(list "mptopdf.pl")
+           #:create-formats #~(list "mptopdf")))
     (propagated-inputs (list texlive-plain))
     (home-page "https://ctan.org/pkg/mptopdf")
     (synopsis "mpost to PDF, native MetaPost graphics inclusion")
@@ -1277,7 +1259,6 @@ be used independently of the rest of ConTeXt.")
              (list "doc/fonts/fontinst/"
                    "doc/man/man1/fontinst.1"
                    "doc/man/man1/fontinst.man1.pdf"
-                   ;; Extract the sole script expected in the package.
                    "scripts/texlive-extra/fontinst.sh"
                    "source/fontinst/base/"
                    "tex/fontinst/base/"
@@ -1290,9 +1271,10 @@ be used independently of the rest of ConTeXt.")
                    "tex/fontinst/smblmtx/"
                    "tex/latex/fontinst/")
              (base32
-              "0fbfhjbp7gxbwsbybbb8gm4l6za17nrm2mx2i2xa66lmpqcjbgg7")))
+              "1qqggn44w07a0aslsf3jdygwv1gfs90qahkan0gnibxsz7i44kqm")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "fontinst.sh")))
     (home-page "https://ctan.org/pkg/fontinst")
     (synopsis "Tools for converting and installing fonts for TeX and LaTeX")
     (description
@@ -1559,10 +1541,9 @@ font from Adobe's basic set.")
                    "source/fonts/tex-gyre/"
                    "tex/latex/tex-gyre/")
              (base32
-              "0229aa7cgw614zlc2n589fi4hfdfnv7dd83f5mfa358zdb8iw54j")))
+              "0bn8g6rav0v47zbf1gjwp64x0l5340wb5iiiw4kdg69qingkj5lq")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs (list texlive-kvoptions))
     (home-page "https://ctan.org/pkg/tex-gyre")
     (synopsis "TeX fonts extending URW fonts")
     (description
@@ -1624,7 +1605,7 @@ in LuaTeX.  It is required by the @code{luatexbase} package which uses
                    "fonts/type1/public/lm/"
                    "tex/latex/lm/")
              (base32
-              "0yyk0dr4yms82mwy4dc03zf5igyhgcb65icdah042rk23rlpxygv")))
+              "1zgp0pc30n8jqr7kiv6j77i9i8dzzyh8zv72n24n74lb28k0sfmr")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments (list #:texlive-latex-bin? #f))
@@ -1671,11 +1652,10 @@ available from the @code{unicode-math} package.")
                    "source/latex/lwarp/"
                    "tex/latex/lwarp/")
              (base32
-              "0pv3gvy01zkhk39ybjix5lh3x6q4r9pvabrx1wvqr96ma8gyzr5n")))
+              "0r1hxihhd7yzhw4s3v9yn1wl36q6fs2cwbdc09z9c1mdz3pywzp6")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-minitoc))
+    (arguments (list #:link-scripts #~(list "lwarpmk.lua")))
     (home-page "https://ctan.org/pkg/lwarp")
     (synopsis "Converts LaTeX to HTML")
     (description
@@ -1807,9 +1787,9 @@ logos in LaTeX documents.")
     (home-page "https://ctan.org/pkg/mflogo-font")
     (synopsis "METAFONT logo font")
     (description
-     "These fonts were created in METAFONT by Knuth, for his own publications.
-At some stage, the letters P and S were added, so that the METAPOST logo could
-also be expressed.  The fonts were originally issued (of course) as METAFONT
+     "These fonts were created in Metafont by Knuth, for his own publications.
+At some stage, the letters P and S were added, so that the MetaPost logo could
+also be expressed.  The fonts were originally issued (of course) as Metafont
 source; they have since been autotraced and reissued in Adobe Type 1 format by
 Taco Hoekwater.")
     (license license:knuth)))
@@ -1836,7 +1816,7 @@ Taco Hoekwater.")
                    "doc/man/man1/pktype.man1.pdf"
                    "mft/base/")
              (base32
-              "0v8i6w5kinh11xm0vmgb75sxb4lxznf3l1j78dq6xh55a79330ha")))
+              "0l0xy2zl7yzb14wbzsg4sz5bdj22ggqlsw54d0yrm430wlr1s6sd")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/mfware")
@@ -1936,7 +1916,7 @@ features generation of clean UTF-8 patterns.")
                    "fonts/tfm/public/etex/"
                    "tex/plain/etex/")
              (base32
-              "17pvh7i9zw8qa5hr53kci7di64fqzx4j35gsn28s36b74x6xj4bc")))
+              "1q48645qgjcl2jmpd0x0ip5wwdan54y9vx06zyvpp51wia30sacy")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments (list #:texlive-latex-bin? #f))
@@ -2048,10 +2028,6 @@ rest of the mathematics produced by (AmS-)LaTeX.")
               "0ql3xml1ccll44q945n7w72p6d51y5wcrkawi7cg621gy5d6wzx5")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-ifplatform
-           texlive-iftex
-           texlive-pdftexcmds))
     (home-page "https://ctan.org/pkg/hardwrap")
     (synopsis "Hard wrap text to a certain character length")
     (description
@@ -2165,7 +2141,7 @@ replacement for the @code{inputenc} package.")
                    "web2c/texmf.cnf"
                    "web2c/viscii-t5.tcx")
              (base32
-              "0wfixvszpmri2j19wbg69fqw2iiqmn7blrbxhq17qddbwinm1dbq")))
+              "104kn06vmk7ljpz3sjnsr7r69p0i6nwad2v8gimdl2f38a53s5n3")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
@@ -2200,15 +2176,15 @@ package provides supporting files.")
     (source (texlive-origin
              name version
              (list "doc/fonts/kpfonts/"
+                   "fonts/afm/public/kpfonts/"
                    "fonts/enc/dvips/kpfonts/"
                    "fonts/map/dvips/kpfonts/"
                    "fonts/tfm/public/kpfonts/"
                    "fonts/type1/public/kpfonts/"
                    "fonts/vf/public/kpfonts/"
-                   "source/fonts/kpfonts/"
                    "tex/latex/kpfonts/")
              (base32
-              "0inai1p9bbjd5x790nsamakjaj0imvwv21mp9f98dwvdlj58vkqb")))
+              "0m5waxqrkm1i59i9vbn9ai9zjn7cl0f36iccwn2d73lhrqhbn16q")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/kpfonts")
@@ -2258,7 +2234,7 @@ formats.")
                    "doc/man/man1/pdflatex.1"
                    "doc/man/man1/pdflatex.man1.pdf")
              (base32
-              "1mkiqwq28lbw9iaisfza1xg9wss4zazx9i2szprqgjfkw5c0yipi")))
+              "1mhdc8a37b9j64kc8c8171s8p7ixklbf1ijr4vfh7af2k416qf8d")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
@@ -2309,8 +2285,6 @@ several packages that are considered as part of the LaTeX kernel.")
               "1fwa5233mdgvixhl2rzn9s06zz52j6ml7hfzd4194bn389n9syhk")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-atbegshi texlive-zref))
     (home-page "https://ctan.org/pkg/atenddvi")
     (synopsis "Provide the @code{\\AtEndDvi} command for older LaTeX format")
     (description
@@ -2337,10 +2311,6 @@ This is the main difference to @code{\\AtEndDocument}.")
               "0340c4rvxhhk95wlhf54n9akiwhj6pj0bslys6bkq29x9903zx5h")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics
-           texlive-hyperref
-           texlive-iftex))
     (home-page "https://ctan.org/pkg/attachfile")
     (synopsis "Attach arbitrary files to a PDF document")
     (description
@@ -2402,6 +2372,44 @@ the @file{.aux} file.")
 
 (define-deprecated-package texlive-latex-auxhook texlive-auxhook)
 
+(define-public texlive-epstopdf
+  (package
+    (name "texlive-epstopdf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/epstopdf.1"
+                   "doc/man/man1/epstopdf.man1.pdf"
+                   "doc/man/man1/repstopdf.1"
+                   "doc/man/man1/repstopdf.man1.pdf"
+                   "doc/support/epstopdf/"
+                   "scripts/epstopdf/")
+             (base32
+              "0r2dr8f8myc663hdzzrkaiddfqsmmf41xan9y6kd1n049hhw414l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:link-scripts #~(list "epstopdf.pl")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'set-gs-location
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((gs (search-input-file inputs "/bin/gs")))
+                (substitute* "scripts/epstopdf/epstopdf.pl"
+                  (("\"gs\"") (string-append "\"" gs "\"")))))))))
+    (home-page "https://ctan.org/pkg/epstopdf")
+    (synopsis "Convert EPS to PDF using Ghostscript")
+    (inputs (list ghostscript perl))
+    (description
+     "Epstopdf is a Perl script that converts an EPS file to an encapsulated
+PDF file (a single page file whose media box is the same as the original EPS's
+bounding box). The resulting file suitable for inclusion by pdfTeX as an
+image.  LaTeX users may make use of the @code{epstopdf} package, which will
+run the @code{epstopdf} script on the fly, thus giving the illusion that
+pdfLaTeX is accepting EPS graphic files.")
+    (license license:bsd-3)))
+
 (define-public texlive-epstopdf-pkg
   (package
     (name "texlive-epstopdf-pkg")
@@ -2415,11 +2423,6 @@ the @file{.aux} file.")
               "1ajyc5pkn1niifz5asyf09vbdqvmy05xwl0vxcdl7ik0ll0jcaxp")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-grfext
-           texlive-infwarerr
-           texlive-kvoptions
-           texlive-pdftexcmds))
     (home-page "https://www.ctan.org/pkg/epstopdf-pkg")
     (synopsis "Call @command{epstopdf} on the fly")
     (description
@@ -2463,18 +2466,13 @@ overwrite existing files and letting you use @code{filecontents}
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/filehook/"
-                   "source/latex/filehook/"
+             (list "doc/latex/filehook/" "source/latex/filehook/"
                    "tex/latex/filehook/")
              (base32
-              "03dsnv8fn111kn8h2fa281w2jvcdrqag1im6mkkfahvjgl1apk6k")))
+              "1zg9svjhrnh52fa04n3pnb0hrijp0lrr939dacf90cjjzwk36sfn")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (native-inputs
-     (list texlive-ydoc))
-    (propagated-inputs
-     (list texlive-kvoptions
-           texlive-pgf))
+    (native-inputs (list texlive-ydoc))
     (home-page "https://ctan.org/pkg/filehook")
     (synopsis "Hooks for input files")
     (description
@@ -2518,7 +2516,7 @@ users, via its Plain TeX version.)")
              name version
              (list "doc/latex/fancyvrb/" "tex/latex/fancyvrb/")
              (base32
-              "0c7y3hfhsvn3qipkq0g5zl9r6aa7bhjvrafxn0w29rpxgs3mc4jj")))
+              "18nif609wp9y9bc3jn3cz07ihphp95mqa4bfpgqlxsy3m57295s7")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/fancyvrb")
@@ -2546,9 +2544,6 @@ verbatim source).")
               "1x6bsf445dp8wc5hfgyywlal8vky5w23d69zlpybkp2d9am9a71p")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-adjustbox
-           texlive-svn-prov))
     (home-page "https://ctan.org/pkg/gincltex")
     (synopsis "Include TeX files as graphics")
     (description
@@ -2585,7 +2580,7 @@ Unicode points; it is maintained by Adobe.  The additional
              (list "doc/latex/graphics-def/"
                    "tex/latex/graphics-def/")
              (base32
-              "0b66fy06safyrd717rfr476g1gz6nqfv1vqvam7ac2yy0g0djb17")))
+              "1kp28k3shsiv0a051lp4fcqadac41c942hxwn506yps7h9y4jg23")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments (list #:texlive-latex-bin? #f))
@@ -2628,13 +2623,12 @@ set default \"driver\" options for the color and graphics packages.")
                    "source/latex/graphics/"
                    "tex/latex/graphics/")
              (base32
-              "0prw1zcv4fcj3zg0kyhj0k7ax0530adl60bajzvbv3fi16d7rqlq")))
+              "024hncahwc07yd2l94znv7v72sbykxdri5lpg3w4ip0nf10ywyma")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments (list #:texlive-latex-bin? #f))
     (native-inputs (list texlive-docstrip texlive-pdftex))
-    (propagated-inputs
-     (list texlive-graphics-def texlive-graphics-cfg))
+    (propagated-inputs (list texlive-graphics-def texlive-graphics-cfg))
     (home-page "https://ctan.org/macros/latex/required/graphics")
     (synopsis "The LaTeX standard graphics bundle")
     (description
@@ -2654,10 +2648,9 @@ documents.  It comprises the packages @code{color}, @code{graphics},
     (source (texlive-origin
              name version
              (list "doc/latex/greek-fontenc/"
-                   "source/latex/greek-fontenc/"
                    "tex/latex/greek-fontenc/")
              (base32
-              "1ncsvj5mlnkgllrvqdnbkv0qwpv2y7jkq3x2wdmm7d3daqq0ka5h")))
+              "1vary0vdrg77r55lf6gbfsqiyxqkbvrx1ijk71q3yl2v6adml4iv")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/greek-fontenc")
@@ -2679,8 +2672,6 @@ definition files for Greek text font encodings for use with @code{fontenc}.")
               "0hmkx37wwmznxjqqnca87shy7qrgqrh2cn5r941ddgivnym31xbh")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-hopatch))
     (home-page "https://ctan.org/pkg/hycolor")
     (synopsis "Colour for packages @code{hyperref} and @code{bookmark}")
     (description
@@ -2700,13 +2691,9 @@ for the user.")
              (list "doc/latex/xcolor/" "dvips/xcolor/"
                    "source/latex/xcolor/" "tex/latex/xcolor/")
              (base32
-              "1d7108b67fcaf1sgyk43ph18l0z5m35iqg3aahqs1ymzwdfnd3f7")))
+              "1sh0v60azjbl2fcmg4p77dqw052j59d9pg20saxvj4md32a345py")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-colortbl
-           texlive-hyperref
-           texlive-lwarp))
     (home-page "https://ctan.org/pkg/xcolor")
     (synopsis "Driver-independent color extensions for LaTeX and pdfLaTeX")
     (description
@@ -2799,17 +2786,15 @@ UTF-8 or a suitable 8-bit encoding.")
                    "source/latex/hyperref/"
                    "tex/latex/hyperref/")
              (base32
-              "052k1nygm4msaivn8245n86km4h41knivigw80q58b7rc13s6hrk")))
+              "034bdg1vy2yql4sq9i3i1ss1axh7apdyk5rz3s2ss8fydvvds726")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
      (list texlive-atbegshi
            texlive-auxhook
            texlive-bitset
-           texlive-cm
            texlive-etexcmds
            texlive-gettitlestring
-           texlive-graphics             ;for keyval
            texlive-hycolor
            texlive-intcalc
            texlive-kvdefinekeys
@@ -2838,6 +2823,26 @@ pdf and HTML backends.  The package is distributed with the @code{backref} and
 
 (define-deprecated-package texlive-latex-hyperref texlive-hyperref)
 
+(define-public texlive-hypdoc
+  (package
+    (name "texlive-hypdoc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hypdoc/" "source/latex/hypdoc/"
+                   "tex/latex/hypdoc/")
+             (base32
+              "14qg7q9r4cx132m2mr132ml0r49psfy99g6my4wir4yaw7y0x6pp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hypdoc")
+    (synopsis "Hyper extensions for @file{doc.sty}")
+    (description
+     "This package adds hypertext features to the package @code{doc} that is
+used in the documentation system of LaTeX2e.  Bookmarks are added and
+references are linked as far as possible.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-hyperxmp
   (package
     (name "texlive-hyperxmp")
@@ -2851,29 +2856,18 @@ pdf and HTML backends.  The package is distributed with the @code{backref} and
                    "source/latex/hyperxmp/"
                    "tex/latex/hyperxmp/")
              (base32
-              "177wx80mc6ipl0ciddnwgjjfg9vqv71y9ql0y69sviplyy533ng7")))
+              "0x2hif61a7bz1ymrc2qz0f9papfj2qx2w0smpihrcjxq73g9dm1b")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
      (list
+      #:link-scripts #~(list "hyperxmp-add-bytecount.pl")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'fix-build
             (lambda _
               (delete-file "source/latex/hyperxmp/hyperxmp-stds.tex"))))))
-    (propagated-inputs
-     (list texlive-atenddvi
-           texlive-etoolbox
-           texlive-hyperref
-           texlive-ifmtarg
-           texlive-iftex
-           texlive-intcalc
-           texlive-kvoptions
-           texlive-luacode
-           texlive-oberdiek             ;for ifdraft
-           texlive-pdfescape
-           texlive-stringenc
-           texlive-totpages))
+    (inputs (list perl))
     (home-page "https://ctan.org/pkg/hyperxmp")
     (synopsis "Embed XMP metadata within a LaTeX document")
     (description
@@ -2895,7 +2889,7 @@ is compatible with pdfLaTeX, XeLaTeX, LaTeX+dvipdfm, and LaTeX+dvips+ps2pdf.")
                    "source/latex/oberdiek/"
                    "tex/generic/oberdiek/" "tex/latex/oberdiek/")
              (base32
-              "00lp24fckawpy997j7zagsxv89jif40wgjq8fw502v06d225ikp3")))
+              "1fm6bcrxr4bw49h5hzrlas6ihaavshp6yjjvdjn869bl6hm6pmlz")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
@@ -2929,9 +2923,6 @@ arrows; record information about document class(es) used; and many more.")
               "1jv8hvkvq0yvc8mh68ybj8fvhf6kcdzwjin1czs45i26s0dpsngj")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-l3kernel
-           texlive-l3packages))
     (home-page "https://ctan.org/pkg/regexpatch")
     (synopsis "High level patching of commands")
     (description
@@ -2952,15 +2943,10 @@ experimental packages.")
                    "source/latex/rerunfilecheck/"
                    "tex/latex/rerunfilecheck/")
              (base32
-              "0f53b6dlnlrxkzj7h7x750p0489i2gg3isfqn0dlpncpq23w1r36")))
+              "0m3rvjgw0hg3n7db8hpyq55lq7py4scm35bqbawpc5mn5pmh2zg1")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-atveryend
-           texlive-infwarerr
-           texlive-kvoptions
-           texlive-pdftexcmds
-           texlive-uniquecounter))
+    (propagated-inputs (list texlive-atveryend texlive-uniquecounter))
     (home-page "https://www.ctan.org/pkg/rerunfilecheck")
     (synopsis "Checksum based rerun checks on auxiliary files")
     (description
@@ -2980,7 +2966,7 @@ have changed.  It is based on MD5 checksum, provided by pdfTeX.")
                    "source/latex/onedown/"
                    "tex/latex/onedown/")
              (base32
-              "04ih7i4v96ggwk4k1mpfx3dzcpi2siqablv93wryg7dk4cks5wkl")))
+              "00yh6nyzzy6d2sj1ha7dgfbsicy2ip1irn3il5jhc29sn3crfahx")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/onedown")
@@ -3005,7 +2991,7 @@ output of bridge terms.")
                    "source/latex/tools/"
                    "tex/latex/tools/")
              (base32
-              "0c0ixkcvrlzx6sdj25ak3bx0j65qghf51w66yg5wlnpg08d3awrs")))
+              "04zafcgdgiricq0l6lplfxa2qdspx5wbzpql5h7hw90lsdiw8awk")))
     (outputs '("out" "doc"))
     (arguments
      (list #:build-targets #~(list "tools.ins")))
@@ -3061,7 +3047,7 @@ of file names.")
                    "source/latex/l3kernel/"
                    "tex/latex/l3kernel/")
              (base32
-              "1y7wcb2643cfwda86f5zpbbw3hj01rji7r143ln77k8nr1919jj1")))
+              "1jbll1x3pdjpm1v70h7kpxgkjsw2mi2zbdilc7qvh251amn0hdbv")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
@@ -3069,10 +3055,8 @@ of file names.")
       #:tex-engine "tex"
       #:tex-format #f
       #:texlive-latex-bin? #f))
-    (native-inputs
-     (list texlive-docstrip))
-    (propagated-inputs
-     (list texlive-l3backend))
+    (native-inputs (list texlive-docstrip))
+    (propagated-inputs (list texlive-l3backend))
     (home-page "https://ctan.org/pkg/l3kernel")
     (synopsis "LaTeX3 programming conventions")
     (description
@@ -3096,16 +3080,14 @@ LaTeX3 conventions can be used with regular LaTeX2e packages.")
                    "source/latex/l3backend/"
                    "tex/latex/l3backend/")
              (base32
-              "18i6aczhj7pvqgdwfgkbmjz7a8xgd5w2jhibrv8khqlvxp62in94")))
+              "1pd2drks05k9w3fzgzg7vkj46plpw5z9r0zl43r1kzya9c4ldb38")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     (list
-      #:tex-engine "tex"
-      #:tex-format #f
-      #:texlive-latex-bin? #f))
-    (native-inputs
-     (list texlive-docstrip))
+     (list #:tex-engine "tex"
+           #:tex-format #f
+           #:texlive-latex-bin? #f))
+    (native-inputs (list texlive-docstrip))
     (home-page "https://ctan.org/pkg/l3backend")
     (synopsis "LaTeX3 backend drivers")
     (description
@@ -3137,24 +3119,21 @@ an independent schedule.")
                    "tex/latex/l3packages/xparse/"
                    "tex/latex/l3packages/xtemplate/")
              (base32
-              "1k9zms255qz6i24k74g7wnyrdvshl52jgb198pmg6mj9ajhw9sks")))
+              "0l7mfm8ziil59drqmb723n0wjbwdsx54iah051haxlbj7psqmbax")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     (list
-      #:build-targets
-      '(list "l3keys2e.ins"
-             "xparse.ins"
-             "xfrac.ins"
-             "xfp.ins"
-             "xtemplate.ins")
-      #:tex-engine "tex"
-      #:tex-format #f
-      #:texlive-latex-bin? #f))
-    (native-inputs
-     (list texlive-docstrip))
-    (propagated-inputs
-     (list texlive-l3kernel))
+     (list #:build-targets
+           '(list "l3keys2e.ins"
+                  "xparse.ins"
+                  "xfrac.ins"
+                  "xfp.ins"
+                  "xtemplate.ins")
+           #:tex-engine "tex"
+           #:tex-format #f
+           #:texlive-latex-bin? #f))
+    (native-inputs (list texlive-docstrip))
+    (propagated-inputs (list texlive-l3kernel))
     (home-page "https://ctan.org/pkg/l3packages")
     (synopsis "High-level LaTeX3 concepts")
     (description
@@ -3185,7 +3164,7 @@ a means of defining generic functions using a key-value syntax, and
                    "source/latex/fontspec/"
                    "tex/latex/fontspec/")
              (base32
-              "1k999jgdd4a9d20rywl53vzpvl3synqxik1fiskxwzlzibjlibv1")))
+              "0rh3x1h8glpmw0nmqv8lili3vf0zw2lcgffzk680c86k8jpjy4cm")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
@@ -3241,7 +3220,7 @@ default is a stub that just loads @code{graphicx}.")
                    "fonts/vf/public/sansmathfonts/"
                    "tex/latex/sansmathfonts/")
              (base32
-              "1l6q26590kdr2b24psdwgjw199p3sgk2hh74gq6fd6qircc1z3cy")))
+              "19349dxvqiinhsihn83yfhl6pgcvkd48l37w5jh59myx7sc6p8j6")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (native-inputs
@@ -3307,9 +3286,11 @@ file name may also be given explicitly as an optional argument.")
                    "source/latex/l3build/"
                    "tex/latex/l3build/")
              (base32
-              "0xxzy3xnq71z3sbkdq8glgnqydvr9g11ih2jmg68fmn5m145w8pi")))
+              "19iq80vj1glf35zcrspj1bnk6bf6yr3r3b2c5rgqhz58m2znsla0")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "l3build.lua")))
+    (propagated-inputs (list texlive-luatex))
     (home-page "https://ctan.org/pkg/l3build")
     (synopsis "Testing and building system for LaTeX")
     (description
@@ -3332,9 +3313,6 @@ a @file{.tex} file which provides the testing environment.")
               "1dwdiwsdfhgwpx8r2271i5kqphcpkh69y3rx1wxfr9hl17lzw2cp")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-bigfoot              ;for "perpage.sty"
-           texlive-etoolbox))
     (home-page "https://ctan.org/pkg/luabidi")
     (synopsis "Bidi functions for LuaTeX")
     (description
@@ -3355,9 +3333,6 @@ context of LuaTeX.")
               "1dyld5yb57p3j7wz591plbgjy7dk7ngn8cxw1lfmvx8iprgk1f8d")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-iftex
-           texlive-luatexbase))
     (home-page "https://ctan.org/pkg/luacode")
     (synopsis "Helper for executing Lua code from within TeX")
     (description
@@ -3378,7 +3353,7 @@ environments to help with these problems.")
                    "source/lualatex/lualatex-math/"
                    "tex/lualatex/lualatex-math/")
              (base32
-              "1xfr31rwr7zc6d5bsc3v5lwvcfrg109rzfgvvs69w4xs61j06jcg")))
+              "0rzzlq6a0c7sj1x83wqn5iwaiz3w9prcpz4lqbjlkgr7my4m052z")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
@@ -3403,7 +3378,7 @@ they are not directly related to Unicode mathematics typesetting.")
              (list "doc/luatex/lualibs/" "source/luatex/lualibs/"
                    "tex/luatex/lualibs/")
              (base32
-              "0gf60vj9y75a7dlrmpbyqgsa00s1717r6if3lm5ldm41i9fm8ywz")))
+              "0x53z6072z8qpp5fh2g9blz95zg20906k82jk6hz1hibv70is0pk")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments (list #:texlive-latex-bin? #f))
@@ -3444,7 +3419,7 @@ in the same way as BSD/GNU @code{getopt_long(3)} functions do.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/luatex/base/graphics/"
+             (list "doc/luatex/base/"
                    "doc/man/man1/dviluatex.1"
                    "doc/man/man1/dviluatex.man1.pdf"
                    "doc/man/man1/luatex.1"
@@ -3457,7 +3432,7 @@ in the same way as BSD/GNU @code{getopt_long(3)} functions do.")
                    "tex/generic/config/luatexiniconfig.tex"
                    "web2c/texmfcnf.lua")
              (base32
-              "1iskvy3i7kq0m39x7k8bs3w2l9bvqzcyzyfllfqr4rwpk4373k30")))
+              "14ad9qr5dn0796f8gqbry5axdm2mciibcgzva8kas1vrqs5a9f19")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
@@ -3498,8 +3473,7 @@ assumed.")
               "1nz2k9czqdmn08v75qa2bwanvcvyp9jmqcgwaxcy4fy4mpbrn8ra")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-ctablestack))
+    (propagated-inputs (list texlive-ctablestack))
     (home-page "https://ctan.org/pkg/luatexbase")
     (synopsis "Basic resource management for LuaTeX code")
     (description
@@ -3539,7 +3513,7 @@ upgrade smoothly to the new support structure.")
              (list "doc/man/man1/luahbtex.1"
                    "doc/man/man1/luahbtex.man1.pdf")
              (base32
-              "0w4hfjmjgiw42bpz1b59cla8v4s6kik54q6wdhmdjy6jp91rfl2i")))
+              "1hfawh7vig7jsmd1y0qlbn80x6770q56sqd9rx638js4p5a4di3l")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
@@ -3562,8 +3536,37 @@ upgrade smoothly to the new support structure.")
 shaping, instead of LuaTeX's built-in shaper.")
     (license (package-license texlive-luatex))))
 
-;; TODO: We should be able to build this from the sources on Github with
-;; texlive-l3build, but I haven't been able to get it to work.
+(define-public texlive-lua-uni-algos
+  (package
+    (name "texlive-lua-uni-algos")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/lua-uni-algos/"
+                   "tex/luatex/lua-uni-algos/")
+             (base32
+              "1dx70msqkj101mgj88b7fmb28bghlrrrcy5v66m74gqb5i41dnc2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:texlive-latex-bin? #f))
+    (home-page "https://ctan.org/pkg/lua-uni-algos")
+    (synopsis "Unicode algorithms for LuaTeX")
+    (description
+     "Lua code working with Unicode data has to deal with quite some
+challenges.  For example there are many canonically equivalent sequences which
+should be treated in the same way, and even identifying a single character
+becomes quite different once you have to deal with all kinds of combining
+characters, emoji sequences and syllables in different scripts.  Therefore
+@code{lua-uni-algos} wants to build a collection of small libraries
+implementing algorithms to deal with lots of the details in Unicode, such that
+authors of LuaTeX packages can focus on their actual functionality instead of
+having to fight against the peculiarities of Unicode.  Given that this package
+provides Lua modules, it is only useful in Lua(HB)TeX.  Additionally, it
+expects an up-to-date version of the unicode-data package to be present.  This
+package is intended for package authors only; no user-level functionality
+provided.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-luaotfload
   (package
     (name "texlive-luaotfload")
@@ -3579,11 +3582,17 @@ shaping, instead of LuaTeX's built-in shaper.")
                    "source/luatex/luaotfload/"
                    "tex/luatex/luaotfload/")
              (base32
-              "15xhnb4kyzmr11lj0md1d502cqrxyq6zdcq738z9394k6bas377f")))
+              "0x0vigy6g5sf9n5113p8w885qy9w72skay09p3x6p510lpzaafj5")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments (list #:texlive-latex-bin? #f))
-    (propagated-inputs (list texlive-lm texlive-lua-alt-getopt texlive-lualibs))
+    (arguments
+     (list #:texlive-latex-bin? #f
+           #:link-scripts #~(list "luaotfload-tool.lua")))
+    (propagated-inputs
+     (list texlive-lm
+           texlive-lua-alt-getopt
+           texlive-lua-uni-algos
+           texlive-lualibs))
     (home-page "https://ctan.org/pkg/luaotfload")
     (synopsis "OpenType font loader for LuaTeX")
     (description
@@ -3605,11 +3614,9 @@ loading fonts by their proper names instead of file names.")
              (list "doc/latex/amsmath/" "source/latex/amsmath/"
                    "tex/latex/amsmath/")
              (base32
-              "0kqrgc1kbrgkw9kflazi5imdj8r2fbj2q44x6may362a6izzk2jq")))
+              "1x97wjj664hvj73k2ffg7xmllaqm25ikjm8rcfjs2q920f5ixw2h")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-amsfonts))
     (home-page "https://www.ctan.org/pkg/amsmath")
     (synopsis "AMS mathematical facilities for LaTeX")
     (description
@@ -3661,7 +3668,7 @@ the Knuth's manual font, such as the Dangerous Bend and Manual-errata Arrow.")
     (home-page "https://ctan.org/pkg/manual")
     (synopsis "Knuth's manual fonts")
     (description
-     "This package provides METAFONT (by Donald Knuth) and Adobe Type 1 (by
+     "This package provides Metafont (by Donald Knuth) and Adobe Type 1 (by
 Taco Hoekwater) versions of the font containing the odd symbols Knuth uses in
 his books.  LaTeX support is available using the @code{manfnt} package.")
     (license license:knuth)))
@@ -3701,10 +3708,6 @@ commands.  The commands may also be used in plain TeX.")
               "1chy1rqwici66p9brphb3gsprmcyhia9cvm5fn9wb5a9cchxqa08")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-amsfonts
-           texlive-amsmath
-           texlive-url))
     (home-page "https://www.ctan.org/pkg/amscls")
     (synopsis "AMS document classes for LaTeX")
     (description
@@ -3727,7 +3730,7 @@ available as part of the AMS-LaTeX distribution.")
                    "source/latex/babel/"
                    "tex/generic/babel/")
              (base32
-              "00gl0b55hg912bmrqkpzn5rfyds7hcbsfwdlsmqishq5gjp6pnr0")))
+              "18q99xgga4448vk7wf5r5ry79sx5ymqx0zd7v7l1c4wyyiv4riw9")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
@@ -3850,7 +3853,7 @@ available.")
                    "tex/csplain/fonts/"
                    "tex/csplain/opmac/")
              (base32
-              "068g31l2ralz03gsv58j67dm85vy0ad58dvdkh93ws0yzf0rnr5f")))
+              "14z479gkiwgw17pdghrxh5q0rlxnij7ccj49kgf3macwgmh5lm0r")))
     (arguments
      (list #:create-formats #~(list "csplain" "luacsplain" "pdfcsplain")))
     (build-system texlive-build-system)
@@ -3917,7 +3920,7 @@ Canadian and USA text.")
                    "source/generic/babel-french/"
                    "tex/generic/babel-french/")
              (base32
-              "0cgn4dq5wnlfh9wddjzxsf7p56pk29lyndg56zg6558y7xf67cw8")))
+              "1p0gprdfvfincbkvqbc4bpyx6jf483k798hz5psg04rhmx5hi4wl")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/babel-french")
@@ -3973,6 +3976,41 @@ German.")
      "The package provides the language definition file for Swedish.")
     (license license:lppl1.3+)))
 
+(define-public texlive-cyrillic-bin
+  (package
+    (name "texlive-cyrillic-bin")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/rubibtex.1"
+                   "doc/man/man1/rubibtex.man1.pdf"
+                   "doc/man/man1/rumakeindex.1"
+                   "doc/man/man1/rumakeindex.man1.pdf"
+                   "scripts/texlive-extra/rubibtex.sh"
+                   "scripts/texlive-extra/rumakeindex.sh")
+             (base32
+              "09l5f7l91ph6sqfp2ia3yn23pa3s4cyfgyn020ncqvapg00s0mmg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:link-scripts #~(list "rubibtex.sh" "rumakeindex.sh")
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'patch-shell-scripts
+            (lambda _
+              (with-directory-excursion "scripts/texlive-extra/"
+                (with-fluids ((%default-port-encoding "ISO-8859-1"))
+                  (substitute* (list "rubibtex.sh" "rumakeindex.sh")
+                    (("\\b(basename|cat|mkdir|rm|sed)\\b" _ command)
+                     (which command))))))))))
+    (home-page "https://ctan.org/pkg/cyrillic-bin")
+    (synopsis "Cyrillic BibTeX and MakeIndex")
+    (description
+     "This package provides scripts for Cyrillic versions of BibTeX and
+MakeIndex.")
+    (license license:public-domain)))
+
 (define-public texlive-cyrillic
   (package
     (name "texlive-cyrillic")
@@ -3983,15 +4021,14 @@ German.")
                    "source/latex/cyrillic/"
                    "tex/latex/cyrillic/")
              (base32
-              "0a1dcpdgnzf08cd1b9ihdk4229aw19ar0f5sfjr44fqqwkav3l5i")))
+              "08v670f7s74klnac7pzqsad9m4jsxfkckzkswxb94xxd61kanzdx")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     (list
-      #:tex-engine "tex"
-      #:tex-format #f))
-    (native-inputs
-     (list texlive-docstrip))
+     (list #:tex-engine "tex"
+           #:tex-format #f))
+    (native-inputs (list texlive-docstrip))
+    (propagated-inputs (list texlive-cyrillic-bin))
     (home-page "https://ctan.org/pkg/cyrillic")
     (synopsis "Support for Cyrillic fonts in LaTeX")
     (description
@@ -4013,17 +4050,6 @@ language that is written in a Cyrillic alphabet.")
              (base32
               "1h49v6sqbm27isfwwcql9dzxn4vmcn2algkqh7f1pzj860xw3ygn")))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-amsfonts
-           texlive-graphics
-           texlive-hyperref
-           texlive-marvosym
-           texlive-psnfss
-           texlive-tipa
-           texlive-times
-           texlive-tools
-           texlive-ulem
-           texlive-url))
     (home-page "https://ctan.org/pkg/passivetex")
     (synopsis "Support package for XML/SGML typesetting")
     (description
@@ -4045,8 +4071,6 @@ Unicode entities, and common formatting object definitions for JadeTeX.")
               "0pazv1khsgjhxc673qrhjrbzlkgmcj53qccb9hw7ygdajxrjc2ba")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics))
     (home-page "https://ctan.org/pkg/pict2e")
     (synopsis "New implementation of @code{picture} commands")
     (description
@@ -4099,7 +4123,7 @@ part of the LaTeX required set of packages.")
    "updmap.cfg" (number->string %texlive-revision)
    (list "web2c/updmap.cfg")
    (base32
-    "1bb9nmvr14f3lam627mq030hh08h7wsy8i6884q2kvppbpf2a3mf")))
+    "10b9il84x6vwfns7cvf8jv0bfcjr7icph3mhci9cq088v216k3kb")))
 
 (define-public texlive-updmap.cfg
   (lambda* (#:optional (packages '()))
@@ -4229,8 +4253,6 @@ T3, and the set of addendum symbols as encoding TS3.  Times-like Adobe Type
               "12la66vz5ic6jc1cy96b2zh2fxsbaii9kbs4wrz1ii8v508wdkhv")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-hyperref texlive-url))
     (home-page "https://ctan.org/pkg/amsrefs")
     (synopsis "LaTeX-based replacement for BibTeX")
     (description
@@ -4255,8 +4277,6 @@ either in conjunction with BibTeX or as a replacement for BibTeX.")
               "140b4bbjcgajd1flznmi3ga6lx5pna2nxybr2dqm9515lny8gwf0")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etex texlive-ncctools))
     (home-page "https://ctan.org/pkg/bigfoot")
     (synopsis "Footnotes for critical editions")
     (description
@@ -4286,10 +4306,8 @@ packages.")
               "1gakawih3mzm5jh01kb44sjpsa4r8c3zwzig5bac37g4ha2vqska")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-tools))
     (home-page "https://ctan.org/pkg/blindtext")
-    (synopsis "Producing 'blind' text for testing")
+    (synopsis "Producing blind text for testing")
     (description
      "The package provides the commands @code{\\blindtext} and
 @code{\\Blindtext} for creating \"blind\" text useful in testing new classes
@@ -4355,8 +4373,6 @@ package.")
               "04l3gqiq0bhzbz8zxr7428fap2x1skkaq5ppbambc4lk8c7iw6da")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-everypage texlive-graphics texlive-kvoptions))
     (home-page "https://ctan.org/pkg/draftwatermark")
     (synopsis "Put a grey textual watermark on document pages")
     (description
@@ -4403,7 +4419,7 @@ example, translation of multibyte sequences, such as utf-8 encoding.")
     (build-system texlive-build-system)
     (propagated-inputs (list texlive-trimspaces))
     (home-page "https://ctan.org/pkg/environ")
-    (synopsis "A new interface for environments in LaTeX")
+    (synopsis "New interface for environments in LaTeX")
     (description
      "This package provides the @code{\\collect@@body} command (as in
 @code{amsmath}), as well as a @code{\\long} version @code{\\Collect@@Body},
@@ -4426,8 +4442,6 @@ define a new author interface to creating new environments.")
               "16c5dyd4bz45a2c1ppbq05h9ixg15srk5az5pld5gpv4j0zwzrqw")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-environ texlive-tools))
     (home-page "https://ctan.org/pkg/eqparbox")
     (synopsis "Create equal-widthed parboxes")
     (description
@@ -4451,11 +4465,10 @@ also provided.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/etoc/"
-                   "source/latex/etoc/"
+             (list "doc/latex/etoc/" "source/latex/etoc/"
                    "tex/latex/etoc/")
              (base32
-              "04vjfn4jadxbc38r08r9pwvpj7szvk88hiav35iqhl3p78xri7z4")))
+              "02xa9091vgz5gdzbsc202mzd4lalvvkh3b7slnzppx827sqbq917")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/etoc")
@@ -4472,8 +4485,7 @@ LaTeX document classes, but the package can also allow the user to delegate
 the details to packages dealing with list making environments (such as
 @code{enumitem}).  The package's default global style typesets tables of
 contents in a multi-column format, with either a standard heading, or a ruled
-title
-(optionally with a frame around the table).
+title (optionally with a frame around the table).
 
 The @code{\\tableofcontents} command may be used arbitrarily many times in the
 same document, while @code{\\localtableofcontents} provides a local table of
@@ -4519,8 +4531,6 @@ remain in sequence).")
               "1snsj7kblkj1ig3x3845lsypz7ab04lf0dcpdh946xakgjnz4fb5")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-pdftexcmds))
     (home-page "https://www.ctan.org/pkg/filemod")
     (synopsis "Provide file modification times, and compare them")
     (description
@@ -4567,11 +4577,10 @@ in sequence with single column floats like figure.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/hanging"
-                   "source/latex/hanging"
+             (list "doc/latex/hanging/" "source/latex/hanging/"
                    "tex/latex/hanging/")
              (base32
-              "1d9kr163vn9sm9p9dyppnnffdcdjlgrm7848d97s678hdb9cp962")))
+              "18ichpmmghz0nmv6m646r64y5jvyp52qz9hj7hadrf34xj1ijmlk")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://www.ctan.org/pkg/hanging")
@@ -4599,15 +4608,9 @@ by making punctuation characters active.")
                    "fonts/vf/public/fira/"
                    "tex/latex/fira/")
              (base32
-              "1v3688hziqz4jywfysiv19vsdzfkknrf83zfbi7lhiqpgkpsfsm2")))
+              "19sb6c1h1crhs1597i3nlvr2ahl20hxj7a1a5xkpfr5vj4n3x5kv")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-fontaxes
-           texlive-fontspec
-           texlive-iftex
-           texlive-mweights
-           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/fira")
     (synopsis "Fira fonts with LaTeX support")
     (description
@@ -4627,7 +4630,7 @@ corresponding italics: light, regular, medium, bold, ...")
              (list "doc/latex/firstaid/" "source/latex/firstaid/"
                    "tex/latex/firstaid/")
              (base32
-              "1ahn47kz8a2qdmzdfdgjanf6h5bn8f2rzp1zvwgjpk1plcix8k90")))
+              "1gpbl3l77mrrf88iqcnfvcgxwraqm2rsvisnngak9fbwbinc489v")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments (list #:texlive-latex-bin? #f))
@@ -4656,11 +4659,6 @@ meant to be loaded during format generation and not by the user.")
               "1llas0xwq3y9nk7gblg40l99cgmkl9r7rbfazrhpnbaz5cshl8pl")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-catchfile
-           texlive-iftex
-           texlive-pdftexcmds
-           texlive-tools))
     (home-page "https://ctan.org/pkg/ifplatform")
     (synopsis "Conditionals to test which platform is being used")
     (description
@@ -4707,15 +4705,12 @@ compatible with @code{natbib}.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/newfloat/"
-                   "source/latex/newfloat/"
+             (list "doc/latex/newfloat/" "source/latex/newfloat/"
                    "tex/latex/newfloat/")
              (base32
               "1hrackdfrzad8cgbl3f3yaagk4p4zjbvq710rm8b1z02fr9z2zkq")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics))
     (home-page "https://ctan.org/pkg/newfloat")
     (synopsis "Define new floating environments")
     (description
@@ -4732,10 +4727,11 @@ the LaTeX standard foating environments @code{figure} and @code{table}.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/newunicodechar/" "source/latex/newunicodechar"
+             (list "doc/latex/newunicodechar/"
+                   "source/latex/newunicodechar/"
                    "tex/latex/newunicodechar/")
              (base32
-              "0mybqah1n9vmxvi6f587jlxbn7pv3624qw83psq5vwfnddw3n70y")))
+              "1b3n5mdfw9csp0ri1vw4jh1ibnpsllb5n6pwfkg1jad10ml9wavz")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://www.ctan.org/pkg/newunicodechar")
@@ -4757,11 +4753,31 @@ Unicode option of @code{inputenc} or @code{inputenx}, or by XeLaTeX/LuaLaTeX.")
              (list "doc/latex/newverbs/" "source/latex/newverbs/"
                    "tex/latex/newverbs/")
              (base32
-              "1m3afrpyc75g5gdxfknad565r5jgmwks98skkqycm66i92ky9dqr")))
+              "02mhqgsfd13i1llhm0rgq3f9qs067jih2s15q1zvsfd5bhzls1pq")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'copy-ydocstrip.tex
+            ;; There's a circular dependency between `newverbs' (where `ydoc'
+            ;; should be a native input) and `ydoc' (where `newverbs' is
+            ;; a propagated input).  To work around this, install the specific
+            ;; "ydocstrip.tex" file from `ydoc' 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/ydoc/ydocstrip.tex")
+                            "build/")
+              (setenv "TEXINPUTS" (string-append (getcwd) "/build:")))))))
     (native-inputs
-     (list texlive-ydoc))
+     (list
+      (texlive-origin
+       "ydocstrip.tex" (number->string %texlive-revision)
+       (list "tex/generic/ydoc/ydocstrip.tex")
+       (base32
+        "1nixgvmw8c6jznhxys3yfzr3qw1lci8kyx54rs0shm6i63xjgr9i"))))
     (home-page "https://ctan.org/pkg/newverbs")
     (synopsis "Define new versions of @code{\\verb}")
     (description
@@ -4788,8 +4804,6 @@ used to write the verbatim text to a file.")
               "0gad1vi0r5xw7gyj1cb2cp58j4dqrw4awcfxmfrna9xbz91g4sn9")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-iftex texlive-infwarerr texlive-ltxcmds))
     (home-page "https://www.ctan.org/pkg/pdftexcmds")
     (synopsis "LuaTeX support for pdfTeX utility functions")
     (description
@@ -4813,8 +4827,6 @@ available for LuaTeX by reimplementing them using Lua.")
               "06vp5x6rnl4gqwxzzynbl169q23k8pmaxjhb0lbzdcm3ihvzp47z")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics))
     (home-page "https://ctan.org/pkg/psfrag")
     (synopsis "Replace strings in encapsulated PostScript figures")
     (description
@@ -4840,17 +4852,6 @@ rotated.")
               "12clzcw2cl7g2chr2phgmmiwxw4859cln1gbx1wgp8bl9iw590nc")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-bigfoot              ; for suffix
-           texlive-filemod
-           texlive-graphics
-           texlive-ifplatform
-           texlive-l3kernel             ; for expl3
-           texlive-oberdiek
-           texlive-psfrag
-           texlive-tools                ; for shellesc
-           texlive-trimspaces
-           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/pstool")
     (synopsis "Support for @code{psfrag} within pdfLaTeX")
     (description
@@ -4874,8 +4875,6 @@ re-processing.")
               "128cvwdl4wcdshvs59yn5iljdxxdrc5jircbxav77y7kc3l33z7z")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-infwarerr texlive-ltxcmds))
     (home-page "https://www.ctan.org/pkg/refcount")
     (synopsis "Counter operations with label references")
     (description
@@ -4900,10 +4899,6 @@ corresponding thing with the page reference of the label.")
               "0x8l98r6xzyi4lc909bv7ii2nbpff8j7j3q4z86l7rrjk1jkx9qi")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-kvoptions
-           texlive-kvsetkeys
-           texlive-stringenc))
     (home-page "https://ctan.org/pkg/selinput")
     (synopsis "Semi-automatic detection of input encoding")
     (description
@@ -4949,13 +4944,9 @@ Adobe Type 1 formats.")
              name version
              (list "doc/latex/seminar/" "tex/latex/seminar/")
              (base32
-              "1clgw5xy867khzfn8d210rc5hsw5s7r0pznhk84niybvw4zc7r3f")))
+              "1xm78f9qsy3zr1vllb8mgp1azhn7a2jaqkj2lkrsgc3m7ag9w9hh")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-geometry
-           texlive-hyperref
-           texlive-pstricks))
     (home-page "https://ctan.org/pkg/seminar")
     (synopsis "Make overhead slides")
     (description
@@ -5007,13 +4998,6 @@ user may consider the @code{dnaseq} as a rather more powerful alternative.")
               "0vff1yk7a3f4csxibfk6r37s3h6n4wdpnk3qj4dsx7kh5zrcysha")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-attachfile
-           texlive-float
-           texlive-graphics
-           texlive-listings
-           texlive-refcount
-           texlive-varwidth))
     (home-page "https://ctan.org/pkg/showexpl")
     (synopsis "Typesetting LaTeX source code")
     (description
@@ -5030,12 +5014,10 @@ result in the same document.")
              (list "doc/latex/stackengine/"
                    "tex/latex/stackengine/")
              (base32
-              "1rbw3dmb6kl3wlnpxacr8cmp2ivac1kpnb33k7r5s3lp1q59ck38")))
+              "0c12ygqxdb6vn1y03jzcjpmdp53r076hq3hgjzwy2ch1dw81cnpd")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etoolbox
-           texlive-listofitems))
+    (propagated-inputs (list texlive-listofitems))
     (home-page "https://ctan.org/pkg/stackengine")
     (synopsis "Customised stacking of objects")
     (description
@@ -5092,8 +5074,6 @@ create new @samp{List of ...}.  The ToC @code{\\parskip} may be changed.")
               ;; The "ins" file refers to the wrong source file.
               (substitute* "source/latex/trimspaces/trimspaces.ins"
                 (("pstool\\.tex") "trimspaces.tex")))))))
-    (propagated-inputs
-     (list texlive-filecontents))
     (home-page "https://ctan.org/pkg/trimspaces")
     (synopsis "Trim spaces around an argument or within a macro")
     (description
@@ -5114,14 +5094,10 @@ definition, or to define space-stripped macros.")
              (list "doc/latex/currfile/" "source/latex/currfile/"
                    "tex/latex/currfile/")
              (base32
-              "1l9win5msf80yzgzfx580d1hw8lza1advhqkhpz83i080020asji")))
+              "0g28y2bwqnc3xfcp0ak7rxx0c40b88vl85pj7x5dccmvx0yrxy9n")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (native-inputs
-     (list texlive-ydoc))
-    (propagated-inputs
-     (list texlive-filehook
-           texlive-kvoptions))
+    (native-inputs (list texlive-ydoc))
     (home-page "https://ctan.org/pkg/currfile")
     (synopsis "Provide file name and path of input files")
     (description
@@ -5183,12 +5159,9 @@ to something that's not a float.")
              (list "doc/latex/carlisle/" "source/latex/carlisle/"
                    "tex/latex/carlisle/")
              (base32
-              "139k4n8dv6pbal1mx4m8b239x3i9cw61f6digk9mxscbxwvxfngb")))
+              "0kgbs8k6ma3kng2srwpzkla1c51ylzgb7yn8bib2zy46rmysrk86")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics
-           texlive-tools))
     (home-page "https://ctan.org/pkg/carlisle")
     (synopsis "David Carlisle's small packages")
     (description
@@ -5212,10 +5185,6 @@ for physicists.")
               "1dpxy64hs0bjp8d2dmikflc995vazf7fi6z92w51fnj2fidgl8gx")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etexcmds
-           texlive-infwarerr
-           texlive-ltxcmds))
     (home-page "https://ctan.org/macros/latex/contrib/catchfile")
     (synopsis "Catch an external file into a macro")
     (description
@@ -5233,14 +5202,6 @@ for physicists.")
               "1p02ai76nnh6042pnmqv4n30z6yxsvyyk2nb9jk7xlyyc87zzbdd")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etoolbox
-           texlive-hyperref
-           texlive-l3packages
-           texlive-listings
-           texlive-pgf
-           texlive-tools
-           texlive-xstring))
     (home-page "https://ctan.org/pkg/ddphonism")
     (synopsis "Dodecaphonic diagrams for LaTeX")
     (description
@@ -5261,8 +5222,6 @@ sequence, of variable length.")
               "18z9922lqb3hliqn95h883fndqs4lgyi5yqbnq2932ya0imc3j7h")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-hyperref))
     (home-page "https://ctan.org/pkg/doi")
     (synopsis "Create correct hyperlinks for DOI numbers")
     (description
@@ -5288,8 +5247,6 @@ hyperlink to the target of the DOI.")
               "070iaj540rglf0c80l0hjkwg6aa7qyskhh4iwyhf7n8vrg5cjjab")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etex))
     (home-page "https://ctan.org/pkg/etoolbox")
     (synopsis "e-TeX tools for LaTeX")
     (description
@@ -5316,8 +5273,6 @@ of the LaTeX kernel.")
               "1javlws18ncrf7rz7qfbx1db9jwk45lm6sa0s67hlr6hqnyjxf94")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics))
     (home-page "https://ctan.org/pkg/fncychap")
     (synopsis "Seven predefined chapter heading styles")
     (description
@@ -5370,10 +5325,6 @@ course of the framed/shaded matter.  There is also a command
               "0sicgf3wjw5jymh5xjxby2hsilakhw2lqgywx0f2zax1z854xc2m")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-babel
-           texlive-eurosym
-           texlive-marvosym))
     (home-page "https://www.ctan.org/pkg/g-brief")
     (synopsis "Letter document class")
     (description
@@ -5398,8 +5349,6 @@ and a new version of @code{g-brief}.")
               "1324nw1r1aj6khz6fvrhd1p1sinadrd83j0s2q2fhnsgwp6sw94f")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics))
     (home-page "https://www.ctan.org/pkg/galois")
     (synopsis "Typeset Galois connections")
     (description
@@ -5422,8 +5371,6 @@ in colour.")
               "0yb7sid13bx25yar3aw6pbf4jmmfi0gdmcd7ynf5hjh9qdfb3zyh")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-biblatex))
     (home-page "https://www.ctan.org/pkg/gcite")
     (synopsis "Citations in a reader-friendly style")
     (description
@@ -5450,10 +5397,7 @@ BibLaTeX, and is considered experimental.")
               "09jwdrg4s1c0gqmx7s57byw5kc09cna3li85y9ix0vxa6f6iqzi1")))
     (build-system texlive-build-system)
     (outputs '("out" "doc"))
-    (propagated-inputs
-     (list texlive-atbegshi
-           texlive-graphics             ;for keyval
-           texlive-iftex))
+    (propagated-inputs (list texlive-graphics texlive-iftex))
     (home-page "https://www.ctan.org/pkg/geometry")
     (synopsis "Flexible and complete interface to document dimensions")
     (description
@@ -5533,7 +5477,7 @@ always (re)defines a command.  There is also @code{\\makeenvironment} and
                    "makeindex/base/"
                    "tex/plain/makeindex/")
              (base32
-              "197zgsrca14paavzknjx2q4ayl0lrma0z8q78ir6536s9xwn0w33")))
+              "0m01m0x1kf10yvzxgrkvpic0amsr0g6q2r2wsg5f4ngybq4y9gyi")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/makeindexk")
@@ -5580,10 +5524,6 @@ output routine.")
               "1xzy982kc7k5n7gy019rk4hbvxli2mlf4s7h7s11diasmh5fa2gf")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-fontspec
-           texlive-graphics
-           texlive-iftex))
     (home-page "https://ctan.org/pkg/metalogo")
     (synopsis "Extended TeX logo macros")
     (description
@@ -5606,11 +5546,11 @@ XeLaTeX users.")
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/paralist")
     (synopsis "@code{enumerate} and @code{itemize} within paragraphs")
-    (description "The @code{paralist} package provides @code{enumerate} and
-@code{itemize} environments that can be used within paragraphs to format the
-items either as running text or as separate paragraphs with a preceding number
-or symbol.  It also provides compacted versions of @code{enumerate} and
-@code{itemize}.")
+    (description
+     "The @code{paralist} package provides @code{enumerate} and @code{itemize}
+environments that can be used within paragraphs to format the items either as
+running text or as separate paragraphs with a preceding number or symbol.  It
+also provides compacted versions of @code{enumerate} and @code{itemize}.")
     (license license:lppl1.0+)))
 
 (define-public texlive-polyglossia
@@ -5624,7 +5564,7 @@ or symbol.  It also provides compacted versions of @code{enumerate} and
                    "source/latex/polyglossia/"
                    "tex/latex/polyglossia/")
              (base32
-              "1lkf06mr7p7p1fdkrnhmvj8iamzppjy952d79mc81cilkw5zskah")))
+              "15rqqf0yb09qcs6ibsrkg5jbpzicxkpbj211p6qkfl2fcrc1gndv")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
@@ -5634,11 +5574,15 @@ or symbol.  It also provides compacted versions of @code{enumerate} and
       #~(modify-phases %standard-phases
           (add-after 'unpack 'substitute-fonts
             (lambda _
+              ;; Use dummy fonts for documentation.  We will install
+              ;; pre-generated one anyway. Moreover, adding appropriate fonts
+              ;; would bring in some large dependencies, such as webkitgtk for
+              ;; Amiri.
               (substitute* "source/latex/polyglossia/polyglossia.dtx"
-                (("\\{Serto Jerusalem}") "{FreeSans}") ;non-free
-                ;; XXX: Amiri font would introduce a (native) dependency on
-                ;; webkitgtk!  No, thanks.
-                (("\\{Amiri}") "{FreeSans}"))))
+                (("\\{Serto Jerusalem}") "{FreeSans}")
+                (("\\{Amiri-Regular}") "{FreeSans}")
+                (("\\{Noto Serif CJK SC}") "{FreeSans}")
+                (("\\{GFSPolyglot.otf}") "{FreeSans}"))))
           (add-after 'unpack 'extend-texmf
             (lambda _
               ;; Extend the current TEXMF environment variable to make
@@ -5648,7 +5592,6 @@ or symbol.  It also provides compacted versions of @code{enumerate} and
                                      (getenv "GUIX_TEXMF"))))))))
     (native-inputs
      (list font-dejavu
-           font-gfs-ambrosia
            font-gnu-freefont
            font-linuxlibertine
            font-sil-ezra
@@ -5661,10 +5604,19 @@ or symbol.  It also provides compacted versions of @code{enumerate} and
            texlive-fancyvrb
            texlive-graphics
            texlive-hyperref
+           texlive-infwarerr
+           texlive-kvoptions
            texlive-latex-fonts
+           texlive-libertine
            texlive-metalogo
            texlive-microtype
-           texlive-paralist))
+           texlive-paralist
+           texlive-pdftexcmds
+           texlive-tex
+           texlive-tools
+           texlive-xcolor
+           texlive-xetex
+           texlive-zref))
     (propagated-inputs
      (list texlive-etoolbox
            texlive-filehook
@@ -5738,7 +5690,7 @@ a few situations where longtable has problems.")
              name version
              (list "tex/texinfo/")
              (base32
-              "0wbbhjr1jqiicnssiy6n5s4v5p6axhlilpkfhix4kavbj8mb6mfn")))
+              "1wdrqwksbhxxx275mzhcr3mc67f76nbflplqs4y1xx67iw724dmx")))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/texinfo")
     (synopsis "Texinfo documentation system")
@@ -5761,7 +5713,7 @@ hypertext linkages in some cases).")
              (list "doc/latex/textcase/" "source/latex/textcase/"
                    "tex/latex/textcase/")
              (base32
-              "185fibd41wd0v51gnai29ygi32snkk00p00110kcnk1bcnmpiw82")))
+              "15jb7r1p7vjm1i02lf5c9g5i7fcgkc7a6b59jhyzzk2l7ch41d7f")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/textcase")
@@ -5871,13 +5823,7 @@ be used, for example, for per chapter/section appendices.  An
               "111sjwabcbr8ry8fh94ywpzska032y8r4iz4waxa4kf5l3k0p4bs")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list #:build-targets #~(list "bookmark.dtx")))
-    (propagated-inputs
-     (list texlive-atenddvi
-           texlive-atveryend
-           texlive-auxhook
-           texlive-hyperref))
+    (arguments (list #:build-targets #~(list "bookmark.dtx")))
     (home-page "https://www.ctan.org/pkg/bookmark")
     (synopsis "Bookmark (outline) organization for @code{hyperref}")
     (description
@@ -5898,7 +5844,7 @@ action types are available (URI, GoToR, Named).")
                    "source/latex/changebar/"
                    "tex/latex/changebar/")
              (base32
-              "0y32inrdpki6v3dwyymfglf78wbfd29b6xa8vjn337dr4gxlma85")))
+              "0k6r3f6xqbl5gr3i2kwh82lkbwk76gwyfvj7nsvzi1awjk84hqd2")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://www.ctan.org/pkg/changebar")
@@ -5960,16 +5906,12 @@ LaTeX packages to access them.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/colortbl/"
-                   "source/latex/colortbl/"
+             (list "doc/latex/colortbl/" "source/latex/colortbl/"
                    "tex/latex/colortbl/")
              (base32
-              "0fb4a5l3yqk6l5gr0hlkqwpy004wi8zymyicdzjyhqwcib4jnzjs")))
+              "17hslagzpbi5jq08sjinrc3cv65m8g667mb2zlq89fq5ix9808vx")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics
-           texlive-tools))
     (home-page "https://ctan.org/pkg/colortbl")
     (synopsis "Add colour to LaTeX tables")
     (description
@@ -6011,7 +5953,7 @@ floats, center, flushleft, and flushright, lists, and pages.")
              (list "doc/latex/fancyhdr/" "source/latex/fancyhdr/"
                    "tex/latex/fancyhdr/")
              (base32
-              "15fainwxs22gg4xhwsv1vmjgdhg34dbkir26nnk4pb6jprpwb83f")))
+              "0asx5l8kx1zsvja5arnbspr37hwmmjp01837kfrsy7dsm8wfclgr")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/fancyhdr")
@@ -6055,11 +5997,10 @@ modifier option of the obsolete @code{here} package.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/footmisc/"
-                   "source/latex/footmisc/"
+             (list "doc/latex/footmisc/" "source/latex/footmisc/"
                    "tex/latex/footmisc/")
              (base32
-              "1v1hkf0xcq6hyz3b32z3hvs53lmwrnkn79y9wxq6pqmhcgilqji3")))
+              "1vs69z6hqvx9rxqqr0aqs56wvl0y0102szq954hb9gyqzwj2q225")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/footmisc")
@@ -6088,8 +6029,6 @@ footnotes with symbols rather than numbers.")
               "16bmwsng9p80jf78sdmib24apwnw3raw306cs1ms50z5s9dsfdby")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etoolbox))
     (home-page "https://ctan.org/pkg/letltxmacro")
     (synopsis "Let assignment for LaTeX macros")
     (description
@@ -6151,8 +6090,6 @@ also takes care of the involved internal macros.")
                                                     (basename file ".stq")
                                                     ".sty")))
                         (find-files "build/tex" "\\.stq$")))))))
-    (propagated-inputs
-     (list texlive-relsize texlive-tools texlive-url))
     (home-page "https://ctan.org/pkg/frankenstein")
     (synopsis "Collection of LaTeX packages")
     (description
@@ -6181,9 +6118,6 @@ and a BibTeX bibliography style.  The individual packages are: @code{abbrevs},
               "1bz08i8b7ihzd2qi4v9r9kjl2kr5a3l516lqb36spxyyrlmmwv4p")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-l3kernel
-           texlive-l3packages))
     (home-page "https://ctan.org/pkg/kantlipsum")
     (synopsis "Generate sentences in Kant's style")
     (description
@@ -6202,12 +6136,9 @@ similar purposes.")
              (list "doc/latex/lipsum/" "source/latex/lipsum/"
                    "tex/latex/lipsum/")
              (base32
-              "1iwk2iqq5s5sn2z2kr7m59fm5j14dr4nsxivia3lhph8q38p5q6q")))
+              "07kcma66p3s68baygzvgcmb7jvwaan7jj6s3hxmx42npcfsp57s3")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-l3kernel
-           texlive-l3packages))
     (home-page "https://ctan.org/pkg/lipsum")
     (synopsis "Easy access to the Lorem Ipsum dummy text")
     (description
@@ -6226,14 +6157,11 @@ TeX-paragraphs.  All the paragraphs are taken with permission from
              (list "doc/latex/listings/" "source/latex/listings/"
                    "tex/latex/listings/")
              (base32
-              "15dnm0j86305x84ss3ymhhcczcw45b2liq01vrab6fj204wzsahk")))
+              "12db0jnambf3j2c2drnbjz369iwssbbcd7yqjcv0wrzq284lzc0m")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     ;; Do not build intermediate "lstdrvrs.ins".
-     (list #:build-targets '(list "listings.ins")))
-    (propagated-inputs
-     (list texlive-fancyvrb texlive-hyperref texlive-url))
+    ;; Do not build intermediate "lstdrvrs.ins".
+    (arguments (list #:build-targets '(list "listings.ins")))
     (home-page "https://ctan.org/pkg/listings")
     (synopsis "Typeset source code listings using LaTeX")
     (description
@@ -6256,10 +6184,6 @@ styles.  Support for @code{hyperref} is provided.")
               "152gzkzm7sl3bvggmmfcj1pw74vc40s2kpkbp01fd9i0d0v60wma")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-listings
-           texlive-pdftexcmds
-           texlive-stringenc))
     (home-page "https://ctan.org/pkg/listingsutf8")
     (synopsis "Allow UTF-8 in listings input")
     (description
@@ -6284,8 +6208,6 @@ output mode).")
               "0as43yqq123cacxhvp4sbdp4ka3cyp2spmxwayqny0fh5rsk6qaq")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics))
     (home-page "https://ctan.org/pkg/jknapltx")
     (synopsis "Miscellaneous packages by Joerg Knappen")
     (description
@@ -6312,11 +6234,9 @@ in SGML; use maths minus in text as appropriate; simple Young tableaux.")
                    "source/latex/kvoptions/"
                    "tex/latex/kvoptions/")
              (base32
-              "1b8q93l54160b8gn3fq484n15n6cylrhmf2xk7p42czg2rqw7w3l")))
+              "14f19c53s5m067vp25h7yk1f209h1xm352zkhzv6qk5xc0ckkbxm")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-kvsetkeys texlive-ltxcmds))
     (home-page "https://www.ctan.org/pkg/kvoptions")
     (synopsis "Key/value format for package options")
     (description
@@ -6360,8 +6280,6 @@ texlive-2019.3/Master/texmf-dist/doc/fonts/ec/copyrite.txt"))))
 
 (define-deprecated-package texlive-fonts-ec texlive-ec)
 
-;; FIXME: the fonts should be built from source, but running "tex aefonts.tex"
-;; fails with obscure TeX-typical error messages.
 (define-public texlive-ae
   (package
     (name "texlive-ae")
@@ -6414,13 +6332,9 @@ additional guillemets exist in fonts available in Adobe Type 1 format.")
              name version
              (list "doc/latex/incgraph/" "tex/latex/incgraph/")
              (base32
-              "1j5pzhzfbgzd21bq3dh7932pv0052g5l8r0qyx68n3cbsg46lcdk")))
+              "18ygl211wpnx433xy4v3jyl7wn9vn0dw23m709xs01kq7pwmsz3i")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-bookmark
-           texlive-graphics
-           texlive-pgf))
     (home-page "https://ctan.org/pkg/incgraph")
     (synopsis "Sophisticated graphics inclusion in a PDF document")
     (description
@@ -6576,17 +6490,9 @@ format under XeTeX.")
              (list "doc/latex/zref/" "source/latex/zref/"
                    "tex/latex/zref/")
              (base32
-              "1lc83d4qyqljfnf2m3jhq36f3f1yjbi71ys1hc11b9x2a46xk4pf")))
+              "188m3xb2q471mmm54akpdbj65n9sz70n0krapnrbwa8glxjrvlxk")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-atbegshi
-           texlive-atveryend
-           texlive-gettitlestring
-           texlive-iftex
-           texlive-kvoptions
-           texlive-pdftexcmds
-           texlive-xkeyval))
     (home-page "https://github.com/ho-tex/zref")
     (synopsis "Reference scheme for LaTeX")
     (description "This package offers a means to remove the limitation, of
@@ -6664,8 +6570,6 @@ routine, which may be used to place the output at fixed positions.  The
               "16v8j3f8bgww9adddpfzpwd5q9kvak7xnp5kkvkrvhw8vshdspaa")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics))
     (home-page "https://www.ctan.org/pkg/eepic")
     (synopsis "Extensions to @code{epic} and the LaTeX drawing tools")
     (description
@@ -6684,15 +6588,11 @@ drawing ellipses, arcs, splines, and filled circles and ellipses.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/enotez/"
-                   "tex/latex/enotez/")
+             (list "doc/latex/enotez/" "tex/latex/enotez/")
              (base32
-              "1s1wyq6m5932gpbpvvkiw857q94jn1rp7xy9y7hysz9aafjqjyk2")))
+              "0498zr9niylpj9q5ndnj52lb06cj0b424yyq587vqhckxq4l24ik")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-l3packages
-           texlive-translations))
     (home-page "https://ctan.org/pkg/enotez")
     (synopsis "Support for end-notes")
     (description
@@ -6805,8 +6705,6 @@ advantage with @code{\\multirow} cells.")
               "0z6jkn54b4yfk2ia8cxcb5is3qyg64r0na05ixd8xbirrks9ir7w")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-eepic texlive-graphics))
     (home-page "https://www.ctan.org/pkg/overpic")
     (synopsis "Combine LaTeX commands over included graphics")
     (description
@@ -6832,9 +6730,6 @@ positions; a grid for orientation is available.")
               "18yygddxv3kblvf4jhzqa8h1js0n8g1bw723r6ss2hlz4lj64kf0")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etoolbox
-           texlive-kvoptions))
     (home-page "https://www.ctan.org/pkg/parskip")
     (synopsis "Layout with zero @code{\\parindent}, non-zero @code{\\parskip}")
     (description
@@ -6858,8 +6753,6 @@ designed class) helps alleviate this untidiness.")
               "104x4y22msgxhnlz2x331zq7rw28v129s5ym1jqhsk685izb3hcl")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-tools))
     (home-page "https://ctan.org/pkg/pbox")
     (synopsis "@code{\\parbox} with a variable width")
     (description
@@ -6879,7 +6772,7 @@ defines some associated length commands.")
              (list "doc/latex/pdfpages/" "source/latex/pdfpages/"
                    "tex/latex/pdfpages/")
              (base32
-              "0a68vxkygk20fp51fkp7nvs8mc7h6irdvxal8qsnn9zrgr965d76")))
+              "0ihihrrim9fwmgkmrqxmss4wjcv8mv1gr2cpigihlzl6q6iqggjx")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
@@ -6906,7 +6799,7 @@ use this package to insert PostScript files, in addition to PDF files.")
              (list "doc/fonts/stix2-otf/"
                    "fonts/opentype/public/stix2-otf/")
              (base32
-              "0i7rd1wn5jgm3gbi779gy78apz63w034ck4pn73xw6s10zgjzmgl")))
+              "05xqlg61rkfky34x7mc92203z440kanr7bwpmw1djq2y36ql3p1l")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/stix2-otf")
@@ -6925,11 +6818,10 @@ with a set of text faces suitable for professional publishing.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/sidecap/"
-                   "source/latex/sidecap/"
+             (list "doc/latex/sidecap/" "source/latex/sidecap/"
                    "tex/latex/sidecap/")
              (base32
-              "0bjb514a6j90ad7dgyyzrwk6pp7rlb3zk9mfy0fv5a615a5gz82x")))
+              "1h4ysw90dpvnj0x1j9krx40078kyzzs4ynpjz7y50v9hwrrrynjk")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
@@ -6977,7 +6869,7 @@ captions sideways.  Options include @code{outercaption}, @code{innercaption},
     (home-page "https://ctan.org/pkg/stmaryrd")
     (synopsis "St Mary Road symbols for theoretical computer science")
     (description
-     "The fonts were originally distributed as METAFONT sources only, but
+     "The fonts were originally distributed as Metafont sources only, but
 Adobe Type 1 versions are also now available.  Macro support is provided for
 use under LaTeX; the package supports the @code{only} option (provided by the
 @code{somedefs} package) to restrict what is loaded, for those who don't need
@@ -6998,9 +6890,7 @@ the whole font.")
               "0bq1328pb1ak91j7q8n1kh2fncr742lvff7apgf8kkxzxjfg2z9r")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-caption
-           texlive-graphics))
+    (arguments (list #:tex-format "latex"))
     (home-page "https://ctan.org/pkg/subfig")
     (synopsis "Figures broken into subfigures")
     (description
@@ -7026,6 +6916,7 @@ caption for that subfigure.")
               "1327ygajf6gza5msvhfjjnk6r3sw7vb7rxg23v4gx4dmyxqfqrbi")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
     (home-page "https://ctan.org/pkg/subfigure")
     (synopsis "Deprecated: Figures divided into subfigures")
     (description
@@ -7054,8 +6945,6 @@ the more recent @code{subcaption} package more satisfactory.")
               "00afi9r5264rhfy5kg73fk763i7wm6bvzkmrlg7n17fwl6hx0sa1")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-tools))
     (home-page "https://ctan.org/pkg/tabulary")
     (synopsis "Tabular with variable width columns balanced")
     (description
@@ -7082,9 +6971,6 @@ according to the natural width of the widest cell in the column.")
               "05i50k1y736m52903nz4kf2xl23w6y7rrzyacs4kgd1w6kmjm6f7")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-bookmark
-           texlive-hyperref))
     (home-page "https://ctan.org/pkg/threeparttable")
     (synopsis "Tables with captions and notes all the same width")
     (description
@@ -7278,13 +7164,11 @@ command).")
                    "fonts/vf/public/libertine/"
                    "tex/latex/libertine/")
              (base32
-              "1d5r80isyvs2v3i8pzlhsn7ns6bn8ldkbs82g25widraixlhg6yg")))
+              "04bb0v1fp9adcgx6s4zc0fs5z4f85ihbhbkk9zf5pf0ni3gy70fd")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
      (list texlive-fontaxes
-           texlive-fontspec
-           texlive-hyperref
            texlive-iftex
            texlive-mweights
            texlive-xkeyval))
@@ -7318,8 +7202,6 @@ The @code{mweights} package is used to manage the selection of font weights.")
               "0y4qf5jl0xncah9nkcaalmy69wwq02n3j895zp71n2p0nfi24aka")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics))
     (home-page "https://ctan.org/pkg/dejavu")
     (synopsis "LaTeX support for the DejaVu fonts")
     (description
@@ -7338,7 +7220,7 @@ LGR.  The package doesn't (currently) support mathematics.")
              name version
              (list "doc/latex/titlesec/" "tex/latex/titlesec/")
              (base32
-              "01nwh4p15xblc3kgivjliihy9kr8yr2cqsf9wn2iwqv1njx0i2zw")))
+              "0331f6f6sv6sfn4dx7qhx2fgnj9lf3hgbqkh603paqpknfmfjyfm")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/titlesec")
@@ -7477,7 +7359,7 @@ The package contains both the original TrueType font and the derived Type
                    "metapost/support/charlib/"
                    "tex/generic/metapost/")
              (base32
-              "04pgi23frfk6ds10zypqvki0852ds7m1s52c5qvbpyl647nfbgc5")))
+              "0i6mjq59n7vll81m7r2k83x0q6xx7cg6qcia46298zqc0b0l3qb0")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs (list texlive-kpathsea))
@@ -7498,38 +7380,9 @@ than the bitmaps Metafont creates.")
              (list "bibtex/bst/acmart/" "doc/latex/acmart/"
                    "source/latex/acmart/" "tex/latex/acmart/")
              (base32
-              "0vz0dla2frf5wgp5xrqc9q4z730k9wayfkfj0vg58a2xjriarrzn")))
+              "0g27q3r7w83347az77d64xbcxzr9rl64a2qq8l0xs6drfpsq0llb")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-booktabs
-           texlive-caption
-           texlive-cmap
-           texlive-comment
-           texlive-draftwatermark
-           texlive-environ
-           texlive-etoolbox
-           texlive-fancyhdr
-           texlive-float
-           texlive-geometry
-           texlive-graphics
-           texlive-hyperref
-           texlive-hyperxmp
-           texlive-iftex
-           texlive-inconsolata
-           texlive-libertine
-           texlive-microtype
-           texlive-natbib
-           texlive-ncctools
-           texlive-newtx
-           texlive-preprint
-           texlive-refcount
-           texlive-setspace
-           texlive-textcase
-           texlive-totpages
-           texlive-xcolor
-           texlive-xkeyval
-           texlive-xstring))
     (home-page "https://ctan.org/pkg/acmart")
     (synopsis "Class for typesetting publications of ACM")
     (description
@@ -7550,9 +7403,6 @@ Association for Computing Machinery (ACM).")
               "0jcrv4klcjpl17ml0zyqfvkrq6qwn2imxv8syqs5m6qk0fk7hg6l")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-bookmark
-           texlive-hyperref))
     (home-page "https://ctan.org/pkg/varwidth")
     (synopsis "Variable-width @code{minipage}")
     (description
@@ -7633,15 +7483,12 @@ It does not work in combination with list environments, but can be used in a
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/ucs/" "tex/latex/ucs/data/"
-                   "tex/latex/ucs/utils/")
+             (list "doc/latex/ucs/" "fonts/enc/dvips/ucs/"
+                   "source/latex/ucs/" "tex/latex/ucs/")
              (base32
-              "1hr7dsfx7vggai1j7saba48lsm1a003my9qkbr6qmazgc3lbcvl8")))
+              "1viisfamsf0x984ak53dwznhw0yhb394xv66rbfaml6igizvkj83")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics
-           texlive-hyperref))
     (home-page "https://ctan.org/pkg/ucs")
     (synopsis "Extended UTF-8 input encoding support for LaTeX")
     (description
@@ -7665,7 +7512,7 @@ non-ASCII characters when coding mathematical formulae.")
              (list "doc/latex/preview/" "source/latex/preview/"
                    "tex/latex/preview/")
              (base32
-              "1njw4ziyigmzxky86sh6byn8jjdah51iyd8lkmwx5rxhaqp7snkp")))
+              "05ixx2il8xajakh1nkpf7qjczc1kvniiimv585b3gkg6fwx92wzb")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/preview")
@@ -7694,8 +7541,6 @@ files.")
               "0p2sws3qy7wv0v6bsy6c5j36n9s1ps7b1z7dmg1370schrjpqnfh")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-bigfoot texlive-relsize texlive-xstring))
     (home-page "https://ctan.org/pkg/acronym")
     (synopsis "Expand acronyms at least once")
     (description
@@ -7726,13 +7571,29 @@ e-TeX.")
                    "tex/generic/config/pdftex-dvi.tex"
                    "tex/generic/pdftex/")
              (base32
-              "182q6cy2crn2wwaljsq35g0kcmrngyjc307b4sh2zjdnkf8n58xx")))
+              "1fp8w8pkxqcv6n8y0zy2rdclm2hcyx4zv93h0fmqai1yvgcx6yh6")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     (list
-      #:texlive-latex-bin? #f
-      #:create-formats #~(list "etex" "pdfetex" "pdftex")))
+     (list #:texlive-latex-bin? #f
+           #:link-scripts #~(list "simpdftex")
+           #:create-formats #~(list "etex" "pdfetex" "pdftex")
+           #:phases
+           #~(modify-phases %standard-phases
+               (replace 'patch-shell-scripts
+                 (lambda _
+                   (substitute* "scripts/simpdftex/simpdftex"
+                     (("/bin/(cp|date|echo|mv|rm)" _ command)
+                      (which command))
+                     (("basename|dirname|mkdir|sed" command)
+                      (which command))
+                     (("(^[ \t]*)(cat|rm)" _ indent command)
+                      (string-append indent (which command)))
+                     (("(distillerpath=\").*" _ prefix)
+                      (string-append prefix
+                                     #$(this-package-input "ghostscript")
+                                     "/bin\"\n"))))))))
+    (inputs (list ghostscript))
     (propagated-inputs
      (list texlive-cm
            texlive-etex
@@ -8311,7 +8172,7 @@ required: automatic sectioning and pagination, spell checking and so forth.")
                    "tex/latex/media9/javascript/"
                    "tex/latex/media9/players/")
              (base32
-              "1kx0zbwd7pd4mah0b8l595hyjc03g505kfmn6fv7iaqvkixqrgbi")))
+              "03m59icz29sdp50wpl831pl67q9m6kzpq5fzx4jix50z7cmqvfrm")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/media9")
@@ -8338,13 +8199,9 @@ specification.  It replaces the now obsolete @code{movie15} package.")
              name version
              (list "doc/latex/ocgx2/" "tex/latex/ocgx2/")
              (base32
-              "195zli0l69rvxxd7cs387g6bipppfl0pyfsf5invq191zlv319b2")))
+              "0jpvwy6sp7almdbhxizz22h3jxgfnsl4nirs93p7y1lqdgc4srl4")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-l3packages
-           texlive-media9
-           texlive-pgf))
     (home-page "https://ctan.org/pkg/ocgx2")
     (synopsis "Drop-in replacement for 'ocgx' and 'ocg-p'")
     (description
@@ -8371,8 +8228,6 @@ and back-ends.  It also ensures compatibility with the @code{media9} and
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments (list #:tex-format "latex"))
-    (propagated-inputs
-     (list texlive-everyshi texlive-tools))
     (home-page "https://ctan.org/pkg/ms")
     (synopsis "Various LaTeX packages by Martin Schroder")
     (description
@@ -8395,8 +8250,6 @@ and @code{multitoc}, typeset the table of contents in multiple columns.")
               "1g3fpvrg6kx2ns97ih6iwdk0rcbxlv043x8rdppxdincl2lvbdx5")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-amsmath texlive-graphics))
     (home-page "https://ctan.org/pkg/ncctools")
     (synopsis "A collection of general packages for LaTeX")
     (description
@@ -8443,8 +8296,6 @@ toc-entries;
               "1rqbqj4ffcfxxxxbs100pdslaiimwzgg19mf2qzcmm5snxwrf7zj")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-tools))
     (home-page "https://ctan.org/pkg/numprint")
     (synopsis "Print numbers with separators and exponent if necessary")
     (description
@@ -8474,10 +8325,8 @@ number format.")
                              "12hbvv1w6b1k29qjvp72bkpnzsxpvrimzshllwinrxh9rx1mn550")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list #:tex-format "latex"))
-    (native-inputs
-     (list texlive-filecontents))
+    (arguments (list #:tex-format "latex"))
+    (native-inputs (list texlive-filecontents))
     (home-page "https://ctan.org/pkg/needspace")
     (synopsis "Insert pagebreak if not enough space")
     (description
@@ -8501,10 +8350,8 @@ bottom of the page, a new page will be started.")
               "0g9zlbqrgxh3p2vys2s84i8v590qi4fbpppp5lkaqc1di8kw60lm")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list #:tex-format "latex"))
-    (native-inputs
-     (list texlive-filecontents))
+    (arguments (list #:tex-format "latex"))
+    (native-inputs (list texlive-filecontents))
     (home-page "https://ctan.org/pkg/changepage")
     (synopsis "Margin adjustment and detection of odd/even pages")
     (description
@@ -8569,10 +8416,6 @@ underlining, and striking out, and crossing out.")
     (source (texlive-origin
              name version
              (list "doc/generic/pgf/"
-                   "scripts/pgf/"
-                   "source/generic/pgf/c/"
-                   "source/generic/pgf/testsuite/external/"
-                   "source/generic/pgf/testsuite/mathtest/"
                    "tex/context/third/pgf/basiclayer/"
                    "tex/context/third/pgf/frontendlayer/"
                    "tex/context/third/pgf/math/"
@@ -8606,12 +8449,11 @@ underlining, and striking out, and crossing out.")
                    "tex/plain/pgf/systemlayer/"
                    "tex/plain/pgf/utilities/")
              (base32
-              "1d6s7sf7dmcqrx652f7j468rylkarihxl0ghg0sy5scjdn3z9bdr")))
+              "1rkrp839snkfmxn0ff3kcvgq4k59lj2c3xz05hmmnprzymsx1zvd")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
      (list texlive-atveryend
-           texlive-everyshi
            texlive-fp
            texlive-graphics
            texlive-ms
@@ -8640,31 +8482,13 @@ output.")
     (source (texlive-origin
              name version
              (list "doc/latex/koma-script/"
-                   "source/latex/koma-script/"
+                   "source/latex/koma-script/doc/"
                    "tex/latex/koma-script/")
              (base32
-              "0k8mhikpll066x3683gmg3xas7a2mz93b9fip4k56hacxxb6map1")))
+              "192jlijzrqipdi2bxg1562259zxivpzm8clbnpr0fk1rr1nc2lz1")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'move-required-files
-            ;; These files are required by the build process.
-            (lambda _
-              (for-each (lambda (f)
-                          (install-file
-                           (string-append "doc/latex/koma-script/" f)
-                           "build/"))
-                        '("komabug.tex" "manifest.txt" "INSTALL.txt"
-                          "INSTALLD.txt" "lppl.txt" "lppl-de.txt")))))))
-    (propagated-inputs
-     (list texlive-bookmark
-           texlive-eso-pic
-           texlive-etoolbox
-           texlive-graphics
-           texlive-l3packages
-           texlive-xpatch))
+    (propagated-inputs (list texlive-footmisc))
     (home-page "https://ctan.org/pkg/koma-script")
     (synopsis "Bundle of versatile classes and packages")
     (description
@@ -8718,8 +8542,6 @@ be used either with LaTeX or with plain TeX.")
               "1cyv4mcvx83ab782l6h2f86a63ipm845r7hv1m6f1z2336vy7rc5")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-pdftexcmds))
     (home-page "https://ctan.org/pkg/bigintcalc")
     (synopsis "Integer calculations on very large numbers")
     (description
@@ -8741,8 +8563,7 @@ that can exceed TeX's number limits.")
               "1q7vk5gr5a4vaa3l20j178cg2q7a99rxdiyxhzpx9a6lfqfkjddz")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-bigintcalc texlive-infwarerr texlive-intcalc))
+    (propagated-inputs (list texlive-bigintcalc))
     (home-page "https://ctan.org/pkg/bitset")
     (synopsis "Handle bit-vector datatype")
     (description
@@ -8765,8 +8586,6 @@ manipulated.")
               "13cf1fs5x9d8749b2jgxmgnkrx0r4hwpl389r15kq3ldz9jfl627")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-iftex texlive-infwarerr))
     (home-page "https://ctan.org/pkg/etexcmds")
     (synopsis "Avoid name clashes with e-TeX commands")
     (description
@@ -8791,10 +8610,6 @@ provided as @code{\\etex@@unexpanded}.")
               "0bfcc8g8q5v1nyqmrg8n17hv4k8yvhsplansvriccpmvyx0w9y9d")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etex
-           texlive-etoolbox
-           texlive-letltxmacro))
     (home-page "https://ctan.org/pkg/etextools")
     (synopsis "e-TeX tools for LaTeX users and package writers")
     (description
@@ -8886,8 +8701,6 @@ using the e-TeX extension @code{\\numexpr} if it is available.")
               "1026h223ph3nzhs6jqbasa0bzsrdg3zgllfcwwcavfzb5i6p9jdf")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-ltxcmds))
     (home-page "https://ctan.org/pkg/kvdefinekeys")
     (synopsis "Define keys for use in the @code{kvsetkeys} package")
     (description
@@ -8905,13 +8718,11 @@ keyval’s @code{\\define@@key}, to define keys for use by @code{kvsetkeys}.")
              name version
              (list "doc/latex/kvsetkeys/"
                    "source/latex/kvsetkeys/"
-                   "tex/generic/kvsetkeys/")
+                   "tex/latex/kvsetkeys/")
              (base32
-              "0b2f2r49vi8x54qshm1h9sh8zhdmy0mc2y44yd05kcmmbiiq7hfz")))
+              "0c4f4sgb3xpxmvphrvzbyqa2vl7sp2j52hb99spmpbqwgj9j61qx")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-infwarerr))
     (home-page "https://ctan.org/pkg/kvsetkeys")
     (synopsis "Key value parser with default handler support")
     (description
@@ -8929,10 +8740,10 @@ level of curly braces are removed from the values.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/generic/listofitems"
-                   "tex/generic/listofitems")
+             (list "doc/generic/listofitems/"
+                   "tex/generic/listofitems/")
              (base32
-              "1vzp4qkpfxzgcll1ak9syyc91sl93k9wr5rgfqvd6d6rgrnh3ava")))
+              "0yy0hw3631shf9rrdiyywr7hs7dvrhvz2a2vkzbwalnyrqdwbyh5")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/listofitems")
@@ -9007,8 +8818,6 @@ plain TeX.")
               "16a0rdmpa4wxh6gyf46qwfgyh399rwdind2wc89phqd50ky9b5m4")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-ltxcmds texlive-pdftexcmds))
     (home-page "https://ctan.org/pkg/pdfescape")
     (synopsis "Implements pdfTeX's escape features using TeX or e-TeX")
     (description
@@ -9032,8 +8841,6 @@ using TeX or e-TeX.")
               "1ll3iwk8x44l3qx1dhna399ngg66vbllivv8i3lwzriwkx22xbf3")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-bigintcalc texlive-infwarerr))
     (home-page "https://ctan.org/pkg/uniquecounter")
     (synopsis "Provides unlimited unique counter")
     (description
@@ -9052,11 +8859,9 @@ not limited.")
              name version
              (list "doc/latex/readarray/" "tex/latex/readarray/")
              (base32
-              "05yi37j8jq5a9pp9n6qg76m2fw899vpmwafzgnxbg0qp2fmch2ch")))
+              "0iy3m20761mp83g59qpx9l20bg3fvm28l64vq735rcha7yqbhf22")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-listofitems))
     (home-page "https://www.ctan.org/pkg/readarray")
     (synopsis "Read, store and recall array-formatted data")
     (description
@@ -9080,8 +8885,6 @@ formatted text.")
               "00n3x075ya3s2qwmcz2vvn8x70pbbgj2cbwz0ifw89jrc4ljisgi")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-tools))
     (home-page "https://www.ctan.org/pkg/verbatimbox")
     (synopsis "Deposit verbatim text in a box")
     (description
@@ -9111,7 +8914,7 @@ in places where the standard @code{verbatim} environment (which is based on a
     (description
      "The @code{examplep} package provides sophisticated features for
 typesetting verbatim source code listings, including the display of the source
-code and its compiled LaTeX or METAPOST output side-by-side, with automatic
+code and its compiled LaTeX or Metapost output side-by-side, with automatic
 width detection and enabled page breaks (in the source), without the need for
 specifying the source twice.  Special care is taken that section, page and
 footnote numbers do not interfere with the main document.  For typesetting
@@ -9135,8 +8938,7 @@ such as footnotes and section titles.")
               "1d96i8kd2lhbykc3rxy2jjvws404f2vy1cvdcp5bdr6l9m72q1fa")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics texlive-tipa))
+    (propagated-inputs (list texlive-tipa))
     (home-page "https://ctan.org/pkg/xunicode")
     (synopsis "Generate Unicode characters from accented glyphs")
     (description
@@ -9168,7 +8970,6 @@ glyphs.")
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (native-inputs (list texlive-cm texlive-metafont))
-    (propagated-inputs (list texlive-graphics texlive-iftex))
     (home-page "https://ctan.org/pkg/xypic")
     (synopsis "Flexible diagramming macros")
     (description
@@ -9195,7 +8996,7 @@ AMS-LaTeX, AMS-TeX, and plain TeX).  The distribution includes Michael Barr's
                    "doc/man/man1/bibtex.man1.pdf"
                    "tex/generic/bibtex/")
              (base32
-              "0h72ckha1mv1a2i5v85l68amfc0kf0km9iyin6vxxal69146j8gp")))
+              "0iyaxab3wyhy3nw0id892aklpqf17z1cl85v4m3rjy5nmb8darn9")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs (list texlive-kpathsea))
@@ -9266,11 +9067,6 @@ a counter to be reset when another is incremented) and
                    "context/data/scite/context/documents/"
                    "context/data/scite/context/lexers/data/"
                    "context/data/scite/context/lexers/themes/"
-                   "context/data/texfont/"
-                   "context/data/textadept/context/data/"
-                   "context/data/textadept/context/lexers/"
-                   "context/data/textadept/context/modules/"
-                   "context/data/textadept/context/themes/"
                    "context/data/texworks/TUG/"
                    "context/data/texworks/completion/"
                    "context/data/texworks/configuration/"
@@ -9307,6 +9103,7 @@ a counter to be reset when another is incremented) and
                    "doc/context/presentations/context/2017/"
                    "doc/context/presentations/context/2019/"
                    "doc/context/presentations/context/2020/"
+                   "doc/context/presentations/context/2021/"
                    "doc/context/presentations/examples/"
                    "doc/context/presentations/tug/2001/"
                    "doc/context/presentations/tug/2007/"
@@ -9316,6 +9113,7 @@ a counter to be reset when another is incremented) and
                    "doc/context/sources/general/magazines/"
                    "doc/context/sources/general/manuals/about/"
                    "doc/context/sources/general/manuals/bidi/"
+                   "doc/context/sources/general/manuals/canbedone/"
                    "doc/context/sources/general/manuals/charts/"
                    "doc/context/sources/general/manuals/cld/"
                    "doc/context/sources/general/manuals/colors/"
@@ -9343,6 +9141,7 @@ a counter to be reset when another is incremented) and
                    "doc/context/sources/general/manuals/nodes/"
                    "doc/context/sources/general/manuals/notnow/"
                    "doc/context/sources/general/manuals/onandon/"
+                   "doc/context/sources/general/manuals/ontarget/"
                    "doc/context/sources/general/manuals/pagecolumns/"
                    "doc/context/sources/general/manuals/primitives/"
                    "doc/context/sources/general/manuals/publications/"
@@ -9421,6 +9220,8 @@ a counter to be reset when another is incremented) and
                    "doc/man/man1/mtx-scite.man1.pdf"
                    "doc/man/man1/mtx-server.1"
                    "doc/man/man1/mtx-server.man1.pdf"
+                   "doc/man/man1/mtx-spell.1"
+                   "doc/man/man1/mtx-spell.man1.pdf"
                    "doc/man/man1/mtx-texworks.1"
                    "doc/man/man1/mtx-texworks.man1.pdf"
                    "doc/man/man1/mtx-timing.1"
@@ -9441,13 +9242,8 @@ a counter to be reset when another is incremented) and
                    "doc/man/man1/mtx-youless.man1.pdf"
                    "doc/man/man1/mtxrun.1"
                    "doc/man/man1/mtxrun.man1.pdf"
-                   "doc/man/man1/texexec.1"
-                   "doc/man/man1/texexec.man1.pdf"
-                   "doc/man/man1/texmfstart.1"
-                   "doc/man/man1/texmfstart.man1.pdf"
                    "fonts/afm/hoekwater/context/"
                    "fonts/cid/fontforge/"
-                   "fonts/enc/dvips/context/"
                    "fonts/map/dvips/context/"
                    "fonts/map/luatex/context/"
                    "fonts/map/pdftex/context/"
@@ -9455,62 +9251,42 @@ a counter to be reset when another is incremented) and
                    "fonts/tfm/hoekwater/context/"
                    "fonts/type1/hoekwater/context/"
                    "metapost/context/base/common/"
-                   "metapost/context/base/mpii/"
                    "metapost/context/base/mpiv/"
                    "metapost/context/base/mpxl/"
                    "metapost/context/fonts/mpiv/"
                    "scripts/context/lua/"
                    "scripts/context/perl/"
-                   "scripts/context/ruby/base/"
-                   "scripts/context/ruby/graphics/"
-                   "scripts/context/ruby/rslb/"
-                   "scripts/context/stubs/install/"
-                   "scripts/context/stubs/mswin/"
-                   "scripts/context/stubs/setup/"
-                   "scripts/context/stubs/source/"
-                   "scripts/context/stubs/unix/"
-                   "scripts/context/stubs/win64/"
                    "tex/context/base/"
                    "tex/context/bib/common/"
-                   "tex/context/bib/mkii/"
                    "tex/context/colors/icc/context/"
-                   "tex/context/fonts/mkii/"
+                   "tex/context/colors/icc/profiles/"
                    "tex/context/fonts/mkiv/"
-                   "tex/context/interface/mkii/"
+                   "tex/context/fonts/mkxl/"
                    "tex/context/interface/mkiv/"
                    "tex/context/modules/common/"
-                   "tex/context/modules/mkii/"
                    "tex/context/modules/mkiv/"
                    "tex/context/modules/mkxl/"
                    "tex/context/patterns/common/"
-                   "tex/context/patterns/mkii/"
                    "tex/context/patterns/mkiv/"
+                   "tex/context/patterns/mkxl/"
                    "tex/context/sample/common/"
                    "tex/context/sample/third/"
                    "tex/context/test/mkiv/"
-                   "tex/context/user/mkii/"
                    "tex/generic/context/luatex/"
-                   "tex/generic/context/ppchtex/"
                    "tex/latex/context/ppchtex/")
              (base32
-              "1sbh4fnxxymh7lmvldp1ll8p6adcf3jhvqf47jvrayqr91zp4hh9")))
+              "1mmdxi6hcznmj2fjx6dmf76q3zsyhq67irvyr8a125d9qcs1iiml")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list #:create-formats
-           #~(list "cont-en" "cont-fr" "cont-it" "cont-nl" "cont-ro")))
+    (arguments (list #:link-scripts #~(list "context.lua" "mtxrun.lua")))
     (propagated-inputs
      (list texlive-amsfonts
            texlive-lm
            texlive-lm-math
            texlive-luatex
            texlive-manfnt-font
-           texlive-metapost
            texlive-mflogo-font
-           texlive-mptopdf
-           texlive-pdftex
-           texlive-stmaryrd
-           texlive-xetex))
+           texlive-stmaryrd))
     (home-page "https://ctan.org/pkg/context")
     (synopsis "Full featured, parameter driven macro package for TeX")
     (description "ConTeXt is a full featured, parameter driven macro package,
@@ -9530,25 +9306,22 @@ for a wealth of support information.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/beamer/"
-                   "tex/latex/beamer/")
+             (list "doc/latex/beamer/" "tex/latex/beamer/")
              (base32
-              "091n27n4l3iac911bvmpp735ffryyzaq46mkclgn3q9jsvc4ngiv")))
+              "0v5ix5dybf6j2mj9sp5598vdbm4bm1m50nmhj6qsk8faj78g562w")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
-     (list texlive-amsfonts
+     (list texlive-amscls
+           texlive-amsfonts
            texlive-amsmath
            texlive-atbegshi
            texlive-etoolbox
-           texlive-graphics
+           texlive-geometry
            texlive-hyperref
            texlive-iftex
-           texlive-oberdiek
            texlive-pgf
-           texlive-tools
            texlive-translator
-           texlive-ucs
            texlive-xcolor))
     (home-page "https://www.ctan.org/pkg/beamer")
     (synopsis "LaTeX class for producing presentations and slides")
@@ -9577,11 +9350,9 @@ effects, varying slide transitions and animations.")
              (list "doc/latex/xmpincl/" "source/latex/xmpincl/"
                    "tex/latex/xmpincl/")
              (base32
-              "1r9vga6pl8q0p40njr1l04nhga4i0pjyppsd9qmxx0kx408siram")))
+              "1wc48qark5hd593jh3mx1yryxsdcq5hbaxyrhwcaxzgqivdli34p")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-iftex))
     (home-page "https://ctan.org/pkg/xmpincl")
     (synopsis "Include eXtensible Metadata Platform data in pdfLaTeX")
     (description
@@ -9613,15 +9384,6 @@ the file to which it applies.")
             (lambda _
               (substitute* "source/latex/pdfx/pdfx.dtx"
                 (("    .+umaczy") "umaczy")))))))
-    (propagated-inputs
-     (list texlive-colorprofiles
-           texlive-everyshi
-           texlive-hyperref
-           texlive-iftex
-           texlive-pdftexcmds
-           texlive-stringenc
-           texlive-xcolor
-           texlive-xmpincl))
     (home-page "https://ctan.org/pkg/pdfx")
     (synopsis "PDF/X and PDF/A support for pdfTeX, LuaTeX and XeTeX")
     (description
@@ -9640,26 +9402,17 @@ standards-compliant PDF documents with pdfTeX, LuaTeX and XeTeX.")
              (list "doc/latex/ydoc/" "source/latex/ydoc/"
                    "tex/generic/ydoc/" "tex/latex/ydoc/")
              (base32
-              "1z7690vin47mw47gjg7k4h49b4ckg6g96l1zlziyjmjbkyzmyhdn")))
+              "00v7vlv7z2xy4sy2zd4arlndjqvgjsqar3i22vdnld4flb03jqb8")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'create-missing-directories
-            ;; XXX: These directories are not created even though they belong
-            ;; to locations in TEXLIVE-ORIGIN.  Create them manually.
-            (lambda _
-              (mkdir-p "tex/generic/ydoc/")
-              (mkdir-p "tex/latex/ydoc/"))))))
     (propagated-inputs
      (list texlive-etoolbox
            texlive-float
            texlive-hyperref
            texlive-listings
            texlive-needspace
-           texlive-svn-prov
+           texlive-newverbs
+           texlive-showexpl
            texlive-tools
            texlive-url
            texlive-xcolor))
@@ -9680,39 +9433,13 @@ change.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/generic/pstricks/"
-                   "dvips/pstricks/"
-                   "tex/generic/pstricks/"
-                   "tex/latex/pstricks/")
+             (list "doc/generic/pstricks/" "dvips/pstricks/"
+                   "tex/generic/pstricks/" "tex/latex/pstricks/")
              (base32
-              "15c9iqfq2y9c8c78cvqb6vzd5a5rm7qq5x7m05jq1hb8sgqrqb0j")))
+              "0hyd8rx0a11mwd13fa10s3h3jq3xymff57p7ks6cnryy2860aizq")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-amsfonts
-           texlive-amsmath
-           texlive-babel
-           texlive-bera
-           texlive-biblatex
-           texlive-booktabs
-           texlive-caption
-           texlive-chngcntr
-           texlive-eso-pic
-           texlive-fancyvrb
-           texlive-filecontents
-           texlive-footmisc
-           texlive-graphics
-           texlive-hyperref
-           texlive-ifplatform
-           texlive-iftex
-           texlive-listings
-           texlive-multido
-           texlive-ragged2e
-           texlive-setspace
-           texlive-subfig
-           texlive-tools
-           texlive-xcolor))
-    (home-page "http://www.ctan.org/pkg/pstricks")
+    (home-page "http://www.ctan.org/pkg/pstricks-base")
     (synopsis "PostScript macros for TeX")
     (description
      "PSTricks offers an extensive collection of macros for generating
@@ -9738,8 +9465,6 @@ of tables.")
               "146fpzd1xlqi94q5r48z8ni8qww713yh6nwkbr9pw27mjrqdadb9")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-pstricks))
     (home-page "http://www.ctan.org/pkg/pst-text")
     (synopsis "Text and character manipulation in PSTricks")
     (description "Pst-text is a PSTricks based package for plotting text along
@@ -9774,10 +9499,9 @@ frames made with the @code{framed} package.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "/doc/generic/iftex/"
-                   "/tex/generic/iftex/")
+             (list "doc/generic/iftex/" "tex/generic/iftex/")
              (base32
-              "147xa5kl4kjs05nj8v3kd7dpr5xkz3xp3gdvjih32ccd7527f5vp")))
+              "05p8iw8c8vjs59zb8pgilwpvlzrlb8zxyf34fhyr67y6bwm8phnf")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "http://www.ctan.org/pkg/iftex")
@@ -9801,15 +9525,13 @@ the engine in use.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/tabu/"
-                   "source/latex/tabu/"
+             (list "doc/latex/tabu/" "source/latex/tabu/"
                    "tex/latex/tabu/")
-             (base32 "0mixyrqavipq4ni38z42x3579cdjbz54cp2qqb4q4yhfbl0a4pka")))
+             (base32
+              "0mixyrqavipq4ni38z42x3579cdjbz54cp2qqb4q4yhfbl0a4pka")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-tools
-           texlive-varwidth))
+    (propagated-inputs (list texlive-varwidth))
     (home-page "https://ctan.org/macros/latex/contrib/tabu")
     (synopsis "Flexible LaTeX tabulars")
     (description
@@ -9824,34 +9546,37 @@ facilities of @code{tabu} in a modified @code{longtable} environment.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/xkeyval/"
-                   "source/latex/xkeyval/"
-                   "tex/generic/xkeyval/"
-                   "tex/latex/xkeyval/")
+             (list "doc/latex/xkeyval/" "source/latex/xkeyval/"
+                   "tex/generic/xkeyval/" "tex/latex/xkeyval/")
              (base32
-              "0hcfqxbi907yi9jwq61i638n8g9abf6zc0aazk2lxzshy44h3ms1")))
+              "0nclsazny3hnzsi2vcixh2g1gsj5lvwxls1v569rms8ykgd9v7z8")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     '(#:build-targets '("xkeyval.dtx")
-       #:tex-format "latex"             ;won't build with luatex
-       #:phases
-       (modify-phases %standard-phases
-         ;; This package cannot be built out of tree as it expects to find
-         ;; built files in the working directory.
-         (add-before 'build 'fix-build
-           (lambda _
-             (setenv "TEXINPUTS" (string-append (getcwd) "/build:"))
-             (substitute* "source/latex/xkeyval/xkeyval.dtx"
-               (("usepackage\\{xcolor\\}")
-                "usepackage[dvips]{xcolor}")))))))
+     (list
+      #:build-targets #~(list "xkeyval.dtx")
+      #:tex-format "latex"              ;won't build with luatex
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; This package cannot be built out of tree as it expects to find
+          ;; built files in the working directory.
+          (add-before 'build 'fix-build
+            (lambda _
+              (setenv "TEXINPUTS" (string-append (getcwd) "/build:"))
+              (substitute* "source/latex/xkeyval/xkeyval.dtx"
+                (("usepackage\\{xcolor\\}")
+                 "usepackage[dvips]{xcolor}")))))))
     (native-inputs
      (list (texlive-updmap.cfg
             (list texlive-ec
                   texlive-footmisc
                   texlive-fourier
                   texlive-graphics-def
+                  texlive-hypdoc
+                  texlive-hyperref
                   texlive-iftex
+                  texlive-infwarerr
+                  texlive-kvoptions
                   texlive-listings
                   texlive-lm
                   texlive-pgf
@@ -9859,8 +9584,6 @@ facilities of @code{tabu} in a modified @code{longtable} environment.")
                   texlive-pstricks
                   texlive-url
                   texlive-xcolor))))
-    (propagated-inputs
-     (list texlive-tools))
     (home-page "https://ctan.org/pkg/xkeyval")
     (synopsis "Extension of the @code{keyval} package")
     (description
@@ -9882,27 +9605,17 @@ keys.")
              name version
              (list "doc/latex/standalone/"
                    "source/latex/standalone/"
-                   "tex/latex/standalone/"
-                   "tex/plain/standalone/")
+                   "tex/latex/standalone/")
              (base32
-              "00cs6bxpcpl8fjld280af52njkv44fm81yww9ynhqa9xp49q0p90")))
+              "055mz0r837ipb6f0v7lp2imwpy1zh0i45wkd5f1dbpjpb9gf7qny")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (native-inputs
-     (list texlive-ydoc))
+    (native-inputs (list texlive-ydoc))
     (propagated-inputs
      (list texlive-adjustbox
            texlive-currfile
            texlive-filemod
            texlive-gincltex
-           texlive-iftex
-           texlive-multido
-           texlive-pdftexcmds
-           texlive-pgf
-           texlive-preview
-           texlive-pstricks
-           texlive-tools
-           texlive-varwidth
            texlive-xkeyval))
     (home-page "https://ctan.org/pkg/standalone")
     (synopsis "Compile TeX pictures stand-alone or as part of a document")
@@ -9925,7 +9638,7 @@ without margins.")
              (list "doc/latex/siunitx/" "source/latex/siunitx/"
                    "tex/latex/siunitx/")
              (base32
-              "05gpl318mpm5gxb9665080yd5qiirmh3hwixg9p4wgydk8wfllnl")))
+              "14rgn7lm5iy15jxcdwrkkp6rmi569x1x7qir82k89xl49k1rr2d1")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs (list texlive-l3kernel texlive-l3packages))
@@ -9973,16 +9686,12 @@ to what constitutes a good table in this context.  The package offers
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/csquotes/"
-                   "tex/latex/csquotes/")
+             (list "doc/latex/csquotes/" "tex/latex/csquotes/")
              (base32
-              "17y5mrmjmi7n0cgq4cnqr55f4bni6lx1pfdv5pzsmbrzha3mhbfg")))
+              "0657rvaciq5h4qp2hg9d2w2i663p5cnxygi6dj9w61463m4nkpy6")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etoolbox
-           texlive-graphics
-           texlive-relsize))
+    (propagated-inputs (list texlive-etoolbox))
     (home-page "https://www.ctan.org/pkg/csquotes")
     (synopsis "Context sensitive quotation facilities")
     (description
@@ -10009,9 +9718,7 @@ well as the optional active quotes are freely configurable.")
               "13difccs3cxlkqlnhw286yb0c7mifrxfd402a2x5wwxv0m1kgfqd")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etoolbox
-           texlive-graphics))
+    (propagated-inputs (list texlive-etoolbox))
     (home-page "https://ctan.org/pkg/logreq")
     (synopsis "Support for automation of the LaTeX workflow")
     (description
@@ -10039,7 +9746,7 @@ and write them to an external XML file at the end of the document.")
                    "tex/latex/biblatex/cbx/"
                    "tex/latex/biblatex/lbx/")
              (base32
-              "1v3y2i7vng1qfs3p7ma2mf8lvvib422aagc3z6q2vwz6r3y4mr5k")))
+              "0s4i9ck77cldf37j01pgjm6qznfwkmy0vmrcdichq8bvzx8w89zg")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
@@ -10071,7 +9778,7 @@ section.")
              (list "doc/latex/biblatex-apa/"
                    "tex/latex/biblatex-apa/")
              (base32
-              "0ivf7xbzj4xd57sqfbi87hbr73rraqifkzvx06yxgq0gmzz0x6wl")))
+              "1igzmgzfchn54zkb78fwsdk2lqs2pp0ydzzcmk1cydhmsfrjya4l")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/biblatex-apa")
@@ -10093,14 +9800,11 @@ citations and references.")
                    "source/latex/todonotes/"
                    "tex/latex/todonotes/")
              (base32
-              "0lhqzrvf216j3rzg7lmc1mvnr2mzr0a6c2kqrfwzw6qbpm9v29nk")))
+              "0gw9ny0s048kq78m2njrv2m6y4z0rck58i9nc892vl93h7gi4p1v")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
-     (list texlive-pgf
-           texlive-tools
-           texlive-xcolor
-           texlive-xkeyval))
+     (list texlive-pgf texlive-tools texlive-xcolor texlive-xkeyval))
     (home-page "https://ctan.org/pkg/todonotes")
     (synopsis "Marking things to do in a LaTeX document")
     (description
@@ -10139,11 +9843,9 @@ bundle.")
                    "source/latex/microtype/"
                    "tex/latex/microtype/")
              (base32
-              "1r9w6za8g263n16pz0r5adrx5sazhfa78rdhjj9idnif12bgvpq2")))
+              "039v1dw3n4lnd8ipazlkb7p5abqcrigjayx797ggh3ak8dcqwlli")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics))
     (home-page "https://ctan.org/pkg/microtype")
     (synopsis "Subliminal refinements towards typographical perfection")
     (description
@@ -10192,11 +9894,12 @@ configuration of its own fixed names, using @file{.mld} files.")
              (list "doc/latex/minted/" "source/latex/minted/"
                    "tex/latex/minted/")
              (base32
-              "13cjsjb3b04n9arwp46ayk8fcicylxq5g1864cpxl1lxjxh1yi0l")))
+              "1z2vagia7sbfa134qj3dfdkppy0v4yjykaj594c6z9qy1z5jn5mc")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
      (list python-pygments
+           texlive-catchfile
            texlive-etoolbox
            texlive-fancyvrb
            texlive-float
@@ -10206,9 +9909,10 @@ configuration of its own fixed names, using @file{.mld} files.")
            texlive-ifplatform
            texlive-kvoptions
            texlive-lineno
-           texlive-newfloat
            texlive-pdftexcmds
            texlive-tools
+           texlive-upquote
+           texlive-xcolor
            texlive-xstring))
     (home-page "https://ctan.org/pkg/minted")
     (synopsis "Highlighted source code for LaTeX")
@@ -10227,11 +9931,9 @@ customize the highlighted source code output using @code{fancyvrb}.")
              (list "doc/latex/caption/" "source/latex/caption/"
                    "tex/latex/caption/")
              (base32
-              "1fg3zfgi54zqx911wbqfb1y24d9ihm6wg59npng4clnqz45lla2i")))
+              "1hgd52dxm35k63jb2vxrkghlaq41h89bwbqyihaim2h06kmnpb0r")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics))
     (home-page "https://ctan.org/pkg/caption")
     (synopsis "Customising captions in floating environments")
     (description
@@ -10265,15 +9967,8 @@ that simpler packages like capt-of do.")
     (home-page "https://ctan.org/pkg/urw-base35")
     (synopsis "URW Base 35 font pack for LaTeX")
     (description
-     "This package provides a set of fonts for use as drop-in replacements for
-Adobe's basic set, comprising: Century Schoolbook (substituting for Adobe's
-New Century Schoolbook); Dingbats (substituting for Adobe's Zapf Dingbats);
-Nimbus Mono L (substituting for Abobe's Courier); Nimbus Roman No9
-L (substituting for Adobe's Times); Nimbus Sans L (substituting for Adobe's
-Helvetica); Standard Symbols L (substituting for Adobe's Symbol); URW Bookman;
-URW Chancery L Medium Italic (substituting for Adobe's Zapf Chancery); URW
-Gothic L Book (substituting for Adobe's Avant Garde); and URW Palladio
-L (substituting for Adobe's Palatino).")
+     "This package provides a drop-in replacement for the Symbol font from
+Adobe's basic set.")
     (license license:gpl3+)))
 
 (define-public texlive-mathpazo
@@ -10365,9 +10060,6 @@ the @code{psnfss} distribution.")
               "1a0zw9vc6z0shxvb4kdhfqdhwpzph5hm9v7klpchlisabvk421y1")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-amsfonts
-           texlive-bera))
     (home-page "https://ctan.org/pkg/arev")
     (synopsis "Fonts and LaTeX support files for Arev Sans")
     (description
@@ -10419,9 +10111,6 @@ packages.")
               "0jcby2sd0l3ank2drxc0qcf5d1cwa8idzh4g91h4nxk8zrzxj8nr")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics
-           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/mathdesign")
     (synopsis "Mathematical fonts to fit with particular text fonts")
     (description
@@ -10450,8 +10139,6 @@ fonts (two of them created by the Greek Font Society).")
               "1pkmhhr6ah44xhipjr7nianv03hr4w4bn45xcvp264yw6ymqzqwr")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics))
     (home-page "https://ctan.org/pkg/bera")
     (synopsis "Bera fonts")
     (description "The @code{bera} package contains the Bera Type 1 fonts and
@@ -10476,12 +10163,9 @@ TeX, of the Bitstream Vera family.")
                    "fonts/vf/public/fourier/"
                    "tex/latex/fourier/")
              (base32
-              "038h02n02fii0kv021d5z8ic2p0mqnjzwxdbvcfym4gkcw345fxk")))
+              "10nw0s3820mf4nv4b655cfvm8asjb1q71yd21cnm8zjxj0xpcrpx")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-fontspec
-           texlive-iftex))
     (home-page "https://ctan.org/pkg/fourier")
     (synopsis "Using Utopia fonts for LaTeX documents")
     (description
@@ -10598,15 +10282,9 @@ difficulties.")
                    "fonts/vf/impallari/cabin/"
                    "tex/latex/cabin/")
              (base32
-              "1gqqqbj7i18fs1ss5n3axd821hzq5kbv1dl7dqxp4gba619f1rli")))
+              "1l4s50l8rjmfrknffgy1c84dg8m9rg96817rs3b3cqk97c3l25zy")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-fontaxes
-           texlive-fontspec
-           texlive-iftex
-           texlive-mweights
-           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/cabin")
     (synopsis "Humanist Sans Serif font with LaTeX support")
     (description
@@ -10627,30 +10305,20 @@ as the default text font.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "/doc/fonts/newtx/"
-                   "/fonts/afm/public/newtx/"
-                   "/fonts/enc/dvips/newtx/"
-                   "/fonts/map/dvips/newtx/"
-                   "/fonts/opentype/public/newtx/"
-                   "/fonts/tfm/public/newtx/"
-                   "/fonts/type1/public/newtx/"
-                   "/fonts/vf/public/newtx/"
-                   "/tex/latex/newtx/")
+             (list "doc/fonts/newtx/"
+                   "fonts/afm/public/newtx/"
+                   "fonts/enc/dvips/newtx/"
+                   "fonts/map/dvips/newtx/"
+                   "fonts/opentype/public/newtx/"
+                   "fonts/tfm/public/newtx/"
+                   "fonts/type1/public/newtx/"
+                   "fonts/vf/public/newtx/"
+                   "tex/latex/newtx/")
              (base32
-              "0h0wm3cd0wxag5x7vy3vgr42jd8m6ffkl90pnkvqdxzbnfdjv3l6")))
+              "0lbkip5nwrc0sf1alhc8b4dh6ymvn48l5sv71qjzrc1qg2jnw29b")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-amsmath
-           texlive-carlisle
-           texlive-etextools
-           texlive-etoolbox
-           texlive-fontaxes
-           texlive-iftex
-           texlive-oberdiek
-           texlive-trimspaces
-           texlive-xkeyval
-           texlive-xstring))
+    (propagated-inputs (list texlive-kastrup))
     (home-page "https://www.ctan.org/pkg/newtx")
     (synopsis "Repackaging of the TX fonts with improved metrics")
     (description
@@ -10679,15 +10347,9 @@ package that matches Libertine text quite well.")
                    "fonts/vf/public/xcharter/"
                    "tex/latex/xcharter/")
              (base32
-              "0d8rvcmvxrlxqqxpirxqbhmiijpsz5y4vvldh1jnc018aannjlhm")))
+              "178mmdr9ji346cnmwas22vhbm38izb1sy5164a5h250kgm287v2c")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-carlisle
-           texlive-etoolbox
-           texlive-fontaxes
-           texlive-xstring
-           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/xcharter")
     (synopsis "Extension of Bitstream Charter fonts")
     (description "@code{xcharter} repackages Bitstream Charter with an
@@ -10705,7 +10367,7 @@ Type 1 and OTF formats, with supporting files as necessary.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/fonts/ly1/"
+             (list "doc/latex/ly1/"
                    "fonts/enc/dvips/ly1/"
                    "fonts/map/dvips/ly1/"
                    "fonts/tfm/adobe/ly1/"
@@ -10713,7 +10375,7 @@ Type 1 and OTF formats, with supporting files as necessary.")
                    "tex/latex/ly1/"
                    "tex/plain/ly1/")
              (base32
-              "1lks902rr94m3n3r4rc2lm4vvqhqv9prgrpni5ww64rqrv56h8yy")))
+              "0mwk8bfpvpzbwjw3jd6plw0w7kykpb499fv50a9bqxh0jqcyh0j5")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/ly1")
@@ -10759,9 +10421,6 @@ include the addition of rules above or below a section title.")
               "0y8rd3ys71ys9cab172wwhrmbs9b52wqrj6d3p0iy3075z93h51c")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-iftex
-           texlive-kvoptions))
     (home-page "https://ctan.org/pkg/morefloats")
     (synopsis "Increase the number of simultaneous LaTeX floats")
     (description "LaTeX can, by default, only cope with 18 outstanding floats;
@@ -10785,10 +10444,8 @@ floats merely delays the arrival of the inevitable error message.")
               "19bfi12j5ra19k6vjd1q5fjsm68vipa7ida7pg9pf15l5pxwbgqz")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list #:tex-format "latex"))
-    (native-inputs
-     (list texlive-filecontents))
+    (arguments (list #:tex-format "latex"))
+    (native-inputs (list texlive-filecontents))
     (home-page "https://ctan.org/pkg/ifmtarg")
     (synopsis "If-then-else command for processing potentially empty arguments")
     (description
@@ -10808,8 +10465,6 @@ whether an argument is empty.")
               "1dffh7ac13w3gs94lvfxgw1i4k6cfkrpcyikj1sfrqaivrxpmqpi")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-ifmtarg))
     (home-page "https://ctan.org/pkg/pagenote")
     (synopsis "Notes at end of document")
     (description
@@ -10870,11 +10525,10 @@ a physical page.")
                    "source/latex/ifoddpage/"
                    "tex/latex/ifoddpage/")
              (base32
-              "06xn3dwf6aa8j3lmvvgwfadw2ahw770jx91x8nyl8zir58aiys5s")))
+              "0mxi28lf97l4zg5kcv524b29n5r167yczrhgy132hql866vkdvyr")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (native-inputs
-     (list texlive-ydoc))
+    (native-inputs (list texlive-ydoc))
     (home-page "https://ctan.org/pkg/ifoddpage")
     (synopsis "Determine if the current page is odd or even")
     (description
@@ -10898,11 +10552,7 @@ mode where all pages use the odd page layout.")
               "1vbjq9aq2kbncq1dn4rk7jspfb6kcxk66h49z0xz1qix5yg94gmx")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (native-inputs
-     (list texlive-ydoc))
-    (propagated-inputs
-     (list texlive-collectbox
-           texlive-iftex))
+    (native-inputs (list texlive-ydoc))
     (home-page "https://ctan.org/pkg/storebox")
     (synopsis "Storing information for reuse")
     (description
@@ -10923,11 +10573,10 @@ store boxes behave the same as save boxes.")
                    "source/latex/collectbox/"
                    "tex/latex/collectbox/")
              (base32
-              "106k01lgnvikndk48r5ms9xj3gmynv2xy20090frr7sa3g9k42za")))
+              "0mn0hdzjhbmziqqh2k7knfz816lxbjil0zld0n30qi3ila5v3gk6")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (native-inputs
-     (list texlive-ydoc))
+    (native-inputs (list texlive-ydoc))
     (home-page "https://ctan.org/pkg/collectbox")
     (synopsis "Collect and process macro arguments as boxes")
     (description
@@ -10952,7 +10601,7 @@ The macros were designed for use within other macros.")
     (propagated-inputs
      (list texlive-amsfonts
            texlive-bibtex
-           texlive-bin                  ;set GUIX TEXMF and engines
+           texlive-bin                  ;set GUIX_TEXMF and engines
            texlive-cm
            texlive-colorprofiles
            texlive-dvipdfmx
@@ -11076,9 +10725,6 @@ used and strongly recommended in practice.")
               "1x35r10mkjg8dzx7aj99y4dwyf69jgs41qwapdx523lbglywmgxp")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-infwarerr
-           texlive-kvdefinekeys))
     (home-page "https://ctan.org/pkg/grfext")
     (synopsis "Manipulate the @code{graphics} package's list of extensions")
     (description
@@ -11096,20 +10742,12 @@ graphics file extensions recognised by package @code{graphics}.")
                    "source/latex/adjustbox/"
                    "tex/latex/adjustbox/")
              (base32
-              "01r6cb8aadbgsfcqhqnwaig3xwzgr0nfxci3mzb8ln3k4dghmq97")))
+              "02iqc3i3n3d16xx8hgfy5s28h26fhnqf1f4kcxap6rssr165jj3h")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (native-inputs
-     (list texlive-ydoc))
+    (native-inputs (list texlive-ydoc))
     (propagated-inputs
-     (list texlive-collectbox
-           texlive-graphics
-           texlive-ifoddpage
-           texlive-pgf
-           texlive-storebox
-           texlive-tools
-           texlive-varwidth
-           texlive-xkeyval))
+     (list texlive-collectbox texlive-graphics texlive-xkeyval))
     (home-page "https://ctan.org/pkg/adjustbox")
     (synopsis "Graphics package-alike macros for general boxes")
     (description "The package provides several macros to adjust boxed
@@ -11135,10 +10773,6 @@ provided box macros are @code{\\lapbox}, @code{\\marginbox},
               "197v18lsvb90i07gxvc6mrmn1z63q8v0wvcnbk8dnn3hhabpn16y")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-lm
-           texlive-xcolor
-           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/qrcode")
     (synopsis "QR codes without external tools")
     (description
@@ -11154,27 +10788,9 @@ need for PSTricks or any other graphical package.")
              name version
              (list "doc/latex/tcolorbox/" "tex/latex/tcolorbox/")
              (base32
-              "1qnsbblkadzdn1fx2k21xnlwcb35pg9xya24chkm66jmidi22qp0")))
+              "1vygwa4y9mc7qgwf5awi0aa5c5kakbdcsl5kry0ldr1lkaxs1j8w")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-amsmath
-           texlive-environ
-           texlive-etoolbox
-           texlive-hyperref
-           texlive-incgraph
-           texlive-iftex
-           texlive-l3packages
-           texlive-listings
-           texlive-listingsutf8
-           texlive-marvosym
-           texlive-minted
-           texlive-oberdiek             ;for pdfcol
-           texlive-pdftexcmds
-           texlive-pgf
-           texlive-psnfss
-           texlive-refcount
-           texlive-tools))
     (home-page "https://ctan.org/pkg/tcolorbox")
     (synopsis "Coloured boxes, for LaTeX examples and theorems, etc")
     (description
@@ -11198,8 +10814,6 @@ supports saving and reuse of source code and text parts.")
               "1a3203jgxsgihfgb6wwm0gfpaxbf1lg5axcakan9rj316xrrj4lc")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-l3kernel))
     (home-page "https://ctan.org/pkg/ebproof")
     (synopsis "Formal proofs in the style of sequent calculus")
     (description
@@ -11280,9 +10894,9 @@ OpenType fonts.")
     (build-system texlive-build-system)
     (native-inputs (list texlive-cm texlive-metafont))
     (home-page "https://ctan.org/pkg/eurosym")
-    (synopsis "METAFONT and macros for Euro sign")
+    (synopsis "Metafont and macros for Euro sign")
     (description
-     "The European currency symbol for the Euro implemented in METAFONT, using
+     "The European currency symbol for the Euro implemented in Metafont, using
 the official European Commission dimensions, and providing several
 shapes (normal, slanted, bold, outline).  The package also includes a LaTeX
 package which defines the macro, pre-compiled @file{tfm} files, and
@@ -11318,15 +10932,12 @@ may be used under LaTeX and plain TeX.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-              (list "doc/latex/translations/"
-                    "tex/latex/translations/")
-              (base32
-               "0vl7ckpbkjvz3a5snzppb96ncwgmhpwb2p6cg30grfyn421kap3v")))
+             (list "doc/latex/translations/"
+                   "tex/latex/translations/")
+             (base32
+              "16jcpb6afjqcqb8hn47dip2w7l9hg7q1vspg791sp1r1dsn81yf4")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etoolbox
-           texlive-pdftexcmds))
     (home-page "https://ctan.org/pkg/translations")
     (synopsis "Internationalisation of LaTeX2e packages")
     (description
@@ -11352,11 +10963,9 @@ document.")
              (list "doc/latex/translator/"
                    "tex/latex/translator/")
              (base32
-              "13rxdqhvgwc5lz2wsw4jwsb92614wlxsa90rmzxyrc6xjz1jypnk")))
+              "0vmg4w5spl98y9r4h6p89xa43xxfqmv5qlc3sf7kjkyp58px8axs")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics))
     (home-page "https://ctan.org/pkg/translator")
     (synopsis "Easy translation of strings in LaTeX")
     (description
@@ -11377,12 +10986,9 @@ a few words.")
              (list "doc/latex/textpos/" "source/latex/textpos/"
                    "tex/latex/textpos/")
              (base32
-              "0gg6b2ckafj8fbrlw85m538c08qyq2cv5z59r9pzcwg1c1xdyn02")))
+              "0spxbk9w69kcmgib33nq2x7ls8566fg214rcmkb126yyn7jqg567")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-everyshi
-           texlive-graphics))
     (home-page "https://ctan.org/pkg/textpos")
     (synopsis "Place boxes at arbitrary positions on the LaTeX page")
     (description
@@ -11408,13 +11014,8 @@ conference posters.")
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments (list #:tex-format "xelatex"))
-    (propagated-inputs
-     (list texlive-amsmath
-           texlive-fontspec
-           texlive-l3kernel
-           texlive-l3packages
-           texlive-lm-math
-           texlive-lualatex-math))
+    (native-inputs (list texlive-xetex))
+    (propagated-inputs (list texlive-fontspec texlive-lm-math))
     (home-page "https://ctan.org/pkg/unicode-math")
     (synopsis "Unicode mathematics support for XeTeX and LuaTeX")
     (description
@@ -11447,9 +11048,6 @@ fonts:
               "0b33mlmnxsj5mi06v2w2zgamk51mgv1lxdr1cax8nkpn9g7n9axw")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-ifmtarg
-           texlive-tools))
     (home-page "https://ctan.org/pkg/xifthen")
     (synopsis "Extended conditional commands")
     (description
@@ -11477,11 +11075,12 @@ handle complex tests.")
                    "scripts/xindy/"
                    "xindy/")
              (base32
-              "0rgzckyy6w4rmgxins5kakllkpn2hrccaps7lwb8h2nzvd29yj3m")))
+              "12j2bi0wwp1hyxr1427hhigqmhsd1fyg90bvghxkm1qck85r24vf")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
      (list
+      #:link-scripts #~(list "texindy.pl" "xindy.pl")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-inputs
@@ -11538,8 +11137,6 @@ these changes.")
               "16xain8s0azcnhwj5xwh3m365sb9bhdvxanh19kvmnc52dggjc1y")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-amsfonts))
     (home-page "https://ctan.org/pkg/ntheorem")
     (synopsis "Enhanced theorem environment")
     (description
@@ -11562,11 +11159,6 @@ making a list of theorems, analagous to @code{\\listoffigures}.")
               "1biw0g6s2arq6kq52c1yfkl0vzafja2az65c3d0syq0vgjzj9763")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-amsmath
-           texlive-etoolbox
-           texlive-graphics
-           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/fmtcount")
     (synopsis "Display the value of a LaTeX counter in a variety of formats")
     (description
@@ -11596,11 +11188,6 @@ variants), German, Italian, Portuguese and Spanish documents are provided.")
               "0ngbpr4pl7r82jmdhiksp32qvbvggf2nawwqq0pkb7cffp95ya49")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-fontaxes
-           texlive-ly1                  ;requires LY1 font encoding
-           texlive-mweights
-           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/inriafonts")
     (synopsis "Inria fonts with LaTeX support")
     (description
@@ -11625,8 +11212,7 @@ version of the fonts and their associated files.")
               "1piy8ajbbcadsjwp0mhlgxm2ggggnb5sn75arfs5fxiaqrwd572j")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list #:tex-format "latex"))
+    (arguments (list #:tex-format "latex"))
     (home-page "https://ctan.org/pkg/floatflt")
     (synopsis "Wrap text around floats")
     (description
@@ -11644,11 +11230,9 @@ to be set left/right or alternating on even/odd pages.")
              (list "doc/latex/fvextra/" "source/latex/fvextra/"
                    "tex/latex/fvextra/")
              (base32
-              "0nawx1fh55yhqspy5jgss2qmwpqmikfrg7628smk931rph9nq0aa")))
+              "18r3722sf859yn5j1q084ix9gp8sp4znvdlwi2vnrrn36djyvkzj")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etoolbox texlive-fancyvrb texlive-lineno texlive-upquote))
     (home-page "https://ctan.org/pkg/fvextra")
     (synopsis "Extensions and patches for @code{fancyvrb}")
     (description
@@ -11707,25 +11291,6 @@ and selecting references used in a publication.")
             (lambda _
               (substitute* "source/latex/apa6/apa6.ins"
                 (("file\\{\\./.*?/") "file{")))))))
-    (propagated-inputs
-     (list texlive-apacite
-           texlive-babel
-           texlive-biblatex
-           texlive-booktabs
-           texlive-caption
-           texlive-draftwatermark
-           texlive-endnotes
-           texlive-etoolbox
-           texlive-fancyhdr
-           texlive-float
-           texlive-geometry
-           texlive-graphics
-           texlive-lm
-           texlive-substr
-           texlive-threeparttable
-           texlive-times
-           texlive-tools
-           texlive-xstring))
     (home-page "https://ctan.org/pkg/apa6")
     (synopsis "Format documents in APA style (6th edition)")
     (description
@@ -11747,9 +11312,6 @@ mask author identity for copies for use in masked peer review.")
               "0nc86zngk71xpbinrfm8p0413xphc0v86ddhcw94gi2sl00hsmzq")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-natbib
-           texlive-tools))
     (home-page "https://ctan.org/pkg/apacite")
     (synopsis "Citation style following the rules of the APA")
     (description
@@ -11771,8 +11333,6 @@ designed to work with the @code{apa6} class.")
               "1zslmc5g28z6adfyd8bdlbw03jawxmgafq0mgwy811hrbcppb2kg")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics))
     (home-page "https://ctan.org/pkg/endfloat")
     (synopsis "Move floats to the end, leaving markers where they belong")
     (description
@@ -11790,7 +11350,7 @@ the figure (or table) would normally have occurred.")
              (list "doc/latex/was/" "source/latex/was/"
                    "tex/latex/was/")
              (base32
-              "1fp0l9sn9yrhf8hz175dzc2x28byk1ygfirn23am5ak72csmi0cp")))
+              "1c2kmfrm898c69bizw0650w82bjabp3jf57hmqfcb9y625pq0s05")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/was")
@@ -11814,10 +11374,6 @@ maths; and upright Greek letters in maths.")
               "0r08hadnwx9vyppzmbn1bj69b12i5fw1mhk49piw2rqbk01722zk")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etoolbox
-           texlive-l3kernel
-           texlive-l3packages))
     (home-page "https://ctan.org/pkg/xpatch")
     (synopsis "Extending @code{etoolbox} patching commands")
     (description
@@ -11837,9 +11393,6 @@ Lehmann's @code{etoolbox}.")
               "19pvw2ifswxcf8dxw0mzjmqhl592477w5hcfh97f4wpya0dv2m9p")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-environ
-           texlive-threeparttable))
     (home-page "https://ctan.org/pkg/threeparttablex")
     (synopsis "Notes in @code{longtables}")
     (description
@@ -11853,14 +11406,11 @@ package to tables created using the @code{longtable} package.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/lineno/" "source/latex/lineno/"
-                   "tex/latex/lineno/")
+             (list "doc/latex/lineno/" "tex/latex/lineno/")
              (base32
-              "1xf8ljgcj411yqmng89wc49rqfz19j95yqqpnb35dj3qc1chvm2a")))
+              "1naqdd62gld0hx6ss0d7sllnbqslzxjcgzj7cnycs303lb03h738")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-tools))
     (home-page "https://ctan.org/pkg/lineno")
     (synopsis "Line numbers on paragraphs")
     (description
@@ -11901,7 +11451,7 @@ of standard LaTeX names.")
                    "source/generic/babel-dutch/"
                    "tex/generic/babel-dutch/")
              (base32
-              "1s72g2hfnk5nqnrsbiwydh7jb9wy9186h5vy7rh3ngjwkmcfg0pz")))
+              "1iqlhs2zh60n50r69yicxlklxx8msrb8k552j0ffmqf5kh64fpqh")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/babel-dutch")
@@ -11987,7 +11537,7 @@ settings to typeset Danish documents.")
                    "source/generic/babel-polish/"
                    "tex/generic/babel-polish/")
              (base32
-              "0an9csjd4jhz6civdldsrmz7l76hw8zfcgxdp55mj8f1rchsjylx")))
+              "0j86l23y1rq1raq2n5azza07l7xjkpgw9nhm77pzy8xmifp3nzhb")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/babel-polish")
@@ -12010,30 +11560,6 @@ Polish of standard LaTeX names.")
               "1i5rm946wg43rjckxlfhx79zfx5cgd3bxk71206hd1dqkrgpdpa8")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-amsmath
-           texlive-booktabs
-           texlive-csquotes
-           texlive-eso-pic
-           texlive-etoolbox
-           texlive-iftex
-           texlive-geometry
-           texlive-graphics
-           texlive-kantlipsum
-           texlive-kvoptions
-           texlive-l3kernel
-           texlive-l3packages
-           texlive-lipsum
-           texlive-listings
-           texlive-microtype
-           texlive-needspace
-           texlive-ntheorem
-           texlive-oberdiek
-           texlive-pgf
-           texlive-selinput
-           texlive-tools
-           texlive-xcolor
-           texlive-zref))
     (home-page "https://ctan.org/pkg/mdframed")
     (synopsis "Framed environments that can split at page boundaries")
     (description
@@ -12051,7 +11577,7 @@ TikZ.")
              name version
              (list "doc/latex/setspace/" "tex/latex/setspace/")
              (base32
-              "00ik8qgkw3ivh3z827zjf7gbwkbsmdcmv22c6ap543mpgaqqjcfm")))
+              "0bvspbka1jhpysyhh3sd1vkkm6xjj2ahj0mzv2inzqbrrbydr9gr")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/setspace")
@@ -12096,13 +11622,9 @@ Several keys customize the appearance of the chart elements.")
                    "source/latex/pdflscape/"
                    "tex/latex/pdflscape/")
              (base32
-              "05vvmwd8vlzs2x2rm6pfzlvrrihqf924d7krlrkvc6giiwyfsic4")))
+              "0l1m97ai3w8lfdfndmcbwyd8sdwpw4wp7zn6c4iqkf8bqwrmqyk8")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-atbegshi
-           texlive-graphics
-           texlive-iftex))
     (home-page "https://ctan.org/pkg/pdflscape")
     (synopsis "Make landscape pages display as landscape")
     (description
@@ -12180,10 +11702,7 @@ superseded by @code{pict2e}.")
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
-     (list texlive-etoolbox
-           texlive-pgf
-           texlive-tracklang
-           texlive-xkeyval))
+     (list texlive-etoolbox texlive-tracklang texlive-xkeyval))
     (home-page "https://ctan.org/pkg/datetime2")
     (synopsis "Formats for dates, times and time zones")
     (description
@@ -12200,29 +11719,29 @@ replaces @code{datetime.sty}, which is now obsolete.")
     (license license:lppl1.3+)))
 
 (define-public texlive-tracklang
-(package
-  (name "texlive-tracklang")
-  (version (number->string %texlive-revision))
-  (source (texlive-origin
-           name version
-           (list "doc/generic/tracklang/"
-                 "source/latex/tracklang/"
-                 "tex/generic/tracklang/"
-                 "tex/latex/tracklang/")
-           (base32
-            "1386sg25y6zb4ixvrbdv6n1gp54h18mjd984bnwwqda6jafxx4zr")))
-  (outputs '("out" "doc"))
-  (build-system texlive-build-system)
-  (home-page "https://ctan.org/pkg/tracklang")
-  (synopsis "Language and dialect tracker")
-  (description
-   "The @code{tracklang} package is provided for package developers who want
+  (package
+    (name "texlive-tracklang")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/tracklang/"
+                   "source/latex/tracklang/"
+                   "tex/generic/tracklang/"
+                   "tex/latex/tracklang/")
+             (base32
+              "0y8kdr5v033dp79fqfdc1jpp1x3lv0yjz5fjd6yk2xxw30lps1s9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tracklang")
+    (synopsis "Language and dialect tracker")
+    (description
+     "The @code{tracklang} package is provided for package developers who want
 a simple interface to find out which languages the user has requested through
 packages such as @code{babel} or @code{polyglossia}.  This package does not
 provide any translations!  Its purpose is simply to track which languages have
 been requested by the user.  Generic TeX code is in @file{tracklang.tex} for
 non-LaTeX users.")
-  (license license:lppl1.3+)))
+    (license license:lppl1.3+)))
 
 (define-public texlive-ltablex
   (package
@@ -12235,8 +11754,6 @@ non-LaTeX users.")
               "14lmgj820j6zwj1xnd6ad38kzb9w132kp7sp55cv5bk9vhx3621w")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-tools))
     (home-page "https://ctan.org/pkg/ltablex")
     (synopsis "Table package extensions")
     (description
@@ -12255,14 +11772,10 @@ tables).")
              (list "doc/latex/ragged2e/" "source/latex/ragged2e/"
                    "tex/latex/ragged2e/")
              (base32
-              "1cxj5jdgvr3xk1inrb3yzpm3l386jjawgpqiwsz53k6yshb6yfml")))
+              "06wr2x7mgd40wdq3dnjg3rp5p41fqk6lsj28652i6g71rhnga3sc")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list #:tex-format "latex"))
-    (propagated-inputs
-     (list texlive-everysel
-           texlive-footmisc))
+    (arguments (list #:tex-format "latex"))
     (home-page "https://ctan.org/pkg/ragged2e")
     (synopsis "Alternative versions of ragged-type commands")
     (description
@@ -12286,8 +11799,6 @@ altogether).")
               "0ckfm04kfi67babpn3m99nqj4b9r1fs0ivq5m7yz90mz4lqykhbs")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-graphics))
     (home-page "https://ctan.org/pkg/refstyle")
     (synopsis "Advanced formatting of cross references")
     (description
@@ -12356,8 +11867,7 @@ layout, etc.")
               "0skzm2qsk5vpjxgslclp4pvbbcrrnm1w3df8xfvfq252dyd7w8s5")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments
-     (list #:tex-format "latex"))
+    (arguments (list #:tex-format "latex"))
     (home-page "https://ctan.org/pkg/everysel")
     (synopsis "Provides hooks into @code{\\selectfont}")
     (description
@@ -12454,15 +11964,9 @@ abstract in a two column paper.")
              (list "doc/latex/breqn/" "source/latex/breqn/"
                    "tex/latex/breqn/")
              (base32
-              "0w6jk97jmgwgshr9a3isbpwsh0fhrkzp36gywdiai1f5x2sldmpv")))
+              "03iyxwcr94f2y7ar7qin5nzjcvmamhblv5lxb97dg6r79mk4wr75")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-amsfonts
-           texlive-amsmath
-           texlive-graphics
-           texlive-l3kernel
-           texlive-tools))
     (home-page "https://ctan.org/pkg/breqn")
     (synopsis "Automatic line breaking of displayed equations")
     (description
@@ -12486,8 +11990,6 @@ displayed equations.  The bundle also contains the @code{flexisym} and
               "1lihfrihf1i300sddz09rsn6gj30g299warn88gli9hbrfy6nvw5")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-iftex texlive-xkeyval))
     (home-page "https://ctan.org/pkg/breakurl")
     (synopsis "Line-breakable links in @code{hyperref} for dvips/ps2pdf")
     (description
@@ -12529,15 +12031,7 @@ controlled comment versions.")
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
-     (list texlive-amsmath
-           texlive-etoolbox
-           texlive-fp
-           texlive-mfirstuc
-           texlive-pgf
-           texlive-substr
-           texlive-tools
-           texlive-xfor
-           texlive-xkeyval))
+     (list texlive-fp texlive-substr texlive-xfor texlive-xkeyval))
     (home-page "https://ctan.org/pkg/datatool")
     (synopsis "Tools to load and manipulate data")
     (description
@@ -12559,9 +12053,6 @@ bibliographies, and displaying personal pronouns.")
               "1wy58wwcv1pv18xs1n71abnm73dqnxqijxvhfxk0rcmvbc6wvwrb")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-amsmath
-           texlive-l3packages))
     (home-page "https://ctan.org/pkg/physics")
     (synopsis "Macros supporting the Mathematics of Physics")
     (description
@@ -12594,11 +12085,6 @@ notation.")
               "18z7ln8dyh0sp6v0vdvc6qqxnpg3h3ix0f5magjcjbpay54kl0i3")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-fontaxes
-           texlive-iftex
-           texlive-mweights
-           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/sourcesanspro")
     (synopsis "Use Source Sans Pro with TeX(-alike) systems")
     (description
@@ -12626,11 +12112,6 @@ in LaTeX (Type 1) and XeLaTeX/LuaLaTeX (OTF).")
               "18xxncg8ybv86r46zq5mvgkrfnvlhx93n55fy8nkk8vdmminrh8w")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-fontaxes
-           texlive-iftex
-           texlive-mweights
-           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/sourceserifpro")
     (synopsis "Use Source Serif Pro with TeX(-alike) systems")
     (description
@@ -12658,11 +12139,6 @@ fonts in LaTeX (Type 1) and XeLaTeX/LuaLaTeX (OTF).")
               "009v9y7d3vsljgq9nw5yx4kzyqavxbwrlvwhfjj83s6rmb9xcrmh")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-fontaxes
-           texlive-iftex
-           texlive-mweights
-           texlive-xkeyval))
     (home-page "https://ctan.org/pkg/sourcecodepro")
     (synopsis "Use Source Code Pro with TeX(-alike) systems")
     (description "This package provides the Source Code Pro font family from
@@ -12703,7 +12179,7 @@ underscores), and hyphenation of text typeset in monospaced (e.g.,
              (list "doc/latex/lastpage/" "source/latex/lastpage/"
                    "tex/latex/lastpage/")
              (base32
-              "1cmzl0jkid4w60bjlyxrc5bynbc3lwq5nr77rsip0q9hprxykxks")))
+              "0rb8kmslmxxr41g9nxmk60m0w0f3428kci42xys21lq4jrdsdz0m")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/lastpage")
@@ -12752,7 +12228,7 @@ defined tab stop.")
              (list "doc/generic/soul/" "source/generic/soul/"
                    "tex/generic/soul/")
              (base32
-              "0ikipdswzsafi4rr6q9xh3hkxk2n2683ym1879qcax41xs6cizdl")))
+              "1q6qd5fcqs9n49jxa77ildvdcdcqpw914m2xn9wggkp4d2kvxzh1")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/soul")
@@ -12762,33 +12238,12 @@ defined tab stop.")
 underlining, striking out, etc., using the TeX hyphenation algorithm to find
 the proper hyphens automatically.  The package also provides a mechanism that
 can be used to implement similar tasks, that have to treat text syllable by
-syllable.  The package itself does not support UTF-8 input in ordinary
-(PDF)LaTeX; some UTF-8 support is offered by package @code{soulutf8}.")
+syllable.  This version is a merge of the original @code{soul} package and the
+@code{soulutf8} package and supports also UTF-8.")
     (license license:lppl)))
 
 (define-deprecated-package texlive-generic-soul texlive-soul)
-
-(define-public texlive-soulutf8
-  (package
-    (name "texlive-soulutf8")
-    (version (number->string %texlive-revision))
-    (source (texlive-origin
-             name version
-             (list "doc/latex/soulutf8/" "source/latex/soulutf8/"
-                   "tex/generic/soulutf8/")
-             (base32
-              "0d9lv3xsads8ms642ys3pghxnsa2hlzafkcx66d2hbq224bz1phc")))
-    (outputs '("out" "doc"))
-    (build-system texlive-build-system)
-    (propagated-inputs
-     (list texlive-etexcmds texlive-infwarerr texlive-soul))
-    (home-page "https://ctan.org/pkg/soulutf8")
-    (synopsis "Permit use of UTF-8 characters in @code{soul}")
-    (description
-     "This package extends package @code{soul} and adds some support for
-UTF-8.  Namely the input encodings in @file{utf8.def} from package
-@code{inputenc} and @file{utf8x.def} from package @code{ucs} are supported.")
-    (license license:lppl1.3+)))
+(define-deprecated-package texlive-soulutf8 texlive-soul)
 
 (define-public texlive-xstring
   (package
@@ -12798,7 +12253,7 @@ UTF-8.  Namely the input encodings in @file{utf8.def} from package
              name version
              (list "doc/generic/xstring/" "tex/generic/xstring/")
              (base32
-              "1azpq855kq1l4686bjp8haxim5c8wycz1b6lcg5q7x8kb4g9sppn")))
+              "1sm84z6nlxipv10ydaww5yl4l2c31hznx3vzzqzaw1gi2yi2d6bb")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/xstring")
@@ -12847,7 +12302,6 @@ of occurrences of a substring.")
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments (list #:tex-format "latex"))
-    (propagated-inputs (list texlive-graphics))
     (home-page "https://ctan.org/pkg/totcount")
     (synopsis "Find the last value of a counter")
     (description
@@ -12871,7 +12325,6 @@ changed, the recorded value will usually be the maximum value.")
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments (list #:tex-format "latex"))
-    (propagated-inputs (list texlive-everyshi texlive-graphics))
     (home-page "https://ctan.org/pkg/totpages")
     (synopsis "Count pages in a document, and report last page number")
     (description
@@ -12890,7 +12343,7 @@ itself may be shipped out to the DVI file.")
                    "doc/man/man1/xdvi.man1.pdf" "dvips/xdvi/"
                    "xdvi/")
              (base32
-              "17cqim8dwsbpcr7cd97fklsyaiwj7d7d0k2zkcv7981fcqinw5pn")))
+              "1iidl3876vyi9k2dyfwd73q5kb53kwckivfyvvxh953n4axbqmi4")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/xdvi")
@@ -12922,19 +12375,27 @@ that it will build with web2c out of the box.")
   (package
     (name "texlive-xetex")
     (version (number->string %texlive-revision))
-    (source (texlive-origin
-             name version
-             (list "doc/man/man1/xelatex.1"
-                   "doc/man/man1/xelatex.man1.pdf"
-                   "doc/man/man1/xetex.1"
-                   "doc/man/man1/xetex.man1.pdf"
-                   "doc/xetex/base/"
-                   "fonts/misc/xetex/fontmapping/base/")
-             (base32
-              "15bjr41p9l5d6837hy3nrhkkylgv04b0150vysyg5730svh3fnan")))
+    (source  (texlive-origin
+              name version
+              (list "doc/man/man1/xelatex-unsafe.1"
+                    "doc/man/man1/xelatex-unsafe.man1.pdf"
+                    "doc/man/man1/xelatex.1"
+                    "doc/man/man1/xelatex.man1.pdf"
+                    "doc/man/man1/xetex-unsafe.1"
+                    "doc/man/man1/xetex-unsafe.man1.pdf"
+                    "doc/man/man1/xetex.1"
+                    "doc/man/man1/xetex.man1.pdf"
+                    "doc/xetex/base/"
+                    "fonts/misc/xetex/fontmapping/base/"
+                    "scripts/texlive-extra/xelatex-unsafe.sh"
+                    "scripts/texlive-extra/xetex-unsafe.sh")
+              (base32
+               "1fc1b3pmzg6g80jnl7ixqbk79wd6frf477nvgxs1sf56vf9r3vjw")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments (list #:create-formats #~(list "xelatex" "xetex")))
+    (arguments
+     (list #:link-scripts #~(list "xelatex-unsafe.sh" "xetex-unsafe.sh")
+           #:create-formats #~(list "xelatex" "xetex")))
     (propagated-inputs
      (list texlive-atbegshi
            texlive-atveryend
diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm
index cbe4cefe24..88372faa58 100644
--- a/guix/build-system/texlive.scm
+++ b/guix/build-system/texlive.scm
@@ -34,8 +34,7 @@
             texlive-ref
             texlive-origin
             %texlive-tag
-            %texlive-revision
-            %texlive-date))
+            %texlive-revision))
 
 ;; Commentary:
 ;;
@@ -45,9 +44,8 @@
 
 ;; These variables specify the SVN tag and the matching SVN revision.  They
 ;; are taken from https://www.tug.org/svn/texlive/tags/
-(define %texlive-tag "texlive-2021.3")
-(define %texlive-revision 59745)
-(define %texlive-date "2021-06-28 21:59:21Z")
+(define %texlive-tag "texlive-2023.0")
+(define %texlive-revision 66594)
 
 (define (texlive-origin name version locations hash)
   "Return an <origin> object for a TeX Live package consisting of multiple
-- 
cgit 1.4.1


From 9ea5b4681cb33b175235252a48a3a57ce35cbfe8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 13:00:33 +0200
Subject: gnu: Add texlive-amiri.

* gnu/packages/tex.scm (texlive-amiri): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 80d1d33be2..e32d5cd42d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1826,6 +1826,29 @@ Taco Hoekwater.")
 processing the output of Metafont.")
     (license license:public-domain)))
 
+(define-public texlive-amiri
+  (package
+    (name "texlive-amiri")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/amiri/"
+                   "fonts/truetype/public/amiri/")
+             (base32
+              "1d6yrh34fka9371a3vq72df593prik6s7z1i6myd0nix0c9jihp6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/amiri")
+    (synopsis "Classical Arabic typeface, Naskh style")
+    (description
+     "Amiri is a classical Arabic typeface in Naskh style for typesetting books
+and other running text.  It is a revival of the beautiful typeface pioneered
+in the early 20th century by Bulaq Press in Cairo, also known as Amiria Press,
+after which the font is named.  The project aims at the revival of the
+aesthetics and traditions of Arabic typesetting, and adapting it to the era of
+digital typesetting, in a publicly available form.")
+    (license license:silofl1.1)))
+
 (define-public texlive-amsfonts
   (package
     (name "texlive-amsfonts")
-- 
cgit 1.4.1


From 404c4259d13b95661241aad95d36cd71130fa2f8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 15:17:45 +0200
Subject: gnu: Add texlive-noto.

* gnu/packages/tex.scm (texlive-noto): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e32d5cd42d..6733d78f83 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4814,6 +4814,32 @@ collect an argument verbatim to either typeset or write it into a file.  The
 used to write the verbatim text to a file.")
     (license license:lppl1.3+)))
 
+(define-public texlive-noto
+  (package
+    (name "texlive-noto")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/noto/"
+                   "fonts/enc/dvips/noto/"
+                   "fonts/map/dvips/noto/"
+                   "fonts/tfm/google/noto/"
+                   "fonts/truetype/google/noto/"
+                   "fonts/type1/google/noto/"
+                   "fonts/vf/google/noto/"
+                   "tex/latex/noto/")
+             (base32
+              "14nf6xd85cb5s9f1sk8zzshgfhjda0r712dp592j8cb4s5v2hf7p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/noto")
+    (synopsis "Support for Noto fonts")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the NotoSerif, NotoSans and NotoSansMono families of fonts, designed by Steve
+Matteson for Google.")
+    (license (list license:lppl license:silofl1.1))))
+
 (define-public texlive-pdftexcmds
   (package
     (name "texlive-pdftexcmds")
@@ -5619,6 +5645,7 @@ also provides compacted versions of @code{enumerate} and @code{itemize}.")
            font-linuxlibertine
            font-sil-ezra
            fontconfig                   ;for XDG_DATA_DIRS (to locate fonts)
+           texlive-amiri
            texlive-babel
            texlive-bidi
            texlive-booktabs
@@ -5633,6 +5660,7 @@ also provides compacted versions of @code{enumerate} and @code{itemize}.")
            texlive-libertine
            texlive-metalogo
            texlive-microtype
+           texlive-noto
            texlive-paralist
            texlive-pdftexcmds
            texlive-tex
-- 
cgit 1.4.1


From 6902250a949ba2862d95272e890661cf7ba7bb84 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:04:40 +0200
Subject: gnu: Add texlive-attachfile2.

* gnu/packages/tex.scm (texlive-attachfile2): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6733d78f83..148ab0c234 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2346,6 +2346,33 @@ a per-attachment basis.  @code{attachfile} makes it easy to attach files and
 customize their appearance in the enclosing document.")
     (license license:lppl1.3+)))
 
+(define-public texlive-attachfile2
+  (package
+    (name "texlive-attachfile2")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/attachfile2/"
+                   "doc/man/man1/pdfatfi.1"
+                   "doc/man/man1/pdfatfi.man1.pdf"
+                   "scripts/attachfile2/"
+                   "source/latex/attachfile2/"
+                   "tex/latex/attachfile2/")
+             (base32
+              "14glnfyp58ka78l5kc09mc96km7jd77qvsby0p8dpjhvwf6qfzg8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "pdfatfi.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/attachfile2")
+    (synopsis "Attach files into PDF")
+    (description
+     "This package can be used to attach files to a PDF document.  It is
+a further development of Scott Pakin's package @code{attachfile} for pdfTeX.
+Apart from bug fixes, this package adds support for dvips, some new options,
+and gets and writes meta information data about the attached files.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-atveryend
   (package
     (name "texlive-atveryend")
-- 
cgit 1.4.1


From f1417b94f0f52cdbf8389add0bfaaa5c25d44b38 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:05:26 +0200
Subject: gnu: Add texlive-crop.

* gnu/packages/tex.scm (texlive-crop): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 148ab0c234..0f1e6d793b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1568,6 +1568,32 @@ support (for use with a variety of encodings) is provided.")
     ;; additional but not legally binding clause.
     (license license:lppl1.3c+)))
 
+(define-public texlive-crop
+  (package
+    (name "texlive-crop")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/crop/" "source/latex/crop/"
+                   "tex/latex/crop/")
+             (base32
+              "1m0dg69bhbvqrq9d2yl6ip36w1bf5cibp386jj2wbywisa2hn3qf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/crop")
+    (synopsis "Support for cropmarks")
+    (description
+     "This package provides a package providing corner marks for camera
+alignment as well as for trimming paper stacks, and additional page
+information on every page if required.  Most macros are easily adaptable to
+personal preferences.  An option is provided for selectively suppressing
+graphics or text, which may be useful for printing just colour graphics on
+a colour laser printer and the rest on a cheap mono laser printer.  A page
+info line contains the time and a new cropmarks index and is printed at the
+top of the page.  A configuration command is provided for the info line font.
+Options for better collaboration with dvips, pdfTeX and vtex are provided.")
+    (license license:lppl)))
+
 (define-public texlive-ctablestack
   (package
     (name "texlive-ctablestack")
-- 
cgit 1.4.1


From 65a17e01f493f955880abf960e8eae9da69713fe Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:06:19 +0200
Subject: gnu: Add texlive-ctable.

* gnu/packages/tex.scm (texlive-ctable): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0f1e6d793b..3d077978e9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3962,6 +3962,25 @@ The OPmac macros can generate a bibliography without any external program.")
     ;; that says the package must be renamed from 'csplain' if it is modified.
     (license (license:non-copyleft "file:///tex/csplain/base/csplain.ini"))))
 
+(define-public texlive-ctable
+  (package
+    (name "texlive-ctable")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ctable/" "source/latex/ctable/"
+                   "tex/latex/ctable/")
+             (base32
+              "1x624vz1gv8bsdafwhx89zaic7f2mz9vlvwjpv8fwzjhjwx4lxmv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ctable")
+    (synopsis "Flexible typesetting of table and figure floats")
+    (description
+     "This package provides commands to typeset centered, left- or
+right-aligned table and (multiple-)figure floats, with footnotes.")
+    (license license:lppl)))
+
 (define-public texlive-babel-english
   (package
     (name "texlive-babel-english")
-- 
cgit 1.4.1


From a8a990ff0e8855218a88854d40129173d0ca48f1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:06:46 +0200
Subject: gnu: Add texlive-euler.

* gnu/packages/tex.scm (texlive-euler): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3d077978e9..d91a18c977 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8511,6 +8511,29 @@ format.")
 
 (define-deprecated-package texlive-latex-eukdate texlive-eukdate)
 
+(define-public texlive-euler
+  (package
+    (name "texlive-euler")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/euler/" "source/latex/euler/"
+                   "tex/latex/euler/")
+             (base32
+              "0xd4lniaj243jvmlgfan7rp1zx308cfvpdd02nvvqpdnrwc69irk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/euler")
+    (synopsis "Use AMS Euler fonts for math")
+    (description
+     "This package provides a setup for using the AMS Euler family of fonts
+for mathematics in LaTeX documents. ``The underlying philosophy of Zapf's
+Euler design was to capture the flavour of mathematics as it might be written
+by a mathematician with excellent handwriting.'' The @code{euler} package is
+based on Knuth's macros for the book Concrete Mathematics'.  The text fonts
+for the Concrete book are supported by the @code{beton} package.")
+    (license license:lppl)))
+
 (define-public texlive-ulem
   (package
     (name "texlive-ulem")
-- 
cgit 1.4.1


From 7c92f707445b3826efa28f1e465df726d8fad287 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:07:10 +0200
Subject: gnu: Add texlive-extsizes.

* gnu/packages/tex.scm (texlive-extsizes): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d91a18c977..a9ac2d9afc 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8534,6 +8534,27 @@ based on Knuth's macros for the book Concrete Mathematics'.  The text fonts
 for the Concrete book are supported by the @code{beton} package.")
     (license license:lppl)))
 
+(define-public texlive-extsizes
+  (package
+    (name "texlive-extsizes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/extsizes/" "tex/latex/extsizes/")
+             (base32
+              "1akxh0x8y1rhmpq8qzqi2bpbm1ffy8x0212jkyib7gm1i1d9ijgl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/extsizes")
+    (synopsis "Extend the standard classes' size options")
+    (description
+     "This package provides classes @code{extarticle}, @code{extreport},
+@code{extletter}, @code{extbook} and @code{extproc} which provide for
+documents with a base font size from 8-20pt.  There is also a LaTeX package,
+@file{extsizes.sty}, which can be used with nonstandard document classes.  But
+it cannot be guaranteed to work with any given class.")
+    (license license:lppl)))
+
 (define-public texlive-ulem
   (package
     (name "texlive-ulem")
-- 
cgit 1.4.1


From 18f6ab04e9de69fd805295e9ec6249c554008625 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:07:41 +0200
Subject: gnu: Add texlive-fancyref.

* gnu/packages/tex.scm (texlive-fancyref): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a9ac2d9afc..35c42d037c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6089,6 +6089,27 @@ would automatically change the heading style in use).")
 
 (define-deprecated-package texlive-latex-fancyhdr texlive-fancyhdr)
 
+(define-public texlive-fancyref
+  (package
+    (name "texlive-fancyref")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fancyref/"
+                   "source/latex/fancyref/"
+                   "tex/latex/fancyref/")
+             (base32
+              "0njgl53f5farwbd8xkw8im8id0scf6agbfqcdjkbqlk540vdzwbp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fancyref")
+    (synopsis "LaTeX package for fancy cross-referencing")
+    (description
+     "This package provides fancy cross-referencing support, based on the
+package's reference commands (@code{\\fref} and @code{\\Fref}) that recognise
+what sort of object is being referenced.")
+    (license license:gpl3+)))
+
 (define-public texlive-float
   (package
     (name "texlive-float")
-- 
cgit 1.4.1


From 3cac23ebb5351cc71c07662d45688a669fc698f5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:08:08 +0200
Subject: gnu: Add texlive-footnotehyper.

* gnu/packages/tex.scm (texlive-footnotehyper): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 35c42d037c..685f445f1a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6160,6 +6160,27 @@ footnotes with symbols rather than numbers.")
 
 (define-deprecated-package texlive-latex-footmisc texlive-footmisc)
 
+(define-public texlive-footnotehyper
+  (package
+    (name "texlive-footnotehyper")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/footnotehyper/"
+                   "source/latex/footnotehyper/"
+                   "tex/latex/footnotehyper/")
+             (base32
+              "0f8d13zr07bl295rvpagj99s9fn4dgrcjzv1xpjmla3h6xhrv914")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/footnotehyper")
+    (synopsis "hyperref aware @file{footnote.sty}")
+    (description
+     "The @code{footnote} package by Mark Wooding dates back to 1997 and has
+not been made @code{hyperref} compatible.  The aim of the present package is
+to do that.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-letltxmacro
   (package
     (name "texlive-letltxmacro")
-- 
cgit 1.4.1


From 89193c050c19d56b0782afc11eba5895e7b9f52d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:08:35 +0200
Subject: gnu: Add texlive-hologo.

* gnu/packages/tex.scm (texlive-hologo): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 685f445f1a..dd4033e6e3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -916,6 +916,28 @@ out to date by @code{unicode-letters.tex}.")
 
 (define-deprecated-package texlive-generic-unicode-data texlive-unicode-data)
 
+(define-public texlive-hologo
+  (package
+    (name "texlive-hologo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/hologo/"
+                   "source/generic/hologo/"
+                   "tex/generic/hologo/")
+             (base32
+              "0n62zwz93ab6vfb0hd2h0ncj9gwavg01i3djj7wyr7gyj20xb34x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hologo")
+    (synopsis "Collection of logos with bookmark support")
+    (description
+     "The package defines a single command @code{\\hologo}, whose argument is
+the usual case-confused ASCII version of the logo.  The command is
+bookmark-enabled, so that every logo becomes available in bookmarks without
+further work.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-hopatch
   (package
     (name "texlive-hopatch")
-- 
cgit 1.4.1


From 2189b941be1149cfa8645b9368c65c513ebe34f6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:10:48 +0200
Subject: gnu: Add texlive-index.

* gnu/packages/tex.scm (texlive-index): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dd4033e6e3..8c757c0695 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1008,6 +1008,27 @@ article into an exceptions file, together with a recent copy of the article
 and machine-readable files.")
     (license license:public-domain)))
 
+(define-public texlive-index
+  (package
+    (name "texlive-index")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/index/" "doc/latex/index/"
+                   "makeindex/index/" "source/latex/index/"
+                   "tex/latex/index/")
+             (base32
+              "0f1infc8fcpw16crciampy4cqqhl4hzypyfacbwsk4cnl0fyivns")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/index")
+    (synopsis "Extended index for LaTeX including multiple indexes")
+    (description
+     "This is a reimplementation of LaTeX's indexing macros to provide better
+support for indexing.  For example, it supports multiple indexes in a single
+document and provides a more robust @code{\\index} command.")
+    (license license:lppl1.2+)))        ;from "index.dtx"
+
 (define-public texlive-dvipdfmx
   (package
     (name "texlive-dvipdfmx")
-- 
cgit 1.4.1


From 7eb2b52ca07f890fd539051f73b2bd86f273ffa8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:11:44 +0200
Subject: gnu: Add texlive-l3experimental.

* gnu/packages/tex.scm (texlive-l3experimental): New variable.
---
 gnu/packages/tex.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8c757c0695..b308d0a5c5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3156,6 +3156,68 @@ of file names.")
 
 (define-deprecated-package texlive-latex-url texlive-url)
 
+(define-public texlive-l3experimental
+  (package
+    (name "texlive-l3experimental")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/l3experimental/"
+                   "source/latex/l3experimental/l3benchmark/"
+                   "source/latex/l3experimental/l3bitset/"
+                   "source/latex/l3experimental/l3draw/"
+                   "source/latex/l3experimental/l3graphics/"
+                   "source/latex/l3experimental/l3opacity/"
+                   "source/latex/l3experimental/l3str/"
+                   "source/latex/l3experimental/l3sys-shell/"
+                   "source/latex/l3experimental/xcoffins/"
+                   "source/latex/l3experimental/xgalley/"
+                   "tex/latex/l3experimental/l3benchmark/"
+                   "tex/latex/l3experimental/l3bitset/"
+                   "tex/latex/l3experimental/l3draw/"
+                   "tex/latex/l3experimental/l3graphics/"
+                   "tex/latex/l3experimental/l3opacity/"
+                   "tex/latex/l3experimental/l3str/"
+                   "tex/latex/l3experimental/l3sys-shell/"
+                   "tex/latex/l3experimental/xcoffins/"
+                   "tex/latex/l3experimental/xgalley/")
+             (base32
+              "1s4v0f29hk5racmvj4imyn6d2az7i94s4fq3hag11hr08ipvi51v")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-l3kernel))
+    (home-page "https://ctan.org/pkg/l3experimental")
+    (synopsis "Experimental LaTeX3 concepts")
+    (description
+     "The l3experimental packages are a collection of experimental
+implementations for aspects of the LaTeX3 kernel, dealing with higher-level
+ideas such as the Designer Interface.  Some of them work as stand alone
+packages, providing new functionality, and can be used on top of LaTeX2e with
+no changes to the existing kernel.  The present release includes:
+@itemize @code
+@item l3benchmark
+for measuring the time taken by TeX to run certain code;
+@item l3draw
+a code-level interface for constructing drawings;
+@item l3graphics
+an interface for the inclusion of graphics files;
+@item l3opacity
+support for opacity in PDF output;
+@item l3str
+support for string manipulation;
+@item l3bitset
+support for bit vectors;
+@item l3sys-shell
+which provides abstractions for common shell functions like file
+deletion and copying;
+@item xcoffins
+which allows the alignment of boxes using a series of handle positions,
+supplementing the simple TeX reference point;
+@item xgalley
+which controls boxes receiving text for typesetting.
+@end itemize")
+    (license license:lppl1.3c)))
+
 (define-public texlive-l3kernel
   (package
     (name "texlive-l3kernel")
-- 
cgit 1.4.1


From 4035d83664ecb16e8b5ee30eaca6842942429c95 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:12:10 +0200
Subject: gnu: Add texlive-latexbug.

* gnu/packages/tex.scm (texlive-latexbug): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b308d0a5c5..df0a28079d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -770,6 +770,28 @@ it should not be processed without Knuth's direct permission.")
 document formating commands extended by a wide range of packages.")
     (license license:lppl1.3c)))
 
+(define-public texlive-latexbug
+  (package
+    (name "texlive-latexbug")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/latexbug/"
+                   "source/latex/latexbug/"
+                   "tex/latex/latexbug/")
+             (base32
+              "0l9cyw41knbw3prsi4rbd2av4qfpkvzjs754847kv72dq1304m1i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/latexbug")
+    (synopsis "Bug-classification for LaTeX related bugs")
+    (description
+     "The package is written in order to help identifying the rightful
+addressee for a bug report.  The LaTeX team asks that it will be loaded in any
+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-bidi
   (package
     (name "texlive-bidi")
-- 
cgit 1.4.1


From 54ffc9e7fcb3400c88f98bc5b4a486bb5b916c03 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:12:35 +0200
Subject: gnu: Add texlive-mathspec.

* gnu/packages/tex.scm (texlive-mathspec): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index df0a28079d..bb03ccfbe2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10337,6 +10337,25 @@ glyphs and the uppercase letters commonly used to represent various number
 sets.  LaTeX macro support is provided in package @code{psnfss}.")
     (license license:gpl3+)))
 
+(define-public texlive-mathspec
+  (package
+    (name "texlive-mathspec")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/mathspec/"
+                   "tex/xelatex/mathspec/")
+             (base32
+              "0bfdzlim2kkvfzs8p7brwlc46qy41hvxb72xr53ijg2kplsqmkh8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mathspec")
+    (synopsis "Specify arbitrary fonts for mathematics in XeTeX")
+    (description
+     "The mathspec package provides an interface to typeset mathematics in
+XeLaTeX with arbitrary text fonts using @code{fontspec} as a backend.")
+    (license license:lppl)))
+
 (define-public texlive-fp
   (package
     (name "texlive-fp")
-- 
cgit 1.4.1


From e325aacc499c7f1e0a89284fc27e0668570501fb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:13:11 +0200
Subject: gnu: Add texlive-mathtools.

* gnu/packages/tex.scm (texlive-mathtools): New variable.
---
 gnu/packages/tex.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bb03ccfbe2..daf275f2a3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10356,6 +10356,41 @@ sets.  LaTeX macro support is provided in package @code{psnfss}.")
 XeLaTeX with arbitrary text fonts using @code{fontspec} as a backend.")
     (license license:lppl)))
 
+(define-public texlive-mathtools
+  (package
+    (name "texlive-mathtools")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mathtools/"
+                   "source/latex/mathtools/"
+                   "tex/latex/mathtools/")
+             (base32
+              "11rs5wd1m5f3y309gdlq47vj3xzs8m87qlbd7b6glhq8lx8wfbd6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mathtools")
+    (synopsis "Mathematical tools to use with @code{amsmath}")
+    (description
+     "Mathtools provides a series of packages designed to enhance the
+appearance of documents containing a lot of mathematics.  It is based on
+@code{amsmath} and fixes various deficiencies of it and standard LaTeX.  It
+provides:
+@itemize
+@item Extensible symbols, such as brackets, arrows, harpoons, etc.;
+@item Various symbols such as \\coloneqq (:=);
+@item Easy creation of new tag forms;
+@item Showing equation numbers only for referenced equations;
+@item Extensible arrows, harpoons and hookarrows;
+@item Starred versions of the @code{matrix} environments for specifying the
+column alignment;
+@item More building blocks: multlined, cases-like environments, new gathered
+environments;
+@item Maths versions of @code{\\makebox}, @code{\\llap}, @code{\\rlap} etc.;
+@item Cramped math styles; and more...
+@end itemize")
+    (license license:lppl1.3c)))
+
 (define-public texlive-fp
   (package
     (name "texlive-fp")
-- 
cgit 1.4.1


From dbd5df621dc9fe12317c71bb457939e61152cff0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:13:29 +0200
Subject: gnu: Add texlive-memoir.

* gnu/packages/tex.scm (texlive-memoir): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index daf275f2a3..b2262a2a6a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10391,6 +10391,29 @@ environments;
 @end itemize")
     (license license:lppl1.3c)))
 
+(define-public texlive-memoir
+  (package
+    (name "texlive-memoir")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/memoir/" "makeindex/memoir/"
+                   "source/latex/memoir/" "tex/latex/memoir/")
+             (base32
+              "10jf0kiwvgrki8az04b57v0ffm6b3jj1rz3q6fgxhnrbsd68iphr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/memoir")
+    (synopsis "Typeset fiction, non-fiction and mathematical books")
+    (description
+     "The @code{memoir} class is for typesetting poetry, fiction,
+non-fiction, and mathematical works.  Permissible document base font sizes
+range from 9 to 60pt.  There is a range of page-styles and well over a dozen
+chapter-styles to choose from, as well as methods for specifying your own
+layouts and designs.  The class also provides the functionality of over thirty
+of the more popular packages, thus simplifying document sources.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-fp
   (package
     (name "texlive-fp")
-- 
cgit 1.4.1


From 62bed0638c2c19846148aead06ca7a480175e407 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:14:10 +0200
Subject: gnu: Add texlive-ntgclass.

* gnu/packages/tex.scm (texlive-ntgclass): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b2262a2a6a..7cb35aeebb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11518,6 +11518,31 @@ 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-ntgclass
+  (package
+    (name "texlive-ntgclass")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ntgclass/"
+                   "source/latex/ntgclass/"
+                   "tex/latex/ntgclass/")
+             (base32
+              "04rvr1gldp87nqplmnqkwi3l9jclsjaawj5rym72gy6sw9snpmck")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ntgclass")
+    (synopsis "European versions of standard classes")
+    (description
+     "The bundle offers versions of the standard LaTeX @code{article} and
+@code{report} classes, rewritten to reflect a more European design, and the
+@code{a4} package, which is better tuned to the shape of a4 paper than is the
+@code{a4paper} class option of the standard classes.  The classes include
+several for @code{article} and @code{report} requirements, and a @code{letter}
+class.  The elements of the bundle were designed by members of the Dutch TeX
+Users Group NTG.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-nth
   (package
     (name "texlive-nth")
-- 
cgit 1.4.1


From 8b5b87730e388ce420d95c9e045a5dda20d7e7db Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:14:32 +0200
Subject: gnu: Add texlive-pdfcolfoot.

* gnu/packages/tex.scm (texlive-pdfcolfoot): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7cb35aeebb..dd536ecdee 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12050,6 +12050,26 @@ that contain various elements (titles, bars, milestones, groups and links).
 Several keys customize the appearance of the chart elements.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pdfcolfoot
+  (package
+    (name "texlive-pdfcolfoot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pdfcolfoot/"
+                   "source/latex/pdfcolfoot/"
+                   "tex/latex/pdfcolfoot/")
+             (base32
+              "0k3fwfyj56zb18fr4yay4bp66nbx3a0nb87i8mh8yxkm7qmnx95l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pdfcolfoot")
+    (synopsis "Separate color stack for footnotes with pdfTeX")
+    (description
+     "Since version 1.40 pdfTeX supports several colour stacks.  This package
+uses a separate colour stack for footnotes that can break across pages.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-pdflscape
   (package
     (name "texlive-pdflscape")
-- 
cgit 1.4.1


From dcf85e46bb1981f8c557d651ccfd83c295c080fe Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:14:54 +0200
Subject: gnu: Add texlive-pdfmanagement-testphase.

* gnu/packages/tex.scm (texlive-pdfmanagement-testphase): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dd536ecdee..86efb4b132 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12092,6 +12092,32 @@ attribute.  Pages with this attribute will be displayed in landscape
 orientation by conforming PDF viewers.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pdfmanagement-testphase
+  (package
+    (name "texlive-pdfmanagement-testphase")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pdfmanagement-testphase/"
+                   "source/latex/pdfmanagement-testphase/"
+                   "tex/latex/pdfmanagement-testphase/")
+             (base32
+              "0lxnr7xzis376fmkcyk7ghyj1x7m9yvlg98fvvy6vc4b26hf2kyk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pdfmanagement-testphase")
+    (synopsis "LaTeX PDF management testphase bundle")
+    (description
+     "This is a temporary package, which is used during a test phase to load
+the new PDF management code of LaTeX.  The new PDF management code offers
+backend-independent interfaces to central PDF dictionaries, tools to create
+annotations, form Xobjects, to embed files, and to handle PDF standards.  The
+code is provided, during a testphase, as an independent package to allow users
+and package authors to safely test the code.  At a later stage it will be
+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-pslatex
   (package
     (name "texlive-pslatex")
-- 
cgit 1.4.1


From 8be5f19f165e523c7cd8d9577440c3ba8e27cd7d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:16:15 +0200
Subject: gnu: Add texlive-rcs.

* gnu/packages/tex.scm (texlive-rcs): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 86efb4b132..8af90f662f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12271,6 +12271,28 @@ in LaTeX, all of whose names are lower-case, prevent hyphenation
 altogether).")
     (license license:lppl1.3c)))
 
+(define-public texlive-rcs
+  (package
+    (name "texlive-rcs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/rcs/" "source/latex/rcs/"
+                   "tex/latex/rcs/")
+             (base32
+              "0lhb5njyk5y60lgbbggy804qqc0szcybbhndmwblpxhhyxiqvmi5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/rcs")
+    (synopsis "Use RCS (revision control system) tags in LaTeX documents")
+    (description
+     "The @code{rcs} package utilizes the inclusion of RCS supplied data in
+LaTeX documents.  In particular, you can easily access values of every RCS
+field in your document put the checkin date on the titlepage or put RCS fields
+in a footline.  You can also typeset revision logs.  You can also configure
+the @code{rcs} package easily to do special things for any keyword.")
+    (license license:gpl3+)))
+
 (define-public texlive-refstyle
   (package
     (name "texlive-refstyle")
-- 
cgit 1.4.1


From e997351c777922c091fbe537f6db859ee6051be2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:16:49 +0200
Subject: gnu: Add texlive-sansmath.

* gnu/packages/tex.scm (texlive-sansmath): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8af90f662f..7c498eb0f4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3409,6 +3409,24 @@ 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-sansmath
+  (package
+    (name "texlive-sansmath")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sansmath/" "tex/latex/sansmath/")
+             (base32
+              "1lqxfvmxan0c9s270jp8jw1a5s6ya1i4jlfp2xz2k4w0g0fryjpj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sansmath")
+    (synopsis "Maths in a Sans font")
+    (description
+     "The package defines a new math version Sans, and a command
+@code{\\sansmath} that behaves somewhat like @code{\\boldmath}.")
+    (license license:public-domain)))
+
 (define-public texlive-sansmathfonts
   (package
     (name "texlive-sansmathfonts")
-- 
cgit 1.4.1


From ef1e944c279cd3e27d79853237ce1049891fe6f6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:17:10 +0200
Subject: gnu: Add texlive-section.

* gnu/packages/tex.scm (texlive-section): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7c498eb0f4..59207d3ec0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10818,6 +10818,24 @@ metrics and LaTeX macros to use the three basic Adobe Type 1 fonts (Times,
 Helvetica and Courier) in LaTeX using LY1 encoding.")
     (license license:lppl1.0+)))
 
+(define-public texlive-section
+  (package
+    (name "texlive-section")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/section/" "tex/latex/section/")
+             (base32
+              "0gjajhlwwgyqnmw9bzr0l7dsq12mdhgv8sdkm86m4zn107qab0p9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/section")
+    (synopsis "Modifying section commands in LaTeX")
+    (description
+     "The package implements a pretty extensive scheme to make more manageable
+the business of configuring LaTeX output.")
+    (license license:lppl)))
+
 (define-public texlive-sectsty
   (package
     (name "texlive-sectsty")
-- 
cgit 1.4.1


From 9b3e024d473c084e01e086ca3457a67e709ac86d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:17:40 +0200
Subject: gnu: Add texlive-sepnum.

* gnu/packages/tex.scm (texlive-sepnum): New variable.
---
 gnu/packages/tex.scm | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 59207d3ec0..bcb41760c2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5225,17 +5225,39 @@ tuned to 21st-century presentation styles.")
 
 (define-deprecated-package texlive-latex-seminar texlive-seminar)
 
+(define-public texlive-sepnum
+  (package
+    (name "texlive-sepnum")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sepnum/" "tex/latex/sepnum/")
+             (base32
+              "1vzjhb470imd1f5wlj32jysn825vyygq9xkscqdjaa9jby70a26x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sepnum")
+    (synopsis "Print numbers in a friendly format")
+    (description
+     "This package provides a command to print a number with (potentially
+different) separators every three digits in the parts either side of the
+decimal point (the point itself is also configurable).  The macro is fully
+expandable and not fragile (unless one of the separators is).  There is also
+a command @code{\\sepnumform}, that may be used when defining
+@samp{\\the<counter> macros}.")
+    (license license:lppl)))
+
 (define-public texlive-seqsplit
   (package
     (name "texlive-seqsplit")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-              (list "doc/latex/seqsplit/"
-                    "source/latex/seqsplit/"
-                    "tex/latex/seqsplit/")
-              (base32
-               "0x6xcism9s9mhpr278xi4c1gimz3mlqnrpr40vkx5abglr0gzm0j")))
+             (list "doc/latex/seqsplit/"
+                   "source/latex/seqsplit/"
+                   "tex/latex/seqsplit/")
+             (base32
+              "0x6xcism9s9mhpr278xi4c1gimz3mlqnrpr40vkx5abglr0gzm0j")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/seqsplit")
-- 
cgit 1.4.1


From 0fb4f2c801277f0b1657b868a79d741ea3fefe73 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:18:04 +0200
Subject: gnu: Add texlive-thumbpdf.

* gnu/packages/tex.scm (texlive-thumbpdf): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bcb41760c2..23012f5ea5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7313,6 +7313,32 @@ float, but you can put it in a @code{table} or a @code{table*} or some other
 environment.")
     (license (license:fsf-free "file://threeparttable.sty"))))
 
+(define-public texlive-thumbpdf
+  (package
+    (name "texlive-thumbpdf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/thumbpdf/"
+                   "doc/man/man1/thumbpdf.1"
+                   "doc/man/man1/thumbpdf.man1.pdf"
+                   "scripts/thumbpdf/" "tex/generic/thumbpdf/")
+             (base32
+              "0ya18440rpkav0z1zddzii9jh2swybicj87413l5iin2acrssw42")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "thumbpdf.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/thumbpdf")
+    (synopsis "Thumbnails for pdfTeX and dvips/ps2pdf")
+    (description
+     "This package provides a Perl script that provides support for thumbnails
+in pdfTeX and dvips/ps2pdf.  The script uses Ghostscript to generate the
+thumbnails which get represented in a TeX readable file that is read by the
+package @code{thumbpdf.sty} to automatically include the thumbnails.  This
+arrangement works with both plain TeX and LaTeX.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-txfonts
   (package
     (name "texlive-txfonts")
-- 
cgit 1.4.1


From 3ae611e95fe09306e1b0dddd742098c33a41c81f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:18:21 +0200
Subject: gnu: Add texlive-typehtml.

* gnu/packages/tex.scm (texlive-typehtml): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 23012f5ea5..809c48ba15 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7377,6 +7377,26 @@ TeX metrics (VF and TFM files) and macros for use with LaTeX.")
 
 (define-deprecated-package texlive-fonts-txfonts texlive-txfonts)
 
+(define-public texlive-typehtml
+  (package
+    (name "texlive-typehtml")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/typehtml/"
+                   "source/latex/typehtml/"
+                   "tex/latex/typehtml/")
+             (base32
+              "1nmdh2mhkzdqs5y4k95g9il6vz4rgndzhkikiilknkwg1a04rrzi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/typehtml")
+    (synopsis "Typeset HTML directly from LaTeX")
+    (description
+     "This package typesets HTML directly from LaTeX.  It can handle almost
+all of HTML2, and most of the math fragment of the draft HTML3.")
+    (license license:lppl)))
+
 (define-public texlive-iwona
   (package
     (name "texlive-iwona")
-- 
cgit 1.4.1


From 338510406311028ee19d6b6da948962436add294 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:19:13 +0200
Subject: gnu: Add texlive-ucharcat.

* gnu/packages/tex.scm (texlive-ucharcat): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 809c48ba15..edf56e7107 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7855,6 +7855,29 @@ It does not work in combination with list environments, but can be used in a
 
 (define-deprecated-package texlive-latex-wrapfig texlive-wrapfig)
 
+(define-public texlive-ucharcat
+  (package
+    (name "texlive-ucharcat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ucharcat/"
+                   "source/latex/ucharcat/"
+                   "tex/latex/ucharcat/")
+             (base32
+              "0r6mphnn26053vb4bgw1zjhw7y7xjavii9hnn7607cbscnx5f9di")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ucharcat")
+    (synopsis
+     "Implementation of the XeTeX @code{\\Ucharcat} command for LuaTeX")
+    (description
+     "The package implements the @code{\\Ucharcat} command for LuaLaTeX.
+@code{\\Ucharcat} is a new primitive in XeTeX, an extension of the existing
+@code{\\Uchar} command, that allows the specification of the catcode as well
+as character code of the character token being constructed.")
+    (license license:lppl)))
+
 (define-public texlive-ucs
   (package
     (name "texlive-ucs")
-- 
cgit 1.4.1


From ed365bab69e96026629a730ad049eadf5d349829 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:19:36 +0200
Subject: gnu: Add texlive-xltxtra.

* gnu/packages/tex.scm (texlive-xltxtra): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index edf56e7107..7ebafb3056 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2849,6 +2849,33 @@ tables.")
 
 (define-deprecated-package texlive-latex-xcolor texlive-xcolor)
 
+(define-public texlive-xltxtra
+  (package
+    (name "texlive-xltxtra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/xltxtra/"
+                   "source/xelatex/xltxtra/"
+                   "tex/xelatex/xltxtra/")
+             (base32
+              "0dh3nnr4xhb85zp3q4jdzqvfghg8m9zvpsvvrmmp0q3ayf0c1dbj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-metalogo))
+    (home-page "https://ctan.org/pkg/xltxtra")
+    (synopsis "Extras for LaTeX users of XeTeX")
+    (description
+     "This package was previously used to provide a number of features that
+were useful for typesetting documents with XeLaTeX.  Many of those features
+have now been incorporated into the @code{fontspec} package and other
+packages, but the package persists for backwards compatibility.  Nowadays,
+loading @code{xltxtra} will: load the @code{fontspec}, @code{metalogo}, and
+@code{realscripts} packages; redefine @code{\\showhyphens} so it works
+correctly; and define two extra commands: @code{\\vfrac} and
+@code{\\namedglyph}.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-xmltexconfig
   (package
     (name "texlive-xmltexconfig")
-- 
cgit 1.4.1


From f4049b4ecc3975f385d2a837be011e2c2cb4fe1d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:20:04 +0200
Subject: gnu: Add texlive-collection-latexrecommended.

* gnu/packages/tex.scm (texlive-collection-latexrecommended): New variable.
---
 gnu/packages/tex.scm | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7ebafb3056..abc0be55ad 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11280,6 +11280,94 @@ LaTeX.")
 used and strongly recommended in practice.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-collection-latexrecommended
+  (package
+    (name "texlive-collection-latexrecommended")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-anysize
+           texlive-attachfile2
+           texlive-beamer
+           texlive-booktabs
+           texlive-breqn
+           texlive-caption
+           texlive-cite
+           texlive-cmap
+           texlive-collection-latex
+           texlive-crop
+           texlive-ctable
+           texlive-eso-pic
+           texlive-etoolbox
+           texlive-euenc
+           texlive-euler
+           texlive-everysel
+           texlive-everyshi
+           texlive-extsizes
+           texlive-fancybox
+           texlive-fancyref
+           texlive-fancyvrb
+           texlive-filehook
+           texlive-float
+           texlive-fontspec
+           texlive-footnotehyper
+           texlive-fp
+           texlive-grffile
+           texlive-hologo
+           texlive-index
+           texlive-infwarerr
+           texlive-jknapltx
+           texlive-koma-script
+           texlive-l3experimental
+           texlive-latexbug
+           texlive-lineno
+           texlive-listings
+           texlive-lwarp
+           texlive-mathspec
+           texlive-mathtools
+           texlive-mdwtools
+           texlive-memoir
+           texlive-metalogo
+           texlive-microtype
+           texlive-ms
+           texlive-newfloat
+           texlive-ntgclass
+           texlive-parskip
+           texlive-pdfcolfoot
+           texlive-pdflscape
+           texlive-pdfmanagement-testphase
+           texlive-pdfpages
+           texlive-pdftexcmds
+           texlive-polyglossia
+           texlive-psfrag
+           texlive-ragged2e
+           texlive-rcs
+           texlive-sansmath
+           texlive-section
+           texlive-seminar
+           texlive-sepnum
+           texlive-setspace
+           texlive-subfig
+           texlive-textcase
+           texlive-thumbpdf
+           texlive-translator
+           texlive-typehtml
+           texlive-ucharcat
+           texlive-underscore
+           texlive-unicode-math
+           texlive-xcolor
+           texlive-xkeyval
+           texlive-xltxtra
+           texlive-xunicode))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "LaTeX recommended packages")
+    (description
+     "This package provides a collection of recommended add-on packages for
+LaTeX which have widespread use.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-grfext
   (package
     (name "texlive-grfext")
-- 
cgit 1.4.1


From fcf7c50000be7ca74ddc28e20b50724a5e9cc2ee Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:26:03 +0200
Subject: gnu: Add texlive-avantgar.

* gnu/packages/tex.scm (texlive-avantgar): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index abc0be55ad..e29cc2f032 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -869,6 +869,32 @@ uppercase letters respectively (1 to a, 26 to z, 27 to aa, 52 to zz, 53 to ba,
 a replacement for LaTeX's @code{\\@@alph} and @code{\\@@Alph} macros.")
     (license license:lppl1.3c+)))
 
+(define-public texlive-avantgar
+  (package
+    (name "texlive-avantgar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/avantgar/"
+                   "fonts/afm/adobe/avantgar/"
+                   "fonts/afm/urw/avantgar/"
+                   "fonts/map/dvips/avantgar/"
+                   "fonts/tfm/adobe/avantgar/"
+                   "fonts/tfm/urw35vf/avantgar/"
+                   "fonts/type1/urw/avantgar/"
+                   "fonts/vf/adobe/avantgar/"
+                   "fonts/vf/urw35vf/avantgar/"
+                   "tex/latex/avantgar/")
+             (base32
+              "1200x40k7wprm4n7srxvgrax2l52vn6d5ri2x0q7zbzzsfxfzkym")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/urw-base35")
+    (synopsis "Replacement for Adobe's Avant Garde font")
+    (description
+     "This package provides a drop-in replacement for the Avant Garde font
+from Adobe's basic set.")
+    (license license:gpl3+)))
+
 (define texlive-docstrip
   (package
     (name "texlive-docstrip")
-- 
cgit 1.4.1


From b366b66165486e079b0caefef989006f99eee739 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:26:40 +0200
Subject: gnu: Add texlive-bookman.

* gnu/packages/tex.scm (texlive-bookman): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e29cc2f032..c187f4166d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6153,6 +6153,32 @@ be used, for example, for per chapter/section appendices.  An
 
 (define-deprecated-package texlive-latex-appendix texlive-appendix)
 
+(define-public texlive-bookman
+  (package
+    (name "texlive-bookman")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/bookman/"
+                   "fonts/afm/adobe/bookman/"
+                   "fonts/afm/urw/bookman/"
+                   "fonts/map/dvips/bookman/"
+                   "fonts/tfm/adobe/bookman/"
+                   "fonts/tfm/urw35vf/bookman/"
+                   "fonts/type1/urw/bookman/"
+                   "fonts/vf/adobe/bookman/"
+                   "fonts/vf/urw35vf/bookman/"
+                   "tex/latex/bookman/")
+             (base32
+              "12wkjwpzxn1a1k3bb41gpnky1jjsh7gzj4xahsjd087fpmrsj9p9")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/urw-base35")
+    (synopsis "Replacement for Adobe's Bookman font")
+    (description
+     "This package provides a drop-in replacement for the Bookman font from
+Adobe's basic set")
+    (license license:gpl3+)))
+
 (define-public texlive-bookmark
   (package
     (name "texlive-bookmark")
-- 
cgit 1.4.1


From 4dd8cf8aa35cc925fd62e62ae7cae90ccc989fc0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:28:03 +0200
Subject: gnu: Add texlive-cmextra.

* gnu/packages/tex.scm (texlive-cmextra): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c187f4166d..f30f79e70b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1523,6 +1523,26 @@ mathematical fonts in a range of styles, based on Monotype Modern 8A.")
 
 (define-deprecated-package texlive-fonts-cm texlive-cm)
 
+(define-public texlive-cmextra
+  (package
+    (name "texlive-cmextra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/source/public/cmextra/"
+                   "fonts/tfm/public/cmextra/")
+             (base32
+              "00my52lh3cn8bn211fpn7373b7khaylx4fgkrd2m72xgaymil308")))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/knuth-local")
+    (synopsis "Knuth's local information")
+    (description
+     "This package provides a collection of experimental programs and
+developments based on, or complementary to, the matter in his distribution
+directories.")
+    (license license:public-domain)))
+
 (define-public texlive-cm-lgc
   (package
     (name "texlive-cm-lgc")
-- 
cgit 1.4.1


From 43d577c053b040b25cd7c1f604c6d93c31aa8699 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:28:29 +0200
Subject: gnu: Add texlive-euro.

* gnu/packages/tex.scm (texlive-euro): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f30f79e70b..941fdf2059 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11603,6 +11603,27 @@ The package includes font definition files for use with the Latin Modern
 OpenType fonts.")
     (license license:lppl1.3+)))
 
+(define-public texlive-euro
+  (package
+    (name "texlive-euro")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/euro/" "source/latex/euro/"
+                   "tex/latex/euro/")
+             (base32
+              "1bmswsw4clzrrgxmk473ghsdbnw6zwa2rgbjs32i1i5c37026yfi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/euro")
+    (synopsis "Provide Euro values for national currency amounts")
+    (description
+     "This package converts arbitrary national currency amounts using the Euro
+as base unit, and typesets monetary amounts in almost any desired way.
+Conversion rates for the initial Euro-zone countries are already built-in.
+Further rates can be added easily.")
+    (license license:lppl)))
+
 (define-public texlive-eurosym
   (package
     (name "texlive-eurosym")
-- 
cgit 1.4.1


From 58e566092ddbcbbd35b2c765f21a4ad0f846722d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:28:49 +0200
Subject: gnu: Add texlive-euro-ce.

* gnu/packages/tex.scm (texlive-euro-ce): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 941fdf2059..f01f893c44 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11624,6 +11624,27 @@ Conversion rates for the initial Euro-zone countries are already built-in.
 Further rates can be added easily.")
     (license license:lppl)))
 
+(define-public texlive-euro-ce
+  (package
+    (name "texlive-euro-ce")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/euro-ce/"
+                   "fonts/source/public/euro-ce/"
+                   "fonts/tfm/public/euro-ce/")
+             (base32
+              "0vyh6ln2wdn42g5r1rg0gqf6q39ny7ldv2b6ikw8b029bdg5079p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/euro-ce")
+    (synopsis "Euro and CE sign font")
+    (description
+     "This package provides Metafont source for the Euro and CE symbols in
+several variants, designed to fit with the Computer Modern-set text.")
+    (license license:bsd-3)))           ;from "euro-ce.doc"
+
 (define-public texlive-eurosym
   (package
     (name "texlive-eurosym")
-- 
cgit 1.4.1


From 4030bf3b6cae7c62fa367247be024379b020c0c5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:29:25 +0200
Subject: gnu: Add texlive-ncntrsbk.

* gnu/packages/tex.scm (texlive-ncntrsbk): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f01f893c44..7d6a6f546c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8784,6 +8784,32 @@ toc-entries;
 @end itemize")
     (license license:lppl)))
 
+(define-public texlive-ncntrsbk
+  (package
+    (name "texlive-ncntrsbk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/ncntrsbk/"
+                   "fonts/afm/adobe/ncntrsbk/"
+                   "fonts/afm/urw/ncntrsbk/"
+                   "fonts/map/dvips/ncntrsbk/"
+                   "fonts/tfm/adobe/ncntrsbk/"
+                   "fonts/tfm/urw35vf/ncntrsbk/"
+                   "fonts/type1/urw/ncntrsbk/"
+                   "fonts/vf/adobe/ncntrsbk/"
+                   "fonts/vf/urw35vf/ncntrsbk/"
+                   "tex/latex/ncntrsbk/")
+             (base32
+              "0i6a48zbn9lg4pwbw8ya2wjjgppwac816fnbpmahm67kknx4d7ij")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/urw-base35")
+    (synopsis "Replacement for Adobe's New Century Schoolbook font")
+    (description
+     "This package provides a drop-in replacement for the New Century
+Schoolbook font from Adobe's basic set.")
+    (license license:gpl3+)))
+
 (define-public texlive-numprint
   (package
     (name "texlive-numprint")
-- 
cgit 1.4.1


From 66fbc1a8899e3f74e42be20da8aa4b73d15b47db Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:29:49 +0200
Subject: gnu: Add texlive-pxfonts.

* gnu/packages/tex.scm (texlive-pxfonts): New variable.
---
 gnu/packages/tex.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7d6a6f546c..409ef41b78 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2138,6 +2138,37 @@ discussed in the book).")
 
 (define-deprecated-package texlive-tex-plain texlive-plain)
 
+(define-public texlive-pxfonts
+  (package
+    (name "texlive-pxfonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/pxfonts/"
+                   "fonts/afm/public/pxfonts/"
+                   "fonts/map/dvips/pxfonts/"
+                   "fonts/tfm/public/pxfonts/"
+                   "fonts/type1/public/pxfonts/"
+                   "fonts/vf/public/pxfonts/"
+                   "tex/latex/pxfonts/")
+             (base32
+              "0z2ls46x2l79saq4l1d2cqwazhpg79b9hqsf90wzx70676mxcwac")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pxfonts")
+    (synopsis "Palatino-like fonts in support of mathematics")
+    (description
+     "Pxfonts supplies virtual text roman fonts using Adobe Palatino (or
+URWPalladioL) with some modified and additional text symbols in the OT1, T1,
+and TS1 encodings; maths alphabets using Palatino/Palladio; maths fonts
+providing all the symbols of the Computer Modern and AMS fonts, including all
+the Greek capital letters from CMR; and additional maths fonts of various
+other symbols.  The set is complemented by a sans-serif set of text fonts,
+based on Helvetica/NimbusSanL, and a monospace set derived from the parallel
+TX font set.  All the fonts are in Type 1 format (AFM and PFB files), and are
+supported by TeX metrics (VF and TFM files) and macros for use with LaTeX.")
+    (license license:gpl3+)))
+
 (define-public texlive-halloweenmath
   (package
     (name "texlive-halloweenmath")
-- 
cgit 1.4.1


From d77e4608fb4663f31c1177672f39027680b79bf8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:30:06 +0200
Subject: gnu: Add texlive-tex-gyre-math.

* gnu/packages/tex.scm (texlive-tex-gyre-math): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 409ef41b78..9bfcf1e59a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1679,6 +1679,30 @@ support (for use with a variety of encodings) is provided.")
     ;; additional but not legally binding clause.
     (license license:lppl1.3c+)))
 
+(define-public texlive-tex-gyre-math
+  (package
+    (name "texlive-tex-gyre-math")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/tex-gyre-math/"
+                   "fonts/opentype/public/tex-gyre-math/"
+                   "source/fonts/tex-gyre-math/")
+             (base32
+              "1k5fx03bg702636hh7hv4kzzxhbbic26rp5g4lq2bgajd5dgc5xy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tex-gyre-math")
+    (synopsis "Maths fonts to match tex-gyre text fonts")
+    (description
+     "TeX-Gyre-Math is a collection of maths fonts to match the text fonts of
+the TeX-Gyre collection.  The collection is available in OpenType format,
+only; fonts conform to the developing standards for OpenType maths fonts.
+TeX-Gyre-Math-Bonum (to match TeX-Gyre-Bonum), TeX-Gyre-Math-Pagella (to match
+TeX-Gyre-Pagella), TeX-Gyre-Math-Schola (to match TeX-Gyre-Schola) and
+TeX-Gyre-Math-Termes (to match TeX-Gyre-Termes) fonts are provided.")
+    (license license:gfl1.0)))
+
 (define-public texlive-crop
   (package
     (name "texlive-crop")
-- 
cgit 1.4.1


From 4d062c26f8e038ba1fe6d8b29fba26d65d95e58b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:30:25 +0200
Subject: gnu: Add texlive-wasy-type1.

* gnu/packages/tex.scm (texlive-wasy-type1): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9bfcf1e59a..85a6a10796 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7965,6 +7965,28 @@ in the Metafont and Adobe Type 1 formats.  Support under LaTeX is provided by
 the @code{wasysym} package.")
     (license license:public-domain)))
 
+(define-public texlive-wasy-type1
+  (package
+    (name "texlive-wasy-type1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/wasy-type1/"
+                   "fonts/afm/public/wasy-type1/"
+                   "fonts/map/dvips/wasy-type1/"
+                   "fonts/type1/public/wasy-type1/")
+             (base32
+              "01xwryijs787ab4ayfsj44ylf72s0zkm49zm0yk4ghs4vck2qvq3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-wasy))
+    (home-page "https://ctan.org/pkg/wasy-type1")
+    (synopsis "Type 1 versions of @code{wasy} fonts")
+    (description
+     "This package provides converted (Adobe Type 1) outlines of the
+@code{wasy} fonts.")
+    (license license:public-domain)))
+
 (define-public texlive-wasysym
   (package
     (name "texlive-wasysym")
-- 
cgit 1.4.1


From b922423cbda9cabd37ea6878c5404de18441b248 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:30:59 +0200
Subject: gnu: Add texlive-zapfchan.

* gnu/packages/tex.scm (texlive-zapfchan): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 85a6a10796..848fb87021 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6919,6 +6919,32 @@ Adobe's basic set.")
 
 (define-deprecated-package texlive-fonts-adobe-palatino texlive-palatino)
 
+(define-public texlive-zapfchan
+  (package
+    (name "texlive-zapfchan")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/zapfchan/"
+                   "fonts/afm/adobe/zapfchan/"
+                   "fonts/afm/urw/zapfchan/"
+                   "fonts/map/dvips/zapfchan/"
+                   "fonts/tfm/adobe/zapfchan/"
+                   "fonts/tfm/urw35vf/zapfchan/"
+                   "fonts/type1/urw/zapfchan/"
+                   "fonts/vf/adobe/zapfchan/"
+                   "fonts/vf/urw35vf/zapfchan/"
+                   "tex/latex/zapfchan/")
+             (base32
+              "1753lvv2bq29g43s4chc884n742695agvgal0b99gsrvlkyfp8gn")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/urw-base35")
+    (synopsis "Replacement for Adobe's Zapf Chancery font")
+    (description
+     "This package provides a drop-in replacement for the Zapf Chancery
+font from Adobe's basic set.")
+    (license license:gpl3+)))
+
 (define-public texlive-zapfding
   (package
     (name "texlive-zapfding")
-- 
cgit 1.4.1


From 142097e819181e55724169f7df0dac83da5db2df Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:31:30 +0200
Subject: gnu: Add texlive-collection-fontsrecommended.

* gnu/packages/tex.scm (texlive-collection-fontsrecommended): New variable.
---
 gnu/packages/tex.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 848fb87021..5419814fae 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11409,6 +11409,56 @@ 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-fontsrecommended
+  (package
+    (name "texlive-collection-fontsrecommended")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-avantgar
+           texlive-bookman
+           texlive-charter
+           texlive-cm-super
+           texlive-cmextra
+           texlive-collection-basic
+           texlive-courier
+           texlive-euro
+           texlive-euro-ce
+           texlive-eurosym
+           texlive-fpl
+           texlive-helvetic
+           texlive-lm
+           texlive-lm-math
+           texlive-manfnt-font
+           texlive-marvosym
+           texlive-mathpazo
+           texlive-mflogo-font
+           texlive-ncntrsbk
+           texlive-palatino
+           texlive-pxfonts
+           texlive-rsfs
+           texlive-symbol
+           texlive-tex-gyre
+           texlive-tex-gyre-math
+           texlive-times
+           texlive-tipa
+           texlive-txfonts
+           texlive-utopia
+           texlive-wasy
+           texlive-wasy-type1
+           texlive-wasysym
+           texlive-zapfchan
+           texlive-zapfding))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Recommended fonts")
+    (description
+     "This collection provides recommended fonts, including the base 35
+PostScript fonts, Latin Modern, TeX Gyre, and T1 and other encoding support
+for Computer Modern, in outline form.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-collection-latex
   (package
     (name "texlive-collection-latex")
-- 
cgit 1.4.1


From 3bca40dcc43fe24cf33253cead9af59197c4a604 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 16:35:04 +0200
Subject: gnu: Fix some font descriptions and synopses in texlive packages.

* gnu/packages/tex.scm (texlive-courier):
(texlive-helvetic):
(texlive-times):
(texlive-palatino):
(texlive-zapfding):
(texlive-symbol)[synopsis]: Clarify what font is being replaced.
---
 gnu/packages/tex.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5419814fae..490e37748a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1630,9 +1630,10 @@ originals.")
               "08g6lm12b0k6333pxcaqdf67v87fz5mrqp3jgal8qhrls5ym8q6r")))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/urw-base35")
-    (synopsis "URW Base 35 font pack for LaTeX")
-    (description "This package provides a drop-in replacements for the Courier
-font from Adobe's basic set.")
+    (synopsis "Replacement for Adobe's Courier font")
+    (description
+     "This package provides a drop-in replacement for the Courier font from
+Adobe's basic set.")
     ;; No license version specified.
     (license license:gpl3+)))
 
@@ -2276,9 +2277,9 @@ external file.")
               "0c3f1ly7y6404z0akbfbbfql13sz717v0n0g69qjpr69hi4n0nsl")))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/urw-base35")
-    (synopsis "URW Base 35 font pack for LaTeX")
+    (synopsis "Replacement for Adobe's Helvetica font")
     (description
-     "This package provides a drop-in replacements for the Helvetica font from
+     "This package provides a drop-in replacement for the Helvetica font from
 Adobe's basic set.")
     ;; No license version specified.
     (license license:gpl3+)))
@@ -6881,9 +6882,9 @@ TeX, and LaTeX font definition and other relevant files.")
               "13g41a7vbkvsf7ki9dgl7qm100w382mnlqkcngwgl3axp6s5s8l0")))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/urw-base35")
-    (synopsis "URW Base 35 font pack for LaTeX")
+    (synopsis "Replacement for Adobe's Times font")
     (description
-     "This package provides a drop-in replacements for the Times font from
+     "This package provides a drop-in replacement for the Times font from
 Adobe's basic set.")
     ;; No license version specified.
     (license license:gpl3+)))
@@ -6910,9 +6911,9 @@ Adobe's basic set.")
               "12jc0av7v99857jigmva47qaxyllhpzsnqis10n0qya2kz44xf22")))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/urw-base35")
-    (synopsis "URW Base 35 font pack for LaTeX")
+    (synopsis "Replacement for Adobe's Palatino font")
     (description
-     "This package provides a drop-in replacements for the Palatino font from
+     "This package provides a drop-in replacement for the Palatino font from
 Adobe's basic set.")
     ;; No license version specified.
     (license license:gpl3+)))
@@ -6963,9 +6964,9 @@ font from Adobe's basic set.")
               "17mls8wilz9api9ivsbcczpiqp1f39qy8wa6ajssi8zhnc5lq7zn")))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/urw-base35")
-    (synopsis "URW Base 35 font pack for LaTeX")
+    (synopsis "Replacement for Adobe's Zapfding font")
     (description
-     "This package provides a drop-in replacements for the Zapfding font from
+     "This package provides a drop-in replacement for the Zapfding font from
 Adobe's basic set.")
     ;; No license version specified.
     (license license:gpl3+)))
@@ -10638,7 +10639,7 @@ that simpler packages like capt-of do.")
               "1pdkpr86bhia5hcmf7q3nhvklnsga4mqqrrirgl8a7al7x6q3ivs")))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/urw-base35")
-    (synopsis "URW Base 35 font pack for LaTeX")
+    (synopsis "Replacement for Adobe's Symbol font")
     (description
      "This package provides a drop-in replacement for the Symbol font from
 Adobe's basic set.")
-- 
cgit 1.4.1


From e7493181de029c1bbf94e59a6020e1dce97100ab Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:07:22 +0200
Subject: gnu: Add texlive-context-account.

* gnu/packages/tex.scm (texlive-context-account): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 490e37748a..748061c342 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9974,6 +9974,26 @@ for a wealth of support information.")
 
 (define-deprecated-package texlive-context-base texlive-context)
 
+(define-public texlive-context-account
+  (package
+    (name "texlive-context-account")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/account/"
+                   "tex/context/interface/third/"
+                   "tex/context/third/account/")
+             (base32
+              "0pcl7yiajm4q87f05kd6wyxhvdzvsy4hyvy24aihzlmhwrww0c9c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-account")
+    (synopsis "Simple accounting package")
+    (description
+     "The package deals with accounts of its own specification.")
+    (license license:public-domain)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 1655bfb255319b061b57247e7c4ac869d86785d5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:07:42 +0200
Subject: gnu: Add texlive-context-algorithmic.

* gnu/packages/tex.scm (texlive-context-algorithmic): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 748061c342..c5dbe40fcf 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9994,6 +9994,25 @@ for a wealth of support information.")
      "The package deals with accounts of its own specification.")
     (license license:public-domain)))
 
+(define-public texlive-context-algorithmic
+  (package
+    (name "texlive-context-algorithmic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/algorithmic/"
+                   "tex/context/third/algorithmic/")
+             (base32
+              "0l2k8a3g3yrirbiwp741h1fisbprhbl2kwzbmd71fij1a80sqfaw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-algorithmic")
+    (synopsis "Algorithm handling in ConTeXt")
+    (description
+     "This module provides support for typesetting algorithms.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From ded9789bbcfc54ee225e96e494be644b5d144869 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:07:57 +0200
Subject: gnu: Add texlive-context-animation.

* gnu/packages/tex.scm (texlive-context-animation): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c5dbe40fcf..0f12e6b257 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10013,6 +10013,27 @@ for a wealth of support information.")
      "This module provides support for typesetting algorithms.")
     (license license:gpl3+)))
 
+(define-public texlive-context-animation
+  (package
+    (name "texlive-context-animation")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/animation/"
+                   "tex/context/interface/third/"
+                   "tex/context/third/animation/")
+             (base32
+              "156zpxjb4c7qaibn7wjw13ysqyqg3m7pb8x3r3fzs6m83gp6r46c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-animation")
+    (synopsis "Generate fieldstack based animation with ConTeXt")
+    (description
+     "The package is a port, to Context (mkvi), of the corresponding LaTeX
+package.")
+    (license license:gpl3)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 3915064ee689ec3ce9bc5e2363101adfbe728491 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:08:08 +0200
Subject: gnu: Add texlive-context-annotation.

* gnu/packages/tex.scm (texlive-context-annotation): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0f12e6b257..975cd785ce 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10034,6 +10034,27 @@ for a wealth of support information.")
 package.")
     (license license:gpl3)))
 
+(define-public texlive-context-annotation
+  (package
+    (name "texlive-context-annotation")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/annotation/"
+                   "tex/context/interface/third/"
+                   "tex/context/third/annotation/")
+             (base32
+              "1b908rj51dbpicdiwwycb36wscxl1asmsmccrzcfbdji189kf6ck")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-annotation")
+    (synopsis "Annotate text blocks")
+    (description
+     "The @code{annotation} module lets you create your own commands and
+environments to mark text blocks.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 72db328ed309cd98a01366a52b9d7c30ec2b5bca Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:08:23 +0200
Subject: gnu: Add texlive-context-bnf.

* gnu/packages/tex.scm (texlive-context-bnf): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 975cd785ce..65315c25eb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10055,6 +10055,30 @@ package.")
 environments to mark text blocks.")
     (license license:gpl3+)))
 
+(define-public texlive-context-bnf
+  (package
+    (name "texlive-context-bnf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/bnf/"
+                   "tex/context/third/bnf/")
+             (base32
+              "0m7144pgwk1707g7na96dx4apl6il73zzcvq7qd6lmhij3m96nv8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-bnf")
+    (synopsis "BNF module for ConTeXt")
+    (description
+     "The module provides a simple way to write good-looking BNF-style
+grammars in ConTeXt.  Grammars are written using the BNF syntax right in your
+ConTeXt documents, so there is a clear separation between content and layout.
+This allows the user to decide exactly how the grammar is to be displayed,
+while also allowing the gist of the grammar to be understood from simply
+looking at the source ConTeXt document.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 119e47bb610905cdbaf1e8d78721c54249132ede Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:10:09 +0200
Subject: gnu: Add texlive-context-chromato.

* gnu/packages/tex.scm (texlive-context-chromato): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 65315c25eb..a93f114221 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10079,6 +10079,24 @@ while also allowing the gist of the grammar to be understood from simply
 looking at the source ConTeXt document.")
     (license license:gpl3+)))
 
+(define-public texlive-context-chromato
+  (package
+    (name "texlive-context-chromato")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/chromato/"
+                   "tex/context/third/chromato/")
+             (base32
+              "0p32iqgd6cbjx5y9ahs59f1q05js2s66nr84bjhzd37vzzl9acxs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-chromato")
+    (synopsis "ConTeXt macros for chromatograms")
+    (description "The module provides macros for drawing chromatograms.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From b9b02c6a0a7e36c29a89cab4617af6aaae6249c2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:29:26 +0200
Subject: gnu: Add texlive-context-cmscbf.

* gnu/packages/tex.scm (texlive-context-cmscbf): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a93f114221..24a96aafd8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10097,6 +10097,27 @@ looking at the source ConTeXt document.")
     (description "The module provides macros for drawing chromatograms.")
     (license license:gpl3+)))
 
+(define-public texlive-context-cmscbf
+  (package
+    (name "texlive-context-cmscbf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/cmscbf/"
+                   "tex/context/third/cmscbf/")
+             (base32
+              "0p0xgqr2pqxmhq7mzrzfyn8c37vr1xm273jz99lxzqpc7pxs37cp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-cmscbf")
+    (synopsis "Use Computer Modern bold Caps and Small-caps in ConTeXt")
+    (description
+     "The module makes provision for bold caps and small caps CM fonts,
+in ConTeXt.  Such a font may be found in the Computer Modern extra bold font
+set.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From e0975b96ed439b7d5681e33ffe0ca30ed1c10b52 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:29:53 +0200
Subject: gnu: Add texlive-context-cmttbf.

* gnu/packages/tex.scm (texlive-context-cmttbf): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 24a96aafd8..b3b1e658eb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10118,6 +10118,26 @@ in ConTeXt.  Such a font may be found in the Computer Modern extra bold font
 set.")
     (license license:gpl3+)))
 
+(define-public texlive-context-cmttbf
+  (package
+    (name "texlive-context-cmttbf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/cmttbf/"
+                   "tex/context/third/cmttbf/")
+             (base32
+              "0c88d2h6sn2l8s1lvy18h8vd6hc7im5gd85ilway4gq2nhvl4ahw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-cmttbf")
+    (synopsis "Use Computer Modern Typewriter bold font in ConTeXt")
+    (description
+     "The module makes provision for bold typewriter CM fonts, in ConTeXt.
+Such a font may be found in the Computer Modern extra bold font set.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From addea2af50f46a456b95932377f2e1b20d249e73 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:30:14 +0200
Subject: gnu: Add texlive-context-construction-plan.

* gnu/packages/tex.scm (texlive-context-construction-plan): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b3b1e658eb..872330f768 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10138,6 +10138,25 @@ set.")
 Such a font may be found in the Computer Modern extra bold font set.")
     (license license:gpl3+)))
 
+(define-public texlive-context-construction-plan
+  (package
+    (name "texlive-context-construction-plan")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/construction-plan/"
+                   "tex/context/third/construction-plan/")
+             (base32
+              "0nch7bwmal1lbsv4h5jwpavif5cx7096jr7m1g2pfjn4qy9slpgs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-construction-plan")
+    (synopsis "Construction plans in ConTeXt")
+    (description
+     "This module generates a page with a figure at a well-defined scale.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 21045b717dfaf6372ae868ba13d11875e99c8431 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:30:24 +0200
Subject: gnu: Add texlive-context-cyrillicnumbers.

* gnu/packages/tex.scm (texlive-context-cyrillicnumbers): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 872330f768..bb6ca561eb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10157,6 +10157,27 @@ Such a font may be found in the Computer Modern extra bold font set.")
      "This module generates a page with a figure at a well-defined scale.")
     (license license:gpl3+)))
 
+(define-public texlive-context-cyrillicnumbers
+  (package
+    (name "texlive-context-cyrillicnumbers")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/cyrillicnumbers/"
+                   "tex/context/interface/third/"
+                   "tex/context/third/cyrillicnumbers/")
+             (base32
+              "0vg3czh7vhwr9pg8iqmry4fd6kkmimpvsf0sdnvf73p7jkn5478y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-cyrillicnumbers")
+    (synopsis "Write numbers as cyrillic glyphs")
+    (description
+     "The package extends ConTeXt's system of number conversion, by adding
+numeration using cyrillic letters.")
+    (license license:bsd-2)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From bfba749d7ed80a05853ce2b5dd7fb3a5eb5240b3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:31:01 +0200
Subject: gnu: Add texlive-context-degrade.

* gnu/packages/tex.scm (texlive-context-degrade): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bb6ca561eb..4c0a130bc0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10178,6 +10178,25 @@ Such a font may be found in the Computer Modern extra bold font set.")
 numeration using cyrillic letters.")
     (license license:bsd-2)))
 
+(define-public texlive-context-degrade
+  (package
+    (name "texlive-context-degrade")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/degrade/"
+                   "tex/context/third/degrade/")
+             (base32
+              "10bny5ipa8sn6wk1k6238f5q7mazlyz9hgfi2d7hspghnfg3sm3g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-degrade")
+    (synopsis "Degrading JPEG images in ConTeXt")
+    (description
+     "This module provides tools to degrade JPEG images in ConTeXt.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From c93bd7768f7d2558f83b57be1de93ea694322ce0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:31:12 +0200
Subject: gnu: Add texlive-context-fancybreak.

* gnu/packages/tex.scm (texlive-context-fancybreak): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4c0a130bc0..788a914a56 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10197,6 +10197,28 @@ numeration using cyrillic letters.")
      "This module provides tools to degrade JPEG images in ConTeXt.")
     (license license:gpl3+)))
 
+(define-public texlive-context-fancybreak
+  (package
+    (name "texlive-context-fancybreak")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/fancybreak/"
+                   "tex/context/interface/third/"
+                   "tex/context/third/fancybreak/")
+             (base32
+              "0v29i2c77ycvl412mwmlyijss4s31c0sbxz7m7ln9vqy0xh3hv5i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-fancybreak")
+    (synopsis "Overfull pages with ConTeXt")
+    (description
+     "The ConTeXt module allows insertion of thought breaks in texts.
+With parameters one can adjust the spacing around the content and set
+a default symbol.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 0476bab741b1a610b74a1de695c917f51055559d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:31:23 +0200
Subject: gnu: Add texlive-context-french.

* gnu/packages/tex.scm (texlive-context-french): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 788a914a56..1a93312ecb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10219,6 +10219,25 @@ With parameters one can adjust the spacing around the content and set
 a default symbol.")
     (license license:gpl3+)))
 
+(define-public texlive-context-french
+  (package
+    (name "texlive-context-french")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/french/"
+                   "tex/context/third/french/")
+             (base32
+              "06x7dfsc1vrb49zl9xlhlyfavijgpc53hc0yhj5yc6vph8zbq0df")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-french")
+    (synopsis "Support for writing French in ConTeXt")
+    (description
+     "This ConTeXt module deals with spacing around French punctuation.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From ebfd03cfa27bca77f01d6a13f3da0fd56b27567f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:31:56 +0200
Subject: gnu: Add texlive-context-fullpage.

* gnu/packages/tex.scm (texlive-context-fullpage): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1a93312ecb..77e8c937af 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10238,6 +10238,27 @@ a default symbol.")
      "This ConTeXt module deals with spacing around French punctuation.")
     (license license:gpl3+)))
 
+(define-public texlive-context-fullpage
+  (package
+    (name "texlive-context-fullpage")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/fullpage/"
+                   "tex/context/interface/third/"
+                   "tex/context/third/fullpage/")
+             (base32
+              "1phxzaayy8dpxhfg7xj66ms3xgrdfdc3hv18wy92havcky5gq9wc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-fullpage")
+    (synopsis "Overfull pages with ConTeXt")
+    (description
+     "This ConTeXt module copies the functionality of @code{fullpage}, and
+adds a styling parameter, given in the @code{\\usemodule} command.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 40d45e75905c544b25ed0de32fdf95eb526e202a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:32:48 +0200
Subject: gnu: Add texlive-hatching.

* gnu/packages/tex.scm (texlive-hatching): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 77e8c937af..92602b413e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2255,6 +2255,25 @@ authors may also find this useful when writing out arbitrary text to an
 external file.")
     (license license:lppl1.3+)))
 
+(define-public texlive-hatching
+  (package
+    (name "texlive-hatching")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/hatching/"
+                   "metapost/hatching/")
+             (base32
+              "1rkxx57rpzk8i0msbyrzcgmbvmjjrg295qg508w3v3dsy0f0krjj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hatching")
+    (synopsis "MetaPost macros for hatching interior of closed paths")
+    (description
+     "The file @file{hatching}.mp contains a set of MetaPost macros for
+hatching interior of closed paths.")
+    (license license:public-domain)))
+
 (define-public texlive-helvetic
   (package
     (name "texlive-helvetic")
-- 
cgit 1.4.1


From d513d4ca532f376a47a1fc018736292601c81539 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:32:09 +0200
Subject: gnu: Add texlive-context-gantt.

* gnu/packages/tex.scm (texlive-context-gantt): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 92602b413e..18b82765f3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10278,6 +10278,25 @@ a default symbol.")
 adds a styling parameter, given in the @code{\\usemodule} command.")
     (license license:gpl3+)))
 
+(define-public texlive-context-gantt
+  (package
+    (name "texlive-context-gantt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/gantt/"
+                   "tex/context/third/gantt/")
+             (base32
+              "0r6gwxqg4pvrgz5z1bsdknahdqhjfjdkdnl148awsg49apqrrbwi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context texlive-hatching))
+    (home-page "https://ctan.org/pkg/context-gantt")
+    (synopsis "GANTT module for ConTeXt")
+    (description
+     "Gantt is a module for drawing Gantt charts via MetaPost or PGF/TikZ.")
+    (license license:public-domain)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From c5a8833c5f4e156bf0af213d270a2139a9a08b90 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:33:09 +0200
Subject: gnu: Add texlive-context-gnuplot.

* gnu/packages/tex.scm (texlive-context-gnuplot): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 18b82765f3..c56bc0dbf4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10297,6 +10297,28 @@ adds a styling parameter, given in the @code{\\usemodule} command.")
      "Gantt is a module for drawing Gantt charts via MetaPost or PGF/TikZ.")
     (license license:public-domain)))
 
+(define-public texlive-context-gnuplot
+  (package
+    (name "texlive-context-gnuplot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/gnuplot/"
+                   "metapost/context/third/gnuplot/"
+                   "tex/context/third/gnuplot/")
+             (base32
+              "0bmzww4sq8n37aipy6cvplcblxwlbmpl0by2sqysc3pdyxnixg41")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-gnuplot")
+    (synopsis "Inclusion of Gnuplot graphs in ConTeXt")
+    (description
+     "This ConTeXt module enables simple creation and inclusion of graphs with
+Gnuplot.  It writes a script into temporary file, runs Gnuplot and includes
+the resulting graphic directly into the document.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From fa60852c2f95e0ebd48117d604db5c2f56641b89 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:33:25 +0200
Subject: gnu: Add texlive-context-handlecsv.

* gnu/packages/tex.scm (texlive-context-handlecsv): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c56bc0dbf4..f8cf7f72f8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10319,6 +10319,25 @@ Gnuplot.  It writes a script into temporary file, runs Gnuplot and includes
 the resulting graphic directly into the document.")
     (license license:gpl3+)))
 
+(define-public texlive-context-handlecsv
+  (package
+    (name "texlive-context-handlecsv")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/handlecsv/"
+                   "tex/context/third/handlecsv/")
+             (base32
+              "0g5lxyj7v64mvfdhw96sqwjgxcka1nh6glbv040rrkx1p3j2r55x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-handlecsv")
+    (synopsis "Data merging for automatic document creation")
+    (description
+     "The package handles CSV data merging for automatic document creation.")
+    (license license:gpl3)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 81fa2caf2d7866a4f6f3de76e6963491a68d0212 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:33:37 +0200
Subject: gnu: Add texlive-context-layout.

* gnu/packages/tex.scm (texlive-context-layout): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f8cf7f72f8..c273a9ad1b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10338,6 +10338,27 @@ the resulting graphic directly into the document.")
      "The package handles CSV data merging for automatic document creation.")
     (license license:gpl3)))
 
+(define-public texlive-context-layout
+  (package
+    (name "texlive-context-layout")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/layout/"
+                   "tex/context/third/layout/")
+             (base32
+              "1zl26r94yizzpxzilkwv90xbr61ddxm7fabwpgbkrci0idc9ksv0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-layout")
+    (synopsis "Show ConTeXt layouts")
+    (description
+     "This ConTeXt module draws a representation of the layout of the current
+page and displays the sizes of the widths and heights of the margins, header,
+footer and text body.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 6e4aced69d594f0c99bc108569035ab687859202 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:33:49 +0200
Subject: gnu: Add texlive-context-letter.

* gnu/packages/tex.scm (texlive-context-letter): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c273a9ad1b..6d5ff8202f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10359,6 +10359,29 @@ page and displays the sizes of the widths and heights of the margins, header,
 footer and text body.")
     (license license:gpl3+)))
 
+(define-public texlive-context-letter
+  (package
+    (name "texlive-context-letter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/letter/"
+                   "tex/context/interface/third/"
+                   "tex/context/third/letter/base/"
+                   "tex/context/third/letter/style/")
+             (base32
+              "1bygisva06mj7kqcwdyk9mp247dv8v0qxgh2g1a451q8sqnk52yl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-letter")
+    (synopsis "ConTeXt package for writing letters")
+    (description
+     "This package provides a means of writing vanilla letters and memos is
+provided, with support covering ConTeXt Mkii and Mkiv.  The design of
+letters may be amended by a wide range of style specifications.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 57f281132aafedf99bd61fc4f987fe8068aa9966 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:34:01 +0200
Subject: gnu: Add texlive-context-lettrine.

* gnu/packages/tex.scm (texlive-context-lettrine): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6d5ff8202f..7214779fce 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10382,6 +10382,26 @@ provided, with support covering ConTeXt Mkii and Mkiv.  The design of
 letters may be amended by a wide range of style specifications.")
     (license license:gpl3+)))
 
+(define-public texlive-context-lettrine
+  (package
+    (name "texlive-context-lettrine")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/lettrine/"
+                   "tex/context/interface/third/"
+                   "tex/context/third/lettrine/")
+             (base32
+              "0mhzvnn6ffysfq9qxdj1a6prplppzsh4pb7x2di2r87pnkxwa7f2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-lettrine")
+    (synopsis "ConTeXt implementation of lettrines")
+    (description
+     "This is a re-implementation of the LaTeX package @code{lettrine}.")
+    (license license:public-domain)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From c23c9ac0c2e8f51f0738d2e101cd7c5465c9a44d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:34:11 +0200
Subject: gnu: Add texlive-context-mathsets.

* gnu/packages/tex.scm (texlive-context-mathsets): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7214779fce..408864b2e1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10402,6 +10402,28 @@ letters may be amended by a wide range of style specifications.")
      "This is a re-implementation of the LaTeX package @code{lettrine}.")
     (license license:public-domain)))
 
+(define-public texlive-context-mathsets
+  (package
+    (name "texlive-context-mathsets")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/mathsets/"
+                   "tex/context/interface/third/"
+                   "tex/context/third/mathsets/")
+             (base32
+              "15azsj3fv57yz9q1rrdp0cmjpz9p83aq5mwxkanppiy9sw1dny3b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-mathsets")
+    (synopsis "Set notation in ConTeXt")
+    (description
+     "Typeset good-looking set notation as well as similar things such as
+Dirac braket notation, conditional probabilities, etc.  The package is at
+least inspired by @code{braket}.")
+    (license license:bsd-2)))           ;from "t-mathsets.tex"
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 47b7c5a1fb0f7f97f9243b6ccea046d9ad19e346 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:34:45 +0200
Subject: gnu: Add texlive-context-rst.

* gnu/packages/tex.scm (texlive-context-rst): New variable.
---
 gnu/packages/tex.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 408864b2e1..35963e83fa 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10424,6 +10424,50 @@ Dirac braket notation, conditional probabilities, etc.  The package is at
 least inspired by @code{braket}.")
     (license license:bsd-2)))           ;from "t-mathsets.tex"
 
+(define-public texlive-context-rst
+  (package
+    (name "texlive-context-rst")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/rst/"
+                   "scripts/context/lua/third/rst/"
+                   "tex/context/interface/third/"
+                   "tex/context/third/rst/")
+             (base32
+              "0dfviz3pww0k9ffhiqw0dywj9fs3wkmqavb98z2cq1ldw09fbh01")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-rst")
+    (synopsis "Process reStructuredText with ConTeXt")
+    (description
+     "The package provides a converter and module for typesetting
+reStructuredText with ConTeXt.")
+    (license license:bsd-2)))           ;from "manual.pdf"
+
+(define-public texlive-context-ruby
+  (package
+    (name "texlive-context-ruby")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/ruby/"
+                   "tex/context/third/ruby/")
+             (base32
+              "0dgyvsxxfll5zayp0bfb7ixzh7df4bm3yz7z2w974yjlrd17acm0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-ruby")
+    (synopsis "Ruby annotations in ConTeXt")
+    (description
+     "Ruby markup (aka furigana in Japan) are inline annotations above or
+below a word to indicate the reading of ideographic characters.  The module
+implements the W3C specification for simple Ruby in ConTeXt.  The position and
+layout of the base text and the Ruby text can be controlled by parameters.")
+    (license license:public-domain)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 693f9daea908423302a4ec93dc4090aa995bbf9b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:39:06 +0200
Subject: gnu: Add texlive-context-simplefonts.

* gnu/packages/tex.scm (texlive-context-simplefonts): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 35963e83fa..f78c3f1228 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10468,6 +10468,26 @@ implements the W3C specification for simple Ruby in ConTeXt.  The position and
 layout of the base text and the Ruby text can be controlled by parameters.")
     (license license:public-domain)))
 
+(define-public texlive-context-simplefonts
+  (package
+    (name "texlive-context-simplefonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/simplefonts/"
+                   "tex/context/third/simplefonts/")
+             (base32
+              "1yxxgxnxhg006pq8incc6s6rj7jvvl1mkrdagpvc63lc709ih56s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-simplefonts")
+    (synopsis "Simplified font usage for ConTeXt")
+    (description
+     "The package defines a set of commands for loading and using fonts in
+ConTeXt.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 3d3a745a9e56bc21b0649651d81cffbffa527158 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:39:18 +0200
Subject: gnu: Add texlive-context-simpleslides.

* gnu/packages/tex.scm (texlive-context-simpleslides): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f78c3f1228..01b68872f5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10488,6 +10488,33 @@ layout of the base text and the Ruby text can be controlled by parameters.")
 ConTeXt.")
     (license license:gpl3+)))
 
+(define-public texlive-context-simpleslides
+  (package
+    (name "texlive-context-simpleslides")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/simpleslides/"
+                   "scripts/context/lua/third/simpleslides/"
+                   "tex/context/interface/third/"
+                   "tex/context/third/simpleslides/")
+             (base32
+              "0vbh26ym42ayxwis6wbkmf07sy167g9kzg5ls889j2f2zn5rf4pr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-simpleslides")
+    (synopsis "Module for preparing presentations")
+    (description
+     "This ConTeXt module provides an easy-to-use interface for creating
+presentations for use with a digital projector.  The presentations are
+not interactive (no buttons, hyperlinks or navigational tools such as
+tables of contents).  Graphics may be mixed with the text of slides.
+The module provides several predefined styles, designed for academic
+presentation.  Most styles are configurable, and it is easy to design
+new styles.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 182a4cd1977ad73510a399275e3c4ecbb4add0ec Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:39:29 +0200
Subject: gnu: Add texlive-context-title.

* gnu/packages/tex.scm (texlive-context-title): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 01b68872f5..05abcb5131 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10515,6 +10515,29 @@ presentation.  Most styles are configurable, and it is easy to design
 new styles.")
     (license license:gpl3+)))
 
+(define-public texlive-context-title
+  (package
+    (name "texlive-context-title")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/title/"
+                   "tex/context/interface/third/"
+                   "tex/context/third/title/")
+             (base32
+              "1ah7b5lgqq668s17d5glnl2bwyzh7idsdib4ijxarx7ahph06jx2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-title")
+    (synopsis "Place document titles")
+    (description
+     "The title module provides the @code{\\placetitle} command to put
+a title block into your document.  With the command
+@code{\\setuptitle} values can be set for @code{\\placetitle} and
+change the formatting of the content.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From e50c9a25cfa39b651d6a299d6ade99db1ce208a4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:40:10 +0200
Subject: gnu: Add texlive-context-transliterator.

* gnu/packages/tex.scm (texlive-context-transliterator): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 05abcb5131..fdcfc73845 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10538,6 +10538,29 @@ a title block into your document.  With the command
 change the formatting of the content.")
     (license license:gpl3+)))
 
+(define-public texlive-context-transliterator
+  (package
+    (name "texlive-context-transliterator")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/transliterator/"
+                   "scripts/context/lua/third/transliterator/"
+                   "tex/context/interface/third/"
+                   "tex/context/third/transliterator/")
+             (base32
+              "0hrj6sjldi7chqdnf300bs1q9s92v9sl2mfx3h0644mzjgjxw7s1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-transliterator")
+    (synopsis "Transliterate text from other alphabets")
+    (description
+     "The package will read text in one alphabet, and provide a transliterated
+version in another; this is useful for readers who cannot read the original
+alphabet.  The package can make allowance for hyphenation.")
+    (license license:bsd-2)))           ;from "t-transliterator.mkiv"
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 52d02610f4e482bf046219bc804342ad7f799a1e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:41:01 +0200
Subject: gnu: Add texlive-context-typearea.

* gnu/packages/tex.scm (texlive-context-typearea): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fdcfc73845..d96c9aee70 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10561,6 +10561,26 @@ version in another; this is useful for readers who cannot read the original
 alphabet.  The package can make allowance for hyphenation.")
     (license license:bsd-2)))           ;from "t-transliterator.mkiv"
 
+(define-public texlive-context-typearea
+  (package
+    (name "texlive-context-typearea")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/typearea/"
+                   "tex/context/third/typearea/")
+             (base32
+              "0np4yn0kjq1m7rrhcfxrai18qk19051188sfn9lrvphj604s7sna")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-typearea")
+    (synopsis "Something like Koma-Script typearea")
+    (description
+     "The module provides a command that calculates the page layout as the
+LaTeX package @code{typearea} does.")
+    (license license:gpl3+)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From b8d2e4da67c4b7205fae443f5741a3c706309463 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:41:14 +0200
Subject: gnu: Add texlive-context-typescripts.

* gnu/packages/tex.scm (texlive-context-typescripts): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d96c9aee70..f483fc39d1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10581,6 +10581,27 @@ alphabet.  The package can make allowance for hyphenation.")
 LaTeX package @code{typearea} does.")
     (license license:gpl3+)))
 
+(define-public texlive-context-typescripts
+  (package
+    (name "texlive-context-typescripts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/typescripts/"
+                   "tex/context/third/typescripts/")
+             (base32
+              "0kz3flqyzg2p7lvr7yy1h1nmk368glzxxhwirizn5g4xv5sdf27b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-typescripts")
+    (synopsis "Small modules to load various fonts for use in ConTeXt")
+    (description
+     "The package provides files offering interfaces to 33 publicly available
+fonts (or collections of fonts from the same foundry); each is available in
+a @file{.mkii} and a @file{.mkiv} version.")
+    (license license:gpl2)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 005b3bf3cd474f92768280d1df6baf8a707bd501 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:43:07 +0200
Subject: gnu: Add texlive-context-filter.

* gnu/packages/tex.scm (texlive-context-filter): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f483fc39d1..6afb2b07a4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10238,6 +10238,31 @@ With parameters one can adjust the spacing around the content and set
 a default symbol.")
     (license license:gpl3+)))
 
+(define-public texlive-context-filter
+  (package
+    (name "texlive-context-filter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/filter/"
+                   "tex/context/third/filter/")
+             (base32
+              "03nv2zd3aiv9lkq0bwq6awibn1acjprkc6b6jr5jslcyy4sw3k7w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-filter")
+    (synopsis
+     "Run external programs on the contents of a start-stop environment")
+    (description
+     "The @code{filter} module provides a simple interface to run external
+programs on the contents of a start-stop environment.  Options are available
+to run the external program only if the content of the environment has
+changed, to specify how the program output should be read back, and to choose
+the name of the temporary files that are created.  The module is compatible
+with both MkII and MkIV.")
+    (license license:bsd-2)))
+
 (define-public texlive-context-french
   (package
     (name "texlive-context-french")
-- 
cgit 1.4.1


From c124a4bbc9ed8a4b9cb27bc70750de20b8a3edc5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:43:31 +0200
Subject: gnu: Add texlive-context-vim.

* gnu/packages/tex.scm (texlive-context-vim): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6afb2b07a4..7312b12381 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10627,6 +10627,32 @@ fonts (or collections of fonts from the same foundry); each is available in
 a @file{.mkii} and a @file{.mkiv} version.")
     (license license:gpl2)))
 
+(define-public texlive-context-vim
+  (package
+    (name "texlive-context-vim")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/vim/"
+                   "tex/context/third/vim/")
+             (base32
+              "03cwdqkrx6bgcikmyxrwkyac3jmz7i50cavgb6r8b26zrsm522ca")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context texlive-context-filter))
+    (home-page "https://ctan.org/pkg/context-vim")
+    (synopsis "Generate ConTeXt syntax highlighting code from Vim")
+    (description
+     "ConTeXt has excellent pretty printing capabilities for many languages.
+The code for pretty printing is written in TeX, and due to catcode juggling,
+such verbatim typesetting is perhaps the trickiest part of TeX.  This makes it
+difficult for a normal user to define syntax highlighting rules for a new
+language.  This module takes the onus of defining syntax highlighting rules
+away from the user and uses Vim editor to generate the syntax highlighting.
+There is a helper @file{2context.vim} script to do the syntax parsing in
+Vim.")
+    (license license:bsd-2)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 9c1296973628a1f5c44189f8a66a36970e6ebb88 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:44:13 +0200
Subject: gnu: Add texlive-context-visualcounter.

* gnu/packages/tex.scm (texlive-context-visualcounter): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7312b12381..d4d7837797 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10653,6 +10653,28 @@ There is a helper @file{2context.vim} script to do the syntax parsing in
 Vim.")
     (license license:bsd-2)))
 
+(define-public texlive-context-visualcounter
+  (package
+    (name "texlive-context-visualcounter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/visualcounter/"
+                   "source/context/third/visualcounter/"
+                   "tex/context/third/visualcounter/")
+             (base32
+              "0rq2zqrvbidwngc4jyv4ay84y5l854z1shk08cjlvnlbsgrg7lmk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-context))
+    (home-page "https://ctan.org/pkg/context-visualcounter")
+    (synopsis "Visual display of ConTeXt counters")
+    (description
+     "This package provides a typical document usually contains many counters:
+page numbers, section numbers, itemizations, enumerations, theorems, and so
+on.  This module provides a visual display for such counters.")
+    (license license:bsd-2)))
+
 (define-public texlive-beamer
   (package
     (name "texlive-beamer")
-- 
cgit 1.4.1


From 2d48e1a18b8d64d2fd05aa800f7d905446b0dae4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:44:34 +0200
Subject: gnu: Add texlive-jmn.

* gnu/packages/tex.scm (texlive-jmn): New variable.
---
 gnu/packages/tex.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d4d7837797..852727a483 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6730,6 +6730,23 @@ in SGML; use maths minus in text as appropriate; simple Young tableaux.")
 (define-deprecated-package texlive-latex-jknapltx texlive-jknapltx)
 (define-deprecated-package texlive-jknappen texlive-jknapltx)
 
+(define-public texlive-jmn
+  (package
+    (name "texlive-jmn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/afm/jmn/hans/" "fonts/enc/dvips/jmn/"
+                   "fonts/map/dvips/jmn/" "fonts/tfm/jmn/hans/"
+                   "fonts/type1/jmn/hans/")
+             (base32
+              "0iq5ky3llx50smw80lpylv11jmqc51m5yrhlslz3sakmgdqgg1yi")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jmn")
+    (synopsis "Special fonts for ConTeXt")
+    (description "This ConTeXt module provides special fonts.")
+    (license license:bsd-2)))           ;as the whole ConTeXt project
+
 (define-public texlive-kvoptions
   (package
     (name "texlive-kvoptions")
-- 
cgit 1.4.1


From b853941a622e6c72dd1dcc6c79db2f9a570d523b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 18 Jun 2023 18:45:25 +0200
Subject: gnu: Add texlive-collection-context.

* gnu/packages/tex.scm (texlive-collection-context): New variable.
---
 gnu/packages/tex.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 852727a483..1a53979f82 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12128,6 +12128,56 @@ 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-context
+  (package
+    (name "texlive-collection-context")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-collection-basic
+           texlive-context
+           texlive-context-account
+           texlive-context-algorithmic
+           texlive-context-animation
+           texlive-context-annotation
+           texlive-context-bnf
+           texlive-context-chromato
+           texlive-context-cmscbf
+           texlive-context-cmttbf
+           texlive-context-construction-plan
+           texlive-context-cyrillicnumbers
+           texlive-context-degrade
+           texlive-context-fancybreak
+           texlive-context-filter
+           texlive-context-french
+           texlive-context-fullpage
+           texlive-context-gantt
+           texlive-context-gnuplot
+           texlive-context-handlecsv
+           texlive-context-layout
+           texlive-context-letter
+           texlive-context-lettrine
+           texlive-context-mathsets
+           texlive-context-rst
+           texlive-context-ruby
+           texlive-context-simplefonts
+           texlive-context-simpleslides
+           texlive-context-title
+           texlive-context-transliterator
+           texlive-context-typearea
+           texlive-context-typescripts
+           texlive-context-vim
+           texlive-context-visualcounter
+           texlive-jmn))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "ConTeXt and packages")
+    (description
+     "This package provides Hans Hagen's powerful ConTeXt system, along with
+third-party ConTeXt packages.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-collection-fontsrecommended
   (package
     (name "texlive-collection-fontsrecommended")
-- 
cgit 1.4.1


From 15e928f5e3d78e46eedd25cd1e9e2a7440f917f6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:04:30 +0200
Subject: gnu: Add texlive-automata.

* gnu/packages/tex.scm (texlive-automata): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1a53979f82..e3c794163d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2613,6 +2613,28 @@ the @file{.aux} file.")
 
 (define-deprecated-package texlive-latex-atveryend texlive-atveryend)
 
+(define-public texlive-automata
+  (package
+    (name "texlive-automata")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/automata/"
+                   "metapost/automata/")
+             (base32
+              "0y02wp1w2jkhrxanz7r699kr08bmbfn0h0xaxj3zh4xj9745d7d7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/automata")
+    (synopsis "Finite state machines, graphs and trees in MetaPost")
+    (description
+     "The package offers a collection of macros for MetaPost to make easier to
+draw finite-state machines, automata, labelled graphs, etc.  The user defines
+nodes, which may be isolated or arranged into matrices or trees; edges connect
+pairs of nodes through arbitrary paths.  Parameters, that specify the shapes
+of nodes and the styles of edges, may be adjusted.")
+    (license license:lppl)))
+
 (define-public texlive-auxhook
   (package
     (name "texlive-auxhook")
-- 
cgit 1.4.1


From 78ccd513fefc46077d752284381d3504fe2def1d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:04:56 +0200
Subject: gnu: Add texlive-bbcard.

* gnu/packages/tex.scm (texlive-bbcard): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e3c794163d..dda18ae7cc 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4178,6 +4178,24 @@ a language chosen by the user.  In addition, the package supports commands to
 change the typography of the bibliographies.")
     (license license:lppl1.0+)))
 
+(define-public texlive-bbcard
+  (package
+    (name "texlive-bbcard")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/bbcard/" "metapost/bbcard/")
+             (base32
+              "1f1d3l85d0308izqpydmqmb4vpw47lqx1pwjiq14npjs8zfzkp18")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bbcard")
+    (synopsis "Bullshit bingo, calendar and baseball-score cards")
+    (description
+     "This set contains three jiffy packages for creating cards of various
+sorts with MetaPost.")
+    (license license:public-domain)))
+
 (define-public texlive-cmexb
   (package
     (name "texlive-cmexb")
-- 
cgit 1.4.1


From 33e3880687ea0c0589c6dd19f7842879839cd9ec Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:05:12 +0200
Subject: gnu: Add texlive-blockdraw-mp.

* gnu/packages/tex.scm (texlive-blockdraw-mp): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dda18ae7cc..2f6a066590 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4196,6 +4196,26 @@ change the typography of the bibliographies.")
 sorts with MetaPost.")
     (license license:public-domain)))
 
+(define-public texlive-blockdraw-mp
+  (package
+    (name "texlive-blockdraw-mp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/blockdraw_mp/"
+                   "metapost/blockdraw_mp/")
+             (base32
+              "1z0cgjslx4kx8fspf3i5h4idxlzhgpm14i16vq88c96z8cdjb2xy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/blockdraw_mp")
+    (synopsis "Block diagrams and bond graphs, with MetaPost")
+    (description
+     "This package provides a set of simple MetaPost macros to draw block
+diagrams and bond graphs. While the task is not itself difficult to program,
+it is felt that many users will be happy to have a library for the job.")
+    (license license:lppl)))
+
 (define-public texlive-cmexb
   (package
     (name "texlive-cmexb")
-- 
cgit 1.4.1


From 8210579aaace3a9a5b0b780d1691bd4a028ca471 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:05:27 +0200
Subject: gnu: Add texlive-bpolynomial.

* gnu/packages/tex.scm (texlive-bpolynomial): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2f6a066590..3f916591de 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4216,6 +4216,28 @@ diagrams and bond graphs. While the task is not itself difficult to program,
 it is felt that many users will be happy to have a library for the job.")
     (license license:lppl)))
 
+(define-public texlive-bpolynomial
+  (package
+    (name "texlive-bpolynomial")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/bpolynomial/"
+                   "metapost/bpolynomial/")
+             (base32
+              "1p4c3xc55zij85yy1jhmj7jrkxss935qx5zdxbm79mjlxx1aq1q0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bpolynomial")
+    (synopsis "Drawing polynomial functions of up to order 3")
+    (description
+     "This MetaPost package helps plotting polynomial and root functions up to
+order three.  The package provides macros to calculate Bezier curves exactly
+matching a given constant, linear, quadratic or cubic polynomial, or square or
+cubic root function.  In addition, tangents on all functions and derivatives
+of polynomials can be calculated.")
+    (license license:lppl)))
+
 (define-public texlive-cmexb
   (package
     (name "texlive-cmexb")
-- 
cgit 1.4.1


From f08a918e2b26ae183334f24b52ffcff77c138ee0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:05:41 +0200
Subject: gnu: Add texlive-cmarrows.

* gnu/packages/tex.scm (texlive-cmarrows): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3f916591de..eb12a2764d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4238,6 +4238,25 @@ cubic root function.  In addition, tangents on all functions and derivatives
 of polynomials can be calculated.")
     (license license:lppl)))
 
+(define-public texlive-cmarrows
+  (package
+    (name "texlive-cmarrows")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/cmarrows/"
+                   "metapost/cmarrows/")
+             (base32
+              "1awyf474n4f6fivb7ih9mpmz6641f815in8qrg2biagys3czsq96")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cmarrows")
+    (synopsis "MetaPost arrows and braces in the Computer Modern style")
+    (description
+     "This MetaPost package contains macros to draw arrows and braces in the
+Computer Modern style.")
+    (license license:lppl)))
+
 (define-public texlive-cmexb
   (package
     (name "texlive-cmexb")
-- 
cgit 1.4.1


From 40ba14a0e06667dbccec813a6978d7024dbb5768 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:06:17 +0200
Subject: gnu: Add texlive-drv.

* gnu/packages/tex.scm (texlive-drv): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index eb12a2764d..49f3496453 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4873,6 +4873,25 @@ implementation is output device independent, and made very simple by relying
 on @code{everypage}.")
     (license license:lppl1.3+)))
 
+(define-public texlive-drv
+  (package
+    (name "texlive-drv")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/drv/" "metapost/drv/")
+             (base32
+              "0vjc9x9xa50zzzc3m2csj9x0gqwcamhyqz1xkdbkqwkcy8rfpnlh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/drv")
+    (synopsis "Derivation trees with MetaPost")
+    (description
+     "This package provides a set of MetaPost macros for typesetting
+derivation trees (such as used in sequent calculus, type inference,
+programming language semantics...).")
+    (license license:lppl)))
+
 (define-public texlive-enctex
   (package
     (name "texlive-enctex")
-- 
cgit 1.4.1


From 3678287e9973700d4f74972cb47baec7b2f4c918 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:06:39 +0200
Subject: gnu: Add texlive-dviincl.

* gnu/packages/tex.scm (texlive-dviincl): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 49f3496453..3c26e1d891 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4892,6 +4892,26 @@ derivation trees (such as used in sequent calculus, type inference,
 programming language semantics...).")
     (license license:lppl)))
 
+(define-public texlive-dviincl
+  (package
+    (name "texlive-dviincl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/dviincl/" "metapost/dviincl/")
+             (base32
+              "05f6ll7cq4ad4i4nkzrjnlqg1456is06fbmjiinadahf7yrqk3lw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dviincl")
+    (synopsis "Include a DVI page into MetaPost output")
+    (description
+     "DVItoMP is one of the auxiliary programs available to any MetaPost
+package; it converts a DVI file into a MetaPost file.  Using it, one can
+envisage including a DVI page into an EPS files generated by MetaPost.  Such
+files allow pages to include other pages.")
+    (license license:public-domain)))
+
 (define-public texlive-enctex
   (package
     (name "texlive-enctex")
-- 
cgit 1.4.1


From c489a82a1384f73c82af9bffbfac205df21d6367 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:07:40 +0200
Subject: gnu: Add texlive-emp.

* gnu/packages/tex.scm (texlive-emp): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3c26e1d891..353c72b590 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4912,6 +4912,31 @@ envisage including a DVI page into an EPS files generated by MetaPost.  Such
 files allow pages to include other pages.")
     (license license:public-domain)))
 
+(define-public texlive-emp
+  (package
+    (name "texlive-emp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/emp/" "source/latex/emp/"
+                   "tex/latex/emp/")
+             (base32
+              "183qwxxjws4l0jrn92dj4qd8avnv9gq2rk1zqak0h48wxlp0fpyq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/emp")
+    (synopsis "Encapsulate MetaPost figures in a document")
+    (description
+     "Emp is a package for encapsulating MetaPost figures in LaTeX: the
+package provides environments where you can place MetaPost commands, and means
+of using that code as fragments for building up figures to include in your
+document.  So, with Emp, the procedure is to run your document with LaTeX, run
+MetaPost, and then complete running your document in the normal way.  Emp is
+therefore useful for keeping illustrations in synchrony with the text.  It
+also frees you from inventing descriptive names for PostScript files that fit
+into the confines of file system conventions.")
+    (license license:gpl3+)))
+
 (define-public texlive-enctex
   (package
     (name "texlive-enctex")
-- 
cgit 1.4.1


From 2e241d5b04afd1b3887518a98ca10c957b8810c6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:08:13 +0200
Subject: gnu: Add texlive-epsincl.

* gnu/packages/tex.scm (texlive-epsincl): New variable.
---
 gnu/packages/tex.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 353c72b590..64f0dcb21a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4982,6 +4982,23 @@ define a new author interface to creating new environments.")
 
 (define-deprecated-package texlive-latex-environ texlive-environ)
 
+(define-public texlive-epsincl
+  (package
+    (name "texlive-epsincl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/epsincl/" "metapost/epsincl/")
+             (base32
+              "1pjnfqayh42gavlbd9wqn86qyqhw1bxrbmwgsv39ycj4s63xjxqr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/epsincl")
+    (synopsis "Include EPS in MetaPost figures")
+    (description
+     "The package facilitates including EPS files in MetaPost figures.")
+    (license license:public-domain)))
+
 (define-public texlive-eqparbox
   (package
     (name "texlive-eqparbox")
-- 
cgit 1.4.1


From b93ad894503426d9439ac5c22237c6042ba9e8cf Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:08:37 +0200
Subject: gnu: Add texlive-expressg.

* gnu/packages/tex.scm (texlive-expressg): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 64f0dcb21a..3c6b389363 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5089,6 +5089,29 @@ remain in sequence).")
 
 (define-deprecated-package texlive-latex-expdlist texlive-expdlist)
 
+(define-public texlive-expressg
+  (package
+    (name "texlive-expressg")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/expressg/"
+                   "metapost/expressg/"
+                   "source/metapost/expressg/")
+             (base32
+              "08f6lxxxmhfld6g2iy2kn68llalz3wayxqka7nd48s1ahm33kmdd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/expressg")
+    (synopsis "Diagrams consisting of boxes, lines, and annotations")
+    (description
+     "This package provides a MetaPost package providing facilities to assist
+in drawing diagrams that consist of boxes, lines, and annotations.  Particular
+support is provided for creating EXPRESS-G diagrams, for example IDEF1X, OMT,
+Shlaer-Mellor, and NIAM diagrams.  The package may also be used to create UML
+and most other Box-Line-Annotation charts, but not Gantt charts directly.")
+    (license license:lppl)))
+
 (define-public texlive-filemod
   (package
     (name "texlive-filemod")
-- 
cgit 1.4.1


From 09e0b7fff5ec577e83bb5b2ab69391ecab256089 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:09:16 +0200
Subject: gnu: Add texlive-exteps.

* gnu/packages/tex.scm (texlive-exteps): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3c6b389363..8494776ff4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5112,6 +5112,25 @@ Shlaer-Mellor, and NIAM diagrams.  The package may also be used to create UML
 and most other Box-Line-Annotation charts, but not Gantt charts directly.")
     (license license:lppl)))
 
+(define-public texlive-exteps
+  (package
+    (name "texlive-exteps")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/exteps/" "metapost/exteps/")
+             (base32
+              "1mmlmcjn8fk16y14p3q6xfmkcc75vcykblgcyzapzxd1nzy51ak7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/exteps")
+    (synopsis "Include EPS figures in MetaPost")
+    (description
+     "Exteps is a module for including external EPS figures into MetaPost
+figures.  It is written entirely in MetaPost, and does not therefore require
+any post processing of the MetaPost output.")
+    (license license:gpl3+)))
+
 (define-public texlive-filemod
   (package
     (name "texlive-filemod")
-- 
cgit 1.4.1


From 22f03ba5c6c2842ece551d8150ca9f585fdf50df Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:09:38 +0200
Subject: gnu: Add texlive-featpost.

* gnu/packages/tex.scm (texlive-featpost): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8494776ff4..4ecda4ecb2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5131,6 +5131,26 @@ figures.  It is written entirely in MetaPost, and does not therefore require
 any post processing of the MetaPost output.")
     (license license:gpl3+)))
 
+(define-public texlive-featpost
+  (package
+    (name "texlive-featpost")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/featpost/"
+                   "metapost/featpost/")
+             (base32
+              "0a97syvr3vwpayhasb98ssvgwr99p13plrjnqb9ad24jd6srmmdg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/featpost")
+    (synopsis "MetaPost macros for 3D")
+    (description
+     "These macros allow the production of three-dimensional schemes
+containing angles, circles, cylinders, cones and spheres, among other
+things.")
+    (license license:gpl3+)))
+
 (define-public texlive-filemod
   (package
     (name "texlive-filemod")
-- 
cgit 1.4.1


From bf5c92c6798fdb4688bf260258e4c6f110b4384b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:10:28 +0200
Subject: gnu: Add texlive-feynmf.

* gnu/packages/tex.scm (texlive-feynmf): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4ecda4ecb2..f4be064c39 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5151,6 +5151,29 @@ containing angles, circles, cylinders, cones and spheres, among other
 things.")
     (license license:gpl3+)))
 
+(define-public texlive-feynmf
+  (package
+    (name "texlive-feynmf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/feynmf/" "metafont/feynmf/"
+                   "metapost/feynmf/" "source/latex/feynmf/"
+                   "tex/latex/feynmf/")
+             (base32
+              "1a6zhs4x6rkjl7vapc3y59hmrvmi570ji2bszpsk88w3fi8klckb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/feynmf")
+    (synopsis "Macros and fonts for creating Feynman (and other) diagrams")
+    (description
+     "The @code{feynmf} package provides an interface to Metafont to use
+simple structure specifications to produce relatively complex diagrams. While
+the package was designed for Feynman diagrams, it could in principle be used
+for diagrams in graph and similar theories, where the structure is
+semi-algorithmically determined.")
+    (license license:gpl3+)))
+
 (define-public texlive-filemod
   (package
     (name "texlive-filemod")
-- 
cgit 1.4.1


From 6650b656ea188b809cb05b521d3ec6869c2fd602 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:10:50 +0200
Subject: gnu: Add texlive-feynmp-auto.

* gnu/packages/tex.scm (texlive-feynmp-auto): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f4be064c39..b02dcf8ff2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5174,6 +5174,28 @@ for diagrams in graph and similar theories, where the structure is
 semi-algorithmically determined.")
     (license license:gpl3+)))
 
+(define-public texlive-feynmp-auto
+  (package
+    (name "texlive-feynmp-auto")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/feynmp-auto/"
+                   "source/latex/feynmp-auto/"
+                   "tex/latex/feynmp-auto/")
+             (base32
+              "19ghfblv641ghak049v42wbqmh7pfadz0mrbkfbx2jr4bvf57rv2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/feynmp-auto")
+    (synopsis "Automatic processing of @code{feynmp} graphics")
+    (description
+     "The package takes care of running Metapost on the output files produced
+by the @code{feynmp} package, so that the compiled pictures will be available
+in the next run of LaTeX. The package honours options that apply to
+@code{feynmp}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-filemod
   (package
     (name "texlive-filemod")
-- 
cgit 1.4.1


From 4c9cff98842fb22ba75ab65445253f6db6f71ef9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:11:20 +0200
Subject: gnu: Add texlive-fiziko.

* gnu/packages/tex.scm (texlive-fiziko): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b02dcf8ff2..7f4d99a592 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5248,6 +5248,27 @@ that column has any marks at all; keep two column floats like @code{figure*}
 in sequence with single column floats like figure.")
     (license license:lppl)))
 
+(define-public texlive-fiziko
+  (package
+    (name "texlive-fiziko")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin name version
+                            (list "doc/metapost/fiziko/" "metapost/fiziko/")
+                            (base32
+                             "160iqgm4f7imnj89gj4822xv5wnnxf336k261v52h6sd0lhnhany")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fiziko")
+    (synopsis "MetaPost library for physics textbook illustrations")
+    (description
+     "This MetaPost library was initially written to automate some elements of
+black and white illustrations for a physics textbook.  It provides functions
+to draw things like lines of variable width, shaded spheres, and tubes of
+different kinds, which can be used to produce images of a variety of objects.
+The library also contains functions to draw some objects constructed from
+these primitives.")
+    (license (list license:gpl3+ license:cc-by-sa4.0))))
+
 (define-public texlive-hanging
   (package
     (name "texlive-hanging")
-- 
cgit 1.4.1


From aff83a15a7f1f9884092ca2b907ab59b6089d280 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:11:43 +0200
Subject: gnu: Add texlive-garrigues.

* gnu/packages/tex.scm (texlive-garrigues): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7f4d99a592..58ea41ff3e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5269,6 +5269,25 @@ The library also contains functions to draw some objects constructed from
 these primitives.")
     (license (list license:gpl3+ license:cc-by-sa4.0))))
 
+(define-public texlive-garrigues
+  (package
+    (name "texlive-garrigues")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/garrigues/"
+                   "metapost/garrigues/")
+             (base32
+              "0vg1j0r4mkp057v7kjr8yza1danc3zj7k590x5531yi0gzp7hgq2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/garrigues")
+    (synopsis "MetaPost macros for the reproduction of Garrigues' Easter nomogram")
+    (description
+     "This library provides MetaPost macros for the reproduction of Garrigues
+Easter nomogram.")
+    (license license:lppl)))
+
 (define-public texlive-hanging
   (package
     (name "texlive-hanging")
-- 
cgit 1.4.1


From 5a05a146deea829a921b78cdfd8a52692ce956a9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:12:06 +0200
Subject: gnu: Add texlive-gmp.

* gnu/packages/tex.scm (texlive-gmp): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 58ea41ff3e..b0420d3779 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5363,6 +5363,27 @@ yet reflected in the package's or class's code.  The file
 meant to be loaded during format generation and not by the user.")
     (license license:lppl1.3c)))
 
+(define-public texlive-gmp
+  (package
+    (name "texlive-gmp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gmp/" "source/latex/gmp/"
+                   "tex/latex/gmp/")
+             (base32
+              "1zvl80wjg4xsika0p0v6jskrwdpy3n7qbfvbg76qbzzpc03n6x6a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gmp")
+    (synopsis "Enable integration between MetaPost pictures and LaTeX")
+    (description
+     "The package allows integration between MetaPost pictures and LaTeX.
+The main feature is that passing parameters to the MetaPost pictures is
+possible and the picture code can be put inside arguments to commands,
+including @code{\\newcommand}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-ifplatform
   (package
     (name "texlive-ifplatform")
-- 
cgit 1.4.1


From 22c8a01a8d1e98b446bf4987a456860558bcb3aa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:13:36 +0200
Subject: gnu: Add texlive-hershey-mp.

* gnu/packages/tex.scm (texlive-hershey-mp): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b0420d3779..8637eb0f99 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5384,6 +5384,27 @@ possible and the picture code can be put inside arguments to commands,
 including @code{\\newcommand}.")
     (license license:lppl1.3+)))
 
+(define-public texlive-hershey-mp
+  (package
+    (name "texlive-hershey-mp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/hershey-mp/"
+                   "metapost/hershey-mp/")
+             (base32
+              "1pbybiqh5qgj9zh0yifxm2hn25h73kz1glrv1cz9sw38h6iydlzw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hershey-mp")
+    (synopsis "MetaPost support for the Hershey font file format")
+    (description
+     "This package provides MetaPost support for reading jhf vector font
+files, used by (mostly? only?) the so-called Hershey Fonts of the late 1960s.
+The package does not include the actual font files, which you can probably
+find in the software repository of your operating system.")
+    (license license:eupl1.2)))
+
 (define-public texlive-ifplatform
   (package
     (name "texlive-ifplatform")
-- 
cgit 1.4.1


From 59412fc426baa5488874585d32bfb461d0796403 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:15:51 +0200
Subject: gnu: Add texlive-latexmp.

* gnu/packages/tex.scm (texlive-latexmp): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8637eb0f99..73c8b23dd3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5433,6 +5433,29 @@ between various classes of Unix systems.")
 
 (define-deprecated-package texlive-latex-ifplatform texlive-ifplatform)
 
+(define-public texlive-latexmp
+  (package
+    (name "texlive-latexmp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/latexmp/" "metapost/latexmp/")
+             (base32
+              "1zxwxss5sl16laaqalr8043wmyk2bhlja3al5xlxkizvlnflqy0f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/latexmp")
+    (synopsis "Interface for LaTeX-based typesetting in MetaPost")
+    (description
+     "The MetaPost package @code{latexMP} implements a user-friendly interface
+to access LaTeX-based typesetting capabilities in MetaPost.  The text to be
+typeset is given as string.  This allows even dynamic text elements, for
+example counters, to be used in labels.  Compared to other implementations it
+is much more flexible, since it can be used as direct replacement for
+@code{btex.etex}, and much faster, compared for example to the solution
+provided by @code{tex.mp}.")
+    (license license:public-domain)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From 8a03984e454df5498dde7b38880168f20a438f1d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:16:10 +0200
Subject: gnu: Add texlive-mcf2graph.

* gnu/packages/tex.scm (texlive-mcf2graph): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 73c8b23dd3..47976cfe50 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5456,6 +5456,25 @@ 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-mcf2graph
+  (package
+    (name "texlive-mcf2graph")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/mcf2graph/")
+             (base32
+              "1pji3d2mllfi74kalvs11h7yy3hkm5g5nlmcpq2vn7cxjbaqk9sq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mcf2graph")
+    (synopsis "Draw chemical structure diagrams with MetaPost")
+    (description
+     "The Molecular Coding Format (MCF) is a linear notation for describing
+chemical structure diagrams.  This package converts MCF to graphic files using
+MetaPost.")
+    (license license:expat)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From d05109ca2c31633d9b957b11cfbb17f5a068f1ea Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:16:31 +0200
Subject: gnu: Add texlive-metago.

* gnu/packages/tex.scm (texlive-metago): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 47976cfe50..72303d6e29 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5475,6 +5475,25 @@ chemical structure diagrams.  This package converts MCF to graphic files using
 MetaPost.")
     (license license:expat)))
 
+(define-public texlive-metago
+  (package
+    (name "texlive-metago")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/metago/" "metapost/metago/")
+             (base32
+              "13m61ml8wfs5888nifilgzi503m3gz1f2fa44408jdhlr6zk6fa0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/metago")
+    (synopsis "MetaPost output of Go positions")
+    (description
+     "The package allows you to draw Go game positions with MetaPost.  Two
+methods of usage are provided, either using the package programmatically, or
+using the package via a script (which may produce several images).")
+    (license license:lppl)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From a56b0dbf43f3bbc05aa8387eb99bd0dd7998bc18 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:16:51 +0200
Subject: gnu: Add texlive-metaobj.

* gnu/packages/tex.scm (texlive-metaobj): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 72303d6e29..e2fccd9b2b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5494,6 +5494,26 @@ methods of usage are provided, either using the package programmatically, or
 using the package via a script (which may produce several images).")
     (license license:lppl)))
 
+(define-public texlive-metaobj
+  (package
+    (name "texlive-metaobj")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/metaobj/" "metapost/metaobj/")
+             (base32
+              "1ir6p14h79x5iqbxmj2893x8j1d490bnhs83jwnrbcjxn0yxky6w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/metaobj")
+    (synopsis "MetaPost package providing high-level objects")
+    (description
+     "METAOBJ is a large MetaPost package providing high-level objects.  It
+implements many of PSTricks features for node connections, but also trees,
+matrices, and many other things.  It more or less contains @code{boxes.mp} and
+@code{rboxes.mp}.  It is easily extensible with new objects.")
+    (license license:lppl)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From b166b6f634208e77bf73107a6185efd96ab4a6c3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:17:18 +0200
Subject: gnu: Add texlive-metaplot.

* gnu/packages/tex.scm (texlive-metaplot): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e2fccd9b2b..e942762162 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5514,6 +5514,30 @@ matrices, and many other things.  It more or less contains @code{boxes.mp} and
 @code{rboxes.mp}.  It is easily extensible with new objects.")
     (license license:lppl)))
 
+(define-public texlive-metaplot
+  (package
+    (name "texlive-metaplot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/metaplot/" "metapost/metaplot/")
+             (base32
+              "19y8lj28gvky7f7g2i562ixwvmnxnflnfc8l8r0x7zg384hg8835")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/metaplot")
+    (synopsis "Plot-manipulation macros for use in MetaPost")
+    (description
+     "MetaPlot is a set of MetaPost macros for manipulating pre-generated
+plots (and similar objects), and formatting them for inclusion in a MetaPost
+figure.  The intent is that the plots can be generated by some outside
+program, in an abstract manner that does not require making decisions about
+on-page sizing and layout, and then they can be imported into MetaPlot and
+arranged using the full capabilities of MetaPost.  Metaplot also includes
+a very flexible set of macros for generating plot axes, which may be useful in
+other contexts as well.")
+    (license license:lppl)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From bef9e04eebafced2731e7d08b3eda8bacff0e3f4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:17:36 +0200
Subject: gnu: Add texlive-metapost-colorbrewer.

* gnu/packages/tex.scm (texlive-metapost-colorbrewer): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e942762162..257beb7591 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5538,6 +5538,28 @@ a very flexible set of macros for generating plot axes, which may be useful in
 other contexts as well.")
     (license license:lppl)))
 
+(define-public texlive-metapost-colorbrewer
+  (package
+    (name "texlive-metapost-colorbrewer")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/metapost-colorbrewer/"
+                   "metapost/metapost-colorbrewer/")
+             (base32
+              "00bpdz2k849k1sfrlflxhdbylncb5y2bixgmylyh0i8rbb467q7l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/metapost-colorbrewer")
+    (synopsis
+     "Implementation of the @code{colorbrewer2.org} colours for MetaPost")
+    (description
+     "This package provides two MetaPost include files that define all the
+@code{colorbrewer2.org} colours: @code{colorbrewer-cmyk.mp} and
+@code{colorbrewer-rgb.mp}. The first defines all the colours as CMYK, the
+second as RGB.")
+    (license license:gpl3+)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From 57f5e3d4421a3345f0860394b4470c4f4d7c68d4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:17:50 +0200
Subject: gnu: Add texlive-metauml.

* gnu/packages/tex.scm (texlive-metauml): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 257beb7591..abc95e291a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5560,6 +5560,25 @@ other contexts as well.")
 second as RGB.")
     (license license:gpl3+)))
 
+(define-public texlive-metauml
+  (package
+    (name "texlive-metauml")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/metauml/" "metapost/metauml/")
+             (base32
+              "01hs234mjqnr39zm7jl6dpbm5w0k4p73pr0aj35ii0dhakln2jsy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/metauml")
+    (synopsis "MetaPost library for typesetting UML diagrams")
+    (description
+     "MetaUML is a MetaPost library for typesetting UML diagrams, which
+provides a usable, human-friendly textual notation for UML, offering now
+support for class, package, activity, state, and use case diagrams.")
+    (license license:gpl3+)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From ff5de6f612a549005fd34aba0b4ad8ecbecf9097 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:18:18 +0200
Subject: gnu: Add texlive-mfpic.

* gnu/packages/tex.scm (texlive-mfpic): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index abc95e291a..896455fad9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5579,6 +5579,31 @@ provides a usable, human-friendly textual notation for UML, offering now
 support for class, package, activity, state, and use case diagrams.")
     (license license:gpl3+)))
 
+(define-public texlive-mfpic
+  (package
+    (name "texlive-mfpic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/mfpic/" "metafont/mfpic/"
+                   "metapost/mfpic/" "source/generic/mfpic/"
+                   "tex/generic/mfpic/")
+             (base32
+              "1s3z31mglmij7qc1f0681vv2a6md9wz9zbi6zlh7zvmhy5hzkjkv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mfpic")
+    (synopsis "Draw Metafont/post pictures from (La)TeX commands")
+    (description
+     "Mfpic is a scheme for producing pictures from (La)TeX commands.
+Commands @code{\\mfpic} and @code{\\endmfpic} (in LaTeX, the @code{mfpic}
+environment) enclose a group in which drawing commands may be placed.  The
+commands generate a Meta-language file, which may be processed by MetaPost (or
+even Metafont).  The resulting image file will be read back in to the document
+to place the picture at the point where the original (La)TeX commands
+appeared.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From b27c4b7a20dfb754e0c29400f7e266b2bf3d2026 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:20:49 +0200
Subject: gnu: Add texlive-mfpic4ode.

* gnu/packages/tex.scm (texlive-mfpic4ode): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 896455fad9..745c17d716 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5604,6 +5604,29 @@ to place the picture at the point where the original (La)TeX commands
 appeared.")
     (license license:lppl1.3+)))
 
+(define-public texlive-mfpic4ode
+  (package
+    (name "texlive-mfpic4ode")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mfpic4ode/"
+                   "source/latex/mfpic4ode/"
+                   "tex/latex/mfpic4ode/")
+             (base32
+              "0ssmpvp1apxvinidq42pfpvjimpvd250har85n6rl7dj5fws9j8m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mfpic4ode")
+    (synopsis "Macros to draw direction fields and solutions of ODEs")
+    (description
+     "The package is a small set of macros for drawing direction fields, phase
+portraits and trajectories of differential equations and two dimensional
+autonomous systems.  The Euler, Runge-Kutta and fourth order Runge-Kutta
+algorithms are available to solve the ODEs.  The picture is translated into
+@code{mfpic} macros and MetaPost is used to create the final drawing.")
+    (license license:lppl)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From 2d51e19ab396eda685d09a3585d5572983538e68 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:22:08 +0200
Subject: gnu: Add texlive-minim-hatching.

* gnu/packages/tex.scm (texlive-minim-hatching): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 745c17d716..e32e26d040 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5627,6 +5627,25 @@ algorithms are available to solve the ODEs.  The picture is translated into
 @code{mfpic} macros and MetaPost is used to create the final drawing.")
     (license license:lppl)))
 
+(define-public texlive-minim-hatching
+  (package
+    (name "texlive-minim-hatching")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/minim-hatching/"
+                   "metapost/minim-hatching/")
+             (base32
+              "0qcd5zvhj9hrdhb7il1hbfdh5sgccl6mvwwmpw9fymbwdri9224f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/minim-hatching")
+    (synopsis "Create tiling patterns with @code{minim-mp} MetaPost processor")
+    (description
+     "This is a small proof-of-concept library of tiling patterns for use with
+the @code{minim-mp} MetaPost processor.")
+    (license license:eupl1.2)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From c9bbc7274f6975ba567b6ebc0c57bfadb047897d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:22:26 +0200
Subject: gnu: Add texlive-mp3d.

* gnu/packages/tex.scm (texlive-mp3d): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e32e26d040..2d9683104d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5646,6 +5646,24 @@ algorithms are available to solve the ODEs.  The picture is translated into
 the @code{minim-mp} MetaPost processor.")
     (license license:eupl1.2)))
 
+(define-public texlive-mp3d
+  (package
+    (name "texlive-mp3d")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/mp3d/" "metapost/mp3d/")
+             (base32
+              "1qfg4ifm5z72sr8vimibmpmqh0cxzipiy4jr8rbq5qsj2mfqzphd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mp3d")
+    (synopsis "3D animations")
+    (description
+     "This library creates animations of 3-dimensional objects (such as
+polyhedra) in MetaPost.")
+    (license license:lppl)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From f913f575ea186238fe72fb7bd090a309fba31fa5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:22:50 +0200
Subject: gnu: Add texlive-mparrows.

* gnu/packages/tex.scm (texlive-mparrows): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2d9683104d..7e83bb805e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5664,6 +5664,25 @@ the @code{minim-mp} MetaPost processor.")
 polyhedra) in MetaPost.")
     (license license:lppl)))
 
+(define-public texlive-mparrows
+  (package
+    (name "texlive-mparrows")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/mparrows/"
+                   "metapost/mparrows/")
+             (base32
+              "0pc9w5g6qasfpv4dxf0aahahbxk6kjwirdmx8l4i27syjb1lgzw9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mparrows")
+    (synopsis "MetaPost module with different types of arrow heads")
+    (description
+     "This package provides a package to provide different types of arrow
+heads to be used with MetaPost commands")
+    (license license:public-domain)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From febd96e7c29cdeb08a0cdf9148b1c5bae6062cdb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:23:07 +0200
Subject: gnu: Add texlive-mpattern.

* gnu/packages/tex.scm (texlive-mpattern): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7e83bb805e..707738e778 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5683,6 +5683,25 @@ polyhedra) in MetaPost.")
 heads to be used with MetaPost commands")
     (license license:public-domain)))
 
+(define-public texlive-mpattern
+  (package
+    (name "texlive-mpattern")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/mpattern/"
+                   "metapost/mpattern/")
+             (base32
+              "00g250vl6gnvwx6zgmfqcw3nwkh546i1vjz4zjp3dc5n5yj5y6ls")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mpattern")
+    (synopsis "Patterns in MetaPost")
+    (description
+     "This package provides a package for defining and using patterns in MetaPost,
+using the Pattern Color Space available in PostScript Level 2.")
+    (license license:public-domain)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From 78369eab12488cf796d71e5c3c3d1ffccbf33457 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:23:23 +0200
Subject: gnu: Add texlive-mpcolornames.

* gnu/packages/tex.scm (texlive-mpcolornames): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 707738e778..c131873c6b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5702,6 +5702,29 @@ heads to be used with MetaPost commands")
 using the Pattern Color Space available in PostScript Level 2.")
     (license license:public-domain)))
 
+(define-public texlive-mpcolornames
+  (package
+    (name "texlive-mpcolornames")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/mpcolornames/"
+                   "metapost/mpcolornames/"
+                   "source/metapost/mpcolornames/")
+             (base32
+              "1s5yb57yamg1fd7w5hmkmfyxyqj3mivhkvrkqzm31dzh4y22qg3k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mpcolornames")
+    (synopsis "Extend list of predefined colour names for MetaPost")
+    (description
+     "The MetaPost format @code{plain.mp} provides only five built-in colour names
+(variables), all of which are defined in the RGB model: red, green and blue
+for the primary colours and black and white.  The package makes more than 500
+colour names from different colour sets in different colour models available
+to MetaPost.")
+    (license license:lppl)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From df32f2e16a1318e5b87cdd21d00b9a841c795525 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:23:42 +0200
Subject: gnu: Add texlive-mpgraphics.

* gnu/packages/tex.scm (texlive-mpgraphics): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c131873c6b..d0eecae9ad 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5725,6 +5725,30 @@ colour names from different colour sets in different colour models available
 to MetaPost.")
     (license license:lppl)))
 
+(define-public texlive-mpgraphics
+  (package
+    (name "texlive-mpgraphics")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mpgraphics/"
+                   "source/latex/mpgraphics/"
+                   "tex/latex/mpgraphics/")
+             (base32
+              "0z51scc8vimwihdyxv3g1cb7bjbj8w2a2ck1ygjyf8xzz4hcic2s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mpgraphics")
+    (synopsis "Process and display MetaPost figures inline")
+    (description
+     "The package allows LaTeX users to typeset MetaPost code inline and
+display figures in their documents with only and only one run of LaTeX,
+pdfLaTeX or XeLaTeX (no separate runs of @command{mpost}).  Mpgraphics
+achieves this by using the shell escape (@samp{\\write 18}) feature of current
+TeX distributions, so that the whole process is automatic and the end user is
+saved the tiresome processing.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From ed38b52e5bff2e3da45c6ede607847fe54bdca9f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:24:35 +0200
Subject: gnu: Add texlive-mptrees.

* gnu/packages/tex.scm (texlive-mptrees): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d0eecae9ad..9c861c230b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5749,6 +5749,25 @@ TeX distributions, so that the whole process is automatic and the end user is
 saved the tiresome processing.")
     (license license:lppl1.3+)))
 
+(define-public texlive-mptrees
+  (package
+    (name "texlive-mptrees")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/mptrees/" "metapost/mptrees/")
+             (base32
+              "17jaj27pjnm3k8qcn1ijkwzgm0nacm0mb3fb7rx3a3cf1pi2qwd2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mptrees")
+    (synopsis "Probability trees with MetaPost")
+    (description
+     "This package provides MetaPost tools for drawing simple probability
+trees.  One command and several parameters to control the output are
+provided.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From 0dc1f9082134b786bdd091d4cd4e15096e332d13 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:25:06 +0200
Subject: gnu: Add texlive-piechartmp.

* gnu/packages/tex.scm (texlive-piechartmp): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9c861c230b..b268fa2ab8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5933,6 +5933,28 @@ available for LuaTeX by reimplementing them using Lua.")
 
 (define-deprecated-package texlive-latex-pdftexcmds texlive-pdftexcmds)
 
+(define-public texlive-piechartmp
+  (package
+    (name "texlive-piechartmp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/piechartmp/"
+                   "metapost/piechartmp/")
+             (base32
+              "0xf83k85bwbdy4d1m23zyk5zjg9qw960q4rkgf2i1449w30gf3hp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/piechartmp")
+    (synopsis "Draw pie-charts using MetaPost")
+    (description
+     "The @code{piechartmp} package is an easy way to draw pie-charts with
+MetaPost.  The package implements an interface that enables users with little
+MetaPost experience to draw charts.  A highlight of the package is the
+possibility of suppressing some segments of the chart, thus creating the
+possibility of several charts from the same data.")
+    (license license:lppl)))
+
 (define-public texlive-psfrag
   (package
     (name "texlive-psfrag")
-- 
cgit 1.4.1


From c38de584f12b39059a3fb515296bbd3b49ae1aaa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:25:30 +0200
Subject: gnu: Add texlive-repere.

* gnu/packages/tex.scm (texlive-repere): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b268fa2ab8..cf5f64a110 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6029,6 +6029,26 @@ corresponding thing with the page reference of the label.")
 
 (define-deprecated-package texlive-latex-refcount texlive-refcount)
 
+(define-public texlive-repere
+  (package
+    (name "texlive-repere")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/repere/" "metapost/repere/")
+             (base32
+              "06p184mgv0cac36pp1srrd80axvkxf155l3jf01dnvd2x1d7dwlk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/repere")
+    (synopsis "MetaPost macros for secondary school mathematics teachers")
+    (description
+     "This package provides MetaPost macros for drawing secondary school
+mathematics figures in a coordinate system: axis, grids points, vectors
+functions (curves, tangents, integrals, sequences) statistic diagrams plane
+geometry (polygons, circles), arrays and game boards.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-selinput
   (package
     (name "texlive-selinput")
-- 
cgit 1.4.1


From 8f29ad5791f8f388ecfec40d9fc06a20e93d8441 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:26:32 +0200
Subject: gnu: Add texlive-roex.

* gnu/packages/tex.scm (texlive-roex): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cf5f64a110..e11a0476c8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6049,6 +6049,29 @@ functions (curves, tangents, integrals, sequences) statistic diagrams plane
 geometry (polygons, circles), arrays and game boards.")
     (license license:lppl1.3c)))
 
+(define-public texlive-roex
+  (package
+    (name "texlive-roex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "metafont/roex/" "source/metafont/roex/")
+             (base32
+              "12w5wrrlk8rd4gx57646r01rb49ckmgnzhmx9385ll0sag8c9s2v")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mf-ps")
+    (synopsis "Metafont-PostScript conversions")
+    (description
+     "This package provides a Metafont support package including: @code{epstomf},
+a tiny AWK script for converting EPS files into Metafont; @code{mftoeps} for
+generating (encapsulated) PostScript files readable, e.g., by CorelDRAW, Adobe
+Illustrator and Fontographer; a collection of routines (in folder progs) for
+converting Metafont-coded graphics into encapsulated PostScript; and
+@code{roex.mf}, which provides Metafont macros for removing overlaps and
+expanding strokes.  In @code{mftoeps}, Metafont writes PostScript code to
+a log-file, from which it may be extracted by either TeX or AWK.")
+    (license license:public-domain)))
+
 (define-public texlive-selinput
   (package
     (name "texlive-selinput")
-- 
cgit 1.4.1


From 697a5db6165ee84dc552260909913e24ff1817e8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:27:13 +0200
Subject: gnu: Add texlive-roundrect.

* gnu/packages/tex.scm (texlive-roundrect): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e11a0476c8..97b16029d6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6072,6 +6072,27 @@ expanding strokes.  In @code{mftoeps}, Metafont writes PostScript code to
 a log-file, from which it may be extracted by either TeX or AWK.")
     (license license:public-domain)))
 
+(define-public texlive-roundrect
+  (package
+    (name "texlive-roundrect")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/roundrect/"
+                   "metapost/roundrect/"
+                   "source/metapost/roundrect/")
+             (base32
+              "0bx6xfr49rrcrnbyw917fab2qi0x29h66ip4nyhw6477815ic0wq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/roundrect")
+    (synopsis "MetaPost macros for configurable rounded rectangles")
+    (description
+     "The @code{roundrect} macros for MetaPost provide ways to produce rounded
+rectangles, which may or may not contain a title bar or text (the title bar
+may itself contain text).")
+    (license license:lppl1.3+)))
+
 (define-public texlive-selinput
   (package
     (name "texlive-selinput")
-- 
cgit 1.4.1


From 6702f3808176e67f43151042182556515f3f0b36 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:27:42 +0200
Subject: gnu: Add texlive-shapes.

* gnu/packages/tex.scm (texlive-shapes): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 97b16029d6..cf40cad06d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6214,6 +6214,27 @@ user may consider the @code{dnaseq} as a rather more powerful alternative.")
 
 (define-deprecated-package texlive-latex-seqsplit texlive-seqsplit)
 
+(define-public texlive-shapes
+  (package
+    (name "texlive-shapes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/shapes/" "metapost/shapes/"
+                   "source/metapost/shapes/")
+             (base32
+              "0q93ycxjzmvp73z92rc7vlzvmijbj2w1ldq709r9jflk044lsrh2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/shapes")
+    (synopsis "Draw polygons, reentrant stars, and fractions in circles")
+    (description
+     "The shapes set of macros allows drawing regular polygons; their
+corresponding reentrant stars in all their variations; and fractionally filled
+circles (useful for visually demonstrating the nature of fractions) in
+MetaPost.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-showexpl
   (package
     (name "texlive-showexpl")
-- 
cgit 1.4.1


From 5b5f5a2f977da9af91f26fa08238f91f7dd89dc9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:28:05 +0200
Subject: gnu: Add texlive-slideshow.

* gnu/packages/tex.scm (texlive-slideshow): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cf40cad06d..d6595a3ad5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6254,6 +6254,25 @@ MetaPost.")
 result in the same document.")
     (license license:lppl1.2+)))
 
+(define-public texlive-slideshow
+  (package
+    (name "texlive-slideshow")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/slideshow/"
+                   "metapost/slideshow/")
+             (base32
+              "07r58whn61nyxj0cldzf9bbwhh0kc72d6708ldf03q7sbf5zi37s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/slideshow")
+    (synopsis "Generate slideshow with MetaPost")
+    (description
+     "The package provides a means of creating presentations in MetaPost,
+without intervention from other utilities (except a distiller).")
+    (license (license:fsf-free "file://metapost/slideshow/slideshow.mp"))))
+
 (define-public texlive-stackengine
   (package
     (name "texlive-stackengine")
-- 
cgit 1.4.1


From 55019ebccc8fe51a5a2e8733642f2c0458a58fb2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:28:50 +0200
Subject: gnu: Add texlive-splines.

* gnu/packages/tex.scm (texlive-splines): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d6595a3ad5..3729e79db8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6273,6 +6273,26 @@ result in the same document.")
 without intervention from other utilities (except a distiller).")
     (license (license:fsf-free "file://metapost/slideshow/slideshow.mp"))))
 
+(define-public texlive-splines
+  (package
+    (name "texlive-splines")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/splines/" "metapost/splines/"
+                   "source/metapost/splines/")
+             (base32
+              "15pvr4vl5whcrij6gq3al5jaqrshvm2qybvxq7qx0gdxzfsli38z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/splines")
+    (synopsis "MetaPost macros for drawing cubic spline interpolants")
+    (description
+     "This is a small package of macros for creating cubic spline interpolants
+in MetaPost or Metafont.  Given a list of points the macros can produce
+a closed or a relaxed spline joining them.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-stackengine
   (package
     (name "texlive-stackengine")
-- 
cgit 1.4.1


From f534bbcb722f7bc1103ea1c2bf7b9ebc08f006c7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:29:14 +0200
Subject: gnu: Add texlive-suanpan.

* gnu/packages/tex.scm (texlive-suanpan): New variable.
---
 gnu/packages/tex.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3729e79db8..6eda17875b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6316,6 +6316,23 @@ of which make use of the @code{stackengine} core.")
 
 (define-deprecated-package texlive-latex-stackengine texlive-stackengine)
 
+(define-public texlive-suanpan
+  (package
+    (name "texlive-suanpan")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/suanpan/" "metapost/suanpan/")
+             (base32
+              "1ddhk8d98bc4l2xbx5w6kaynl4n125nnv4hadfp5s19vwcc6slqv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/suanpan")
+    (synopsis "MetaPost macros for drawing Chinese and Japanese abaci")
+    (description
+     "The package provides macros for drawing Chinese and Japanese abaci.")
+    (license license:lppl)))
+
 (define-public texlive-tocloft
   (package
     (name "texlive-tocloft")
-- 
cgit 1.4.1


From 332cf3df1a32a9df1e1101d0d8e7f7f971e14f77 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:29:58 +0200
Subject: gnu: Add texlive-textpath.

* gnu/packages/tex.scm (texlive-textpath): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6eda17875b..6833fa4ae7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6333,6 +6333,26 @@ of which make use of the @code{stackengine} core.")
      "The package provides macros for drawing Chinese and Japanese abaci.")
     (license license:lppl)))
 
+(define-public texlive-textpath
+  (package
+    (name "texlive-textpath")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/textpath/"
+                   "metapost/textpath/" "tex/latex/textpath/")
+             (base32
+              "07g7n0hjsvsk0cibprpqid43vvljjzagap07zbp2kirkiv7yq3k0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/textpath")
+    (synopsis "Setting text along a path with MetaPost")
+    (description
+     "This MetaPost package provides macros to typeset text along a free path
+with the help of LaTeX, thereby preserving kerning and allowing for 8-bit
+input (accented characters).")
+    (license license:lppl)))
+
 (define-public texlive-tocloft
   (package
     (name "texlive-tocloft")
-- 
cgit 1.4.1


From fc15796398040f8847c8869292882d171bd2fe8d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:30:41 +0200
Subject: gnu: Add texlive-threeddice.

* gnu/packages/tex.scm (texlive-threeddice): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6833fa4ae7..53cacc867e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6333,6 +6333,25 @@ of which make use of the @code{stackengine} core.")
      "The package provides macros for drawing Chinese and Japanese abaci.")
     (license license:lppl)))
 
+(define-public texlive-threeddice
+  (package
+    (name "texlive-threeddice")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/threeddice/"
+                   "metapost/threeddice/")
+             (base32
+              "1sj4f3bbxjzwbncxlvlbmsnfi7jkf5625gwhbqfh399vlh0nb56j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/threeddice")
+    (synopsis "Create images of dice with one, two, or three faces showing")
+    (description
+     "The package provides MetaPost code to create all possible symmetrical
+views (up to rotation) of a right-handed die.")
+    (license license:lppl)))
+
 (define-public texlive-textpath
   (package
     (name "texlive-textpath")
-- 
cgit 1.4.1


From 28f9cab0de5f3bfdaf3823e4fb8eef97d3711939 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:31:26 +0200
Subject: gnu: Add texlive-collection-metapost.

* gnu/packages/tex.scm (texlive-collection-metapost): New variable.
---
 gnu/packages/tex.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 53cacc867e..3e25129621 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13296,6 +13296,68 @@ used and strongly recommended in practice.")
 LaTeX which have widespread use.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-collection-metapost
+  (package
+    (name "texlive-collection-metapost")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-automata
+           texlive-bbcard
+           texlive-blockdraw-mp
+           texlive-bpolynomial
+           texlive-cmarrows
+           texlive-collection-basic
+           texlive-drv
+           texlive-dviincl
+           texlive-emp
+           texlive-epsincl
+           texlive-expressg
+           texlive-exteps
+           texlive-featpost
+           texlive-feynmf
+           texlive-feynmp-auto
+           texlive-fiziko
+           texlive-garrigues
+           texlive-gmp
+           texlive-hatching
+           texlive-hershey-mp
+           texlive-latexmp
+           texlive-mcf2graph
+           texlive-metago
+           texlive-metaobj
+           texlive-metaplot
+           texlive-metapost
+           texlive-metapost-colorbrewer
+           texlive-metauml
+           texlive-mfpic
+           texlive-mfpic4ode
+           texlive-minim-hatching
+           texlive-mp3d
+           texlive-mparrows
+           texlive-mpattern
+           texlive-mpcolornames
+           texlive-mpgraphics
+           texlive-mptrees
+           texlive-piechartmp
+           texlive-repere
+           texlive-roex
+           texlive-roundrect
+           texlive-shapes
+           texlive-slideshow
+           texlive-splines
+           texlive-suanpan
+           texlive-textpath
+           texlive-threeddice))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "MetaPost and Metafont packages")
+    (description
+     "This collection includes all MetaPost and Metafont packages, along
+with packages in @code{collection-basic}.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-grfext
   (package
     (name "texlive-grfext")
-- 
cgit 1.4.1


From b72c282d535ff8aa40eb75bf5285b14304586411 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:36:09 +0200
Subject: guix: Make "gfsl" an alias for gfl1.0 license in texlive importer.

* guix/import/texlive.scm (string->license): Make "gfsl" and alias for GFL1.0.
---
 guix/import/texlive.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index d4fa8bb674..f3d941155d 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -98,7 +98,11 @@
     ("cc-by-sa-4" 'cc-by-sa4.0)
     ("mit" 'expat)
     ("fdl" 'fdl1.3+)
-    ("gfl" 'gfl1.0)
+    ;; The GUST Font Nosource License, which is legally equivalent to
+    ;; lppl1.3c+, is no longer in use (per
+    ;; <https://www.gust.org.pl/projects/e-foundry/licenses>).  It has de
+    ;; facto become GUST Font License 1.0.
+    ((or "gfl" "gfsl") 'gfl1.0)
 
     ;; These are known non-free licenses
     ("noinfo" 'unknown)
-- 
cgit 1.4.1


From f87e81793a6caa70abb9a0d1b7d428f2654f1a2b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:38:43 +0200
Subject: gnu: Add texlive-antt.

* gnu/packages/tex.scm (texlive-antt): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3e25129621..7c26968f03 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -869,6 +869,33 @@ uppercase letters respectively (1 to a, 26 to z, 27 to aa, 52 to zz, 53 to ba,
 a replacement for LaTeX's @code{\\@@alph} and @code{\\@@Alph} macros.")
     (license license:lppl1.3c+)))
 
+(define-public texlive-antt
+  (package
+    (name "texlive-antt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/antt/"
+                   "doc/latex/antt/"
+                   "fonts/afm/public/antt/"
+                   "fonts/enc/dvips/antt/"
+                   "fonts/map/dvips/antt/"
+                   "fonts/opentype/public/antt/"
+                   "fonts/tfm/public/antt/"
+                   "fonts/type1/public/antt/"
+                   "tex/latex/antt/"
+                   "tex/plain/antt/")
+             (base32
+              "1fvmgb581ixc4fvw5l0g11hlvdpf0cld6db0cg3vysw5yabas3vm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/antt")
+    (synopsis "Type 1 family of a Polish traditional type")
+    (description
+     "Antykwa Torunska is a serif font designed by the late Polish typographer
+Zygfryd Gardzielewski, reconstructed and digitized as Type 1.")
+    (license license:gfl1.0)))
+
 (define-public texlive-avantgar
   (package
     (name "texlive-avantgar")
-- 
cgit 1.4.1


From a2436a424c862781d4df27689e6fe5d17b53dcf0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:39:06 +0200
Subject: gnu: Add texlive-asana-math.

* gnu/packages/tex.scm (texlive-asana-math): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7c26968f03..88d06ef10a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -896,6 +896,27 @@ a replacement for LaTeX's @code{\\@@alph} and @code{\\@@Alph} macros.")
 Zygfryd Gardzielewski, reconstructed and digitized as Type 1.")
     (license license:gfl1.0)))
 
+(define-public texlive-asana-math
+  (package
+    (name "texlive-asana-math")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/asana-math/"
+                   "fonts/opentype/public/asana-math/"
+                   "fonts/truetype/public/asana-math/")
+             (base32
+              "1q934gackj9j7b7bvlq7yv1pr9rxrhhip1as7ywgx8d45ddig2rq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/asana-math")
+    (synopsis "Font to typeset maths in Xe(La)TeX and Lua(La)TeX")
+    (description
+     "The Asana-Math font is an OpenType font that includes almost all
+mathematical Unicode symbols and it can be used to typeset mathematical text
+with any software that can understand the MATH OpenType table.")
+    (license license:silofl1.1)))
+
 (define-public texlive-avantgar
   (package
     (name "texlive-avantgar")
-- 
cgit 1.4.1


From ce3c235109027fad72d9a1090dd197034602fdc6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 11:41:46 +0200
Subject: gnu: Add texlive-ccicons.

* gnu/packages/tex.scm (texlive-ccicons): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 88d06ef10a..713a410e98 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1505,6 +1505,34 @@ a LaTeX user is requesting.
 Tip: installing @code{texlive-cbfonts} will automatically propagate this one.")
     (license license:lppl1.3c+)))
 
+(define-public texlive-ccicons
+  (package
+    (name "texlive-ccicons")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ccicons/"
+                   "doc/latex/ccicons/"
+                   "fonts/enc/dvips/ccicons/"
+                   "fonts/map/dvips/ccicons/"
+                   "fonts/opentype/public/ccicons/"
+                   "fonts/tfm/public/ccicons/"
+                   "fonts/type1/public/ccicons/"
+                   "source/fonts/ccicons/"
+                   "source/latex/ccicons/"
+                   "tex/latex/ccicons/")
+             (base32
+              "0lyxbjpkxny6hl7pmnpka0gmgx7qv66pibvwcfs9dvwhdcvwjr4x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ccicons")
+    (synopsis "LaTeX support for Creative Commons icons")
+    (description
+     "The package provides the means to typeset Creative Commons icons, in
+documents licensed under CC licences.  A font (in Adobe Type 1 format) and
+LaTeX support macros are provided.")
+    (license (list license:lppl1.3c license:silofl1.1))))
+
 (define-public texlive-cite
   (package
     (name "texlive-cite")
-- 
cgit 1.4.1


From 7e580414d5e8ee5e574bf5ab8a426117047c9ad5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 12:34:07 +0200
Subject: gnu: Add texlive-eulervm.

* gnu/packages/tex.scm (texlive-eulervm): New variable.
---
 gnu/packages/tex.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 713a410e98..6ed0901a95 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2213,6 +2213,36 @@ allocation macros to make use of the extended register range.  The
 e-TeX's facilities.")
     (license license:lppl1.3+)))
 
+(define-public texlive-eulervm
+  (package
+    (name "texlive-eulervm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/eulervm/"
+                   "fonts/tfm/public/eulervm/"
+                   "fonts/vf/public/eulervm/"
+                   "source/latex/eulervm/" "tex/latex/eulervm/")
+             (base32
+              "118yidwnqw4acap2wdykcdx2cxp8q2ganz67ls6rkg6fid325mkq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/eulervm")
+    (synopsis "Euler virtual math fonts")
+    (description
+     "The Euler fonts are suitable for typsetting mathematics in conjunction
+with a variety of text fonts that do not provide mathematical character sets
+of their own.  Euler-VM is a set of virtual mathematics fonts based on Euler
+and CM. This approach has several advantages over immediately using the real
+Euler fonts. Most noticeably, less TeX resources are consumed, the quality of
+various math symbols is improved and a usable @code{\\hslash} symbol can be
+provided.  The virtual fonts are accompanied by a LaTeX package which makes
+them easy to use, particularly in conjunction with Type1 PostScript text
+fonts.  They are compatible with @code{amsmath}.  A package option allows the
+fonts to be loaded at 95% of their nominal size, thus blending better with
+certain text fonts, e.g., Minion.")
+    (license license:lppl)))
+
 (define-public texlive-plain
   (package
     (name "texlive-plain")
-- 
cgit 1.4.1


From c0f7625221218cd01b3637af45eb457cec958aef Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 12:34:35 +0200
Subject: gnu: Add texlive-gentium-tug.

* gnu/packages/tex.scm (texlive-gentium-tug): New variable.
---
 gnu/packages/tex.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6ed0901a95..e9cc4174a8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2922,6 +2922,36 @@ verbatim source).")
 
 (define-deprecated-package texlive-latex-fancyvrb texlive-fancyvrb)
 
+(define-public texlive-gentium-tug
+  (package
+    (name "texlive-gentium-tug")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gentium-tug/GentiumPlus-6.101/"
+                   "doc/fonts/gentium-tug/gentium-tug/"
+                   "fonts/afm/public/gentium-tug/"
+                   "fonts/enc/dvips/gentium-tug/"
+                   "fonts/map/dvips/gentium-tug/"
+                   "fonts/map/pdftex/gentium-tug/"
+                   "fonts/tfm/public/gentium-tug/"
+                   "fonts/truetype/public/gentium-tug/"
+                   "fonts/type1/public/gentium-tug/"
+                   "source/fonts/gentium-tug/"
+                   "tex/latex/gentium-tug/")
+             (base32
+              "1ns62cn7cqq3hzmljd6yvs2mip2l30pa3js6c1dm90fj01gsjq86")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gentium-tug")
+    (synopsis "Gentium fonts (in two formats) and support files")
+    (description
+     "Gentium is a typeface family designed to enable the diverse ethnic
+groups around the world who use the Latin, Cyrillic and Greek scripts to
+produce readable, high-quality publications.  It supports a wide range of
+Latin- and Cyrillic-based alphabets.")
+    (license (list license:expat license:silofl1.1))))
+
 (define-public texlive-gincltex
   (package
     (name "texlive-gincltex")
-- 
cgit 1.4.1


From 440f34ea7fb75881a3fb5d688e73c7e6bdbf11ac Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 12:35:37 +0200
Subject: gnu: Add texlive-kurier.

* gnu/packages/tex.scm (texlive-kurier): New variable.
---
 gnu/packages/tex.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e9cc4174a8..27a5e46b19 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7677,6 +7677,40 @@ into Python''.  The package is modelled on @code{lipsum}, and may be used for
 similar purposes.")
     (license license:lppl1.3c)))
 
+(define-public texlive-kurier
+  (package
+    (name "texlive-kurier")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/kurier/"
+                   "fonts/afm/nowacki/kurier/"
+                   "fonts/enc/dvips/kurier/"
+                   "fonts/map/dvips/kurier/"
+                   "fonts/opentype/nowacki/kurier/"
+                   "fonts/tfm/nowacki/kurier/"
+                   "fonts/type1/nowacki/kurier/"
+                   "tex/latex/kurier/"
+                   "tex/plain/kurier/")
+             (base32
+              "0j89iv0yyy33dyyka0w0v5jykl41sdn7plxrrxa91qmxzqvi2y67")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/kurier")
+    (synopsis "Two-element sans-serif typeface")
+    (description
+     "Kurier is a two-element sans-serif typeface.  It was designed for
+a diploma in typeface design at the Warsaw Academy of Fine Arts under the
+supervision of Roman Tomaszewski.  This distribution contains a significantly
+extended set of characters covering the following modern alphabets:
+latin (including Vietnamese), Cyrillic and Greek as well as a number of
+additional symbols (including mathematical symbols).  The fonts are prepared
+in Type 1 and OpenType formats.  For use with TeX the following encoding files
+have been prepared: T1 (ec), T2 (abc), and OT2--Cyrillic, T5 (Vietnamese),
+OT4, QX, texansi and--nonstandard (IL2 for the Czech fonts), as well as
+supporting macros and files defining fonts for LaTeX.")
+    (license license:gfl1.0)))
+
 (define-public texlive-lipsum
   (package
     (name "texlive-lipsum")
-- 
cgit 1.4.1


From b2835670086ba3398e9bb0d14b240aa5287a9ab2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 12:36:36 +0200
Subject: gnu: Add texlive-poltawski.

* gnu/packages/tex.scm (texlive-poltawski): New variable.
---
 gnu/packages/tex.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 27a5e46b19..a191def3a1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8034,6 +8034,41 @@ Adobe's basic set.")
 
 (define-deprecated-package texlive-fonts-adobe-palatino texlive-palatino)
 
+(define-public texlive-poltawski
+  (package
+    (name "texlive-poltawski")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/poltawski/"
+                   "fonts/afm/gust/poltawski/"
+                   "fonts/enc/dvips/poltawski/"
+                   "fonts/map/dvips/poltawski/"
+                   "fonts/opentype/gust/poltawski/"
+                   "fonts/tfm/gust/poltawski/"
+                   "fonts/type1/gust/poltawski/"
+                   "tex/latex/poltawski/")
+             (base32
+              "1cf8vxah8j6nnaq2lhmiy1q3dnq6swprfmizzxd6y67sc60rznzm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/poltawski")
+    (synopsis "Antykwa Poltawskiego Family of Fonts")
+    (description
+     "The package contains the Antykwa Poltawskiego family of fonts in the
+PostScript Type 1 and OpenType formats Following the route set out by the
+Latin Modern and TeX Gyre projects, the Antykwa Poltawskiego digitisation
+project aims at providing a rich collection of diacritical characters in the
+attempt to cover as many Latin-based scripts as possible.  To our knowledge,
+the repertoire of characters covers all European languages as well as some
+other Latin-based alphabets such as Vietnamese and Navajo; at the request of
+users, recent extensions (following the enhancement of the Latin Modern
+collection) provide glyphs sufficient for typesetting of romanized
+transliterations of Arabic and Sanskrit scripts.  The Antykwa Poltawskiego
+family consists of 4 weights (light, normal, medium, bold), each having
+upright and italic forms and one of 5 design sizes: 6, 8, 10, 12 and 17pt.")
+    (license license:gfl1.0)))
+
 (define-public texlive-zapfchan
   (package
     (name "texlive-zapfchan")
-- 
cgit 1.4.1


From 9e981db3085ba09b45a1a715f0bc554ac9847d80 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 12:37:15 +0200
Subject: gnu: Add texlive-xits.

* gnu/packages/tex.scm (texlive-xits): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a191def3a1..20dd7e7bec 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13997,6 +13997,27 @@ 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-xits
+  (package
+    (name "texlive-xits")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/xits/"
+                   "fonts/opentype/public/xits/")
+             (base32
+              "1359zgi8r4mwjv273zmc5jghyy4i54amkrmkq80z67x4kx092724")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xits")
+    (synopsis "Scientific Times-like font")
+    (description
+     "XITS is a Times-like font for scientific typesetting with proper
+mathematical support for modern, Unicode and OpenType capable TeX engines,
+namely LuaTeX and XeTeX. For use with LuaLaTeX or XeLaTeX, support is
+available from the @code{fontspec} and @code{unicode-math} packages.")
+    (license license:silofl1.1)))
+
 (define-public texlive-ntgclass
   (package
     (name "texlive-ntgclass")
-- 
cgit 1.4.1


From 3121f754c415491dbae129b986a94b2c181a7cfd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 12:38:01 +0200
Subject: gnu: Add texlive-scheme-context.

* gnu/packages/tex.scm (texlive-scheme-context): New variable.
---
 gnu/packages/tex.scm | 68 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 51 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 20dd7e7bec..30ce70619b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -15458,23 +15458,6 @@ break statement, except that the loop does not terminate until the end of the
 current iteration.")
     (license license:lppl)))
 
-(define-public texlive-scheme-minimal
-  (package
-    (name "texlive-scheme-minimal")
-    (version (number->string %texlive-revision))
-    (source #f)
-    (build-system trivial-build-system)
-    (arguments (list #:builder #~(mkdir #$output)))
-    (propagated-inputs (list texlive-collection-basic))
-    (home-page "https://www.tug.org/texlive/")
-    (synopsis "Minimal scheme (plain only)")
-    (description
-     "This is the minimal TeX Live scheme, with support for only plain
-TeX. (No LaTeX macros.) LuaTeX is included because Lua scripts are used in TeX
-Live infrastructure.  This scheme corresponds exactly to
-@code{collection-basic}.")
-    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
-
 (define-public texlive-scheme-basic
   (package
     (name "texlive-scheme-basic")
@@ -15494,6 +15477,57 @@ Computer Modern fonts.  This scheme corresponds to @code{collection-basic} and
 
 (define-deprecated-package texlive-base texlive-scheme-basic)
 
+(define-public texlive-scheme-context
+  (package
+    (name "texlive-scheme-context")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-antt
+           texlive-asana-math
+           texlive-ccicons
+           texlive-collection-context
+           texlive-collection-metapost
+           texlive-dejavu
+           texlive-eulervm
+           texlive-gentium-tug
+           texlive-iwona
+           texlive-kurier
+           texlive-ly1
+           texlive-manfnt-font
+           texlive-marvosym
+           texlive-mflogo-font
+           texlive-poltawski
+           texlive-pxfonts
+           texlive-tex-gyre
+           texlive-tex-gyre-math
+           texlive-txfonts
+           texlive-wasy
+           texlive-xits))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "ConTeXt scheme")
+    (description "This is the TeX Live scheme for installing ConTeXt.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
+(define-public texlive-scheme-minimal
+  (package
+    (name "texlive-scheme-minimal")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs (list texlive-collection-basic))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Minimal scheme (plain only)")
+    (description
+     "This is the minimal TeX Live scheme, with support for only plain
+TeX. (No LaTeX macros.) LuaTeX is included because Lua scripts are used in TeX
+Live infrastructure.  This scheme corresponds exactly to
+@code{collection-basic}.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 ;;;
 ;;; 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
-- 
cgit 1.4.1


From aea0d94bc1f2c424d66f1a0f89f8d91642192c7d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 13:09:55 +0200
Subject: guix: Handle asl2.0 license in texlive importer.

* guix/import/texlive.scm (string->license): Convert "apache2" to ASL2.0.
---
 guix/import/texlive.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index f3d941155d..da25df0487 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -65,6 +65,7 @@
 (define string->license
   (match-lambda
     ("artistic2" 'gpl3+)
+    ("apache2" 'asl2.0)
     ("gpl" 'gpl3+)
     ("gpl1" 'gpl1)
     ("gpl1+" 'gpl1+)
-- 
cgit 1.4.1


From 3aeca58073eff8b7a835f6492e735dd152d9dc99 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 14:43:56 +0200
Subject: gnu: biber -> texlive-biber.

Build from sources provided by TeX Live distribution, so they always match
BibLaTeX version.

* gnu/packages/patches/biber-adapt-perl-5.36.patch: Delete file.
* gnu/local.mk: Apply removal.
* gnu/packages/tex.scm (texlive-biber): New variable.
(biber): Deprecate variable.
(perl-text-bibtex): Move from here...
* gnu/packages/perl.scm (perl-text-bibtex): ... to here.
---
 gnu/local.mk                                     |   1 -
 gnu/packages/patches/biber-adapt-perl-5.36.patch |  40 -------
 gnu/packages/perl.scm                            |  40 +++++++
 gnu/packages/tex.scm                             | 136 +++++++++--------------
 4 files changed, 95 insertions(+), 122 deletions(-)
 delete mode 100644 gnu/packages/patches/biber-adapt-perl-5.36.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index a56864be86..f2ef72c10a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -957,7 +957,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/bsd-games-stdio.h.patch			\
   %D%/packages/patches/beancount-disable-googleapis-fonts.patch	\
   %D%/packages/patches/beignet-correct-file-names.patch		\
-  %D%/packages/patches/biber-adapt-perl-5.36.patch		\
   %D%/packages/patches/bidiv-update-fribidi.patch		\
   %D%/packages/patches/binutils-boot-2.20.1a.patch		\
   %D%/packages/patches/binutils-loongson-workaround.patch	\
diff --git a/gnu/packages/patches/biber-adapt-perl-5.36.patch b/gnu/packages/patches/biber-adapt-perl-5.36.patch
deleted file mode 100644
index 895813c1f2..0000000000
--- a/gnu/packages/patches/biber-adapt-perl-5.36.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d9e961710074d266ad6bdf395c98868d91952088 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Wed, 25 May 2022 12:41:59 +0200
-Subject: [PATCH] Adapt to Perl 5.36
-
-A developmental release of Perl 5.36.0 fails to run tests with:
-
-    $ perl -Ilib t/basic-misc.t
-    1..72
-    Can't modify undef operator in scalar assignment at lib/Biber/Section.pm line 433, near "undef;"
-    Compilation failed in require at lib/Biber.pm line 24.
-    BEGIN failed--compilation aborted at lib/Biber.pm line 24.
-    Compilation failed in require at t/basic-misc.t line 11.
-    BEGIN failed--compilation aborted at t/basic-misc.t line 11.
-    # Looks like your test exited with 255 before it could output anything.
-
-This is because of a missing semicolon between commands in
-del_everykeys(). The new perl is more strict and raises a compile-time
-error:
-
-    $ perl -e '$a = undef $b = undef;'
-    Can't modify undef operator in scalar assignment at -e line 1, near "undef;"
-    Execution of -e aborted due to compilation errors.
----
- lib/Biber/Section.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Biber/Section.pm b/lib/Biber/Section.pm
-index 03ed69a51..a78942f57 100644
---- a/lib/Biber/Section.pm
-+++ b/lib/Biber/Section.pm
-@@ -429,7 +429,7 @@ sub add_everykey {
- 
- sub del_everykeys {
-   my $self = shift;
--  $self->{everykey} = undef
-+  $self->{everykey} = undef;
-   $self->{everykey_lc} = undef;
-   return;
- }
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 13bf3fa84c..57852a3cee 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -10631,6 +10631,46 @@ used to justify strings to various alignment styles.")
 text sequences from strings.")
     (license (package-license perl))))
 
+(define-public perl-text-bibtex
+  (package
+    (name "perl-text-bibtex")
+    (version "0.88")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "0b7lmjvfmypps1nw6nsdikgaakm0n0g4186glaqazg5xd1p5h55h"))))
+    (build-system perl-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'add-output-directory-to-rpath
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "inc/MyBuilder.pm"
+               (("-Lbtparse" line)
+                (string-append "-Wl,-rpath="
+                               (assoc-ref outputs "out") "/lib " line)))
+             #t))
+         (add-after 'unpack 'install-libraries-to-/lib
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "Build.PL"
+               (("lib64") "lib"))
+             #t)))))
+    (native-inputs
+     (list perl-capture-tiny perl-config-autoconf perl-extutils-libbuilder
+           perl-module-build))
+    (home-page "https://metacpan.org/release/Text-BibTeX")
+    (synopsis "Interface to read and parse BibTeX files")
+    (description "@code{Text::BibTeX} is a Perl library for reading, parsing,
+and processing BibTeX files.  @code{Text::BibTeX} gives you access to the data
+at many different levels: you may work with BibTeX entries as simple field to
+string mappings, or get at the original form of the data as a list of simple
+values (strings, macros, or numbers) pasted together.")
+    (license license:perl-license)))
+
 (define-public perl-text-charwidth
   (package
     (name "perl-text-charwidth")
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 30ce70619b..bd81c33bee 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9515,78 +9515,56 @@ 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 perl-text-bibtex
+(define-public texlive-biber
   (package
-    (name "perl-text-bibtex")
-    (version "0.88")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-"
-                           version ".tar.gz"))
-       (sha256
-        (base32
-         "0b7lmjvfmypps1nw6nsdikgaakm0n0g4186glaqazg5xd1p5h55h"))))
-    (build-system perl-build-system)
+    (name "texlive-biber")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/bibtex/biber/" "source/bibtex/biber/")
+             (base32
+              "0i1hqr9zb7b9d1zjlyg4awa6mkyq6wnrb6z4689j1rg07vnbd7mw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'add-output-directory-to-rpath
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "inc/MyBuilder.pm"
-               (("-Lbtparse" line)
-                (string-append "-Wl,-rpath="
-                               (assoc-ref outputs "out") "/lib " line)))
-             #t))
-         (add-after 'unpack 'install-libraries-to-/lib
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "Build.PL"
-               (("lib64") "lib"))
-             #t)))))
+     (list
+      #:tests? #true
+      #:imported-modules `(,@%texlive-build-system-modules
+                           (guix build perl-build-system))
+      #:modules '((guix build texlive-build-system)
+                  ((guix build perl-build-system) #:prefix perl:)
+                  (guix build utils))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'unpack-biber-source
+            (lambda _
+              (mkdir-p "build")
+              (with-directory-excursion "build"
+                (invoke "tar" "xvf"
+                        "../source/bibtex/biber/biblatex-biber.tar.gz"
+                        "--strip-components=1"))))
+          (add-after 'unpack-biber-source 'build-biber
+            (lambda args
+              (with-directory-excursion "build"
+                (for-each (lambda (phase)
+                            (apply (assoc-ref perl:%standard-phases phase) args))
+                          '(configure build check install)))))
+          (add-after 'install 'wrap-programs
+            (lambda _
+              (let ((perl5lib (getenv "PERL5LIB")))
+                (wrap-program (string-append #$output "/bin/biber")
+                  `("PERL5LIB" ":" prefix
+                    (,(string-append perl5lib ":"
+                                     #$output "/lib/perl5/site_perl"))))))))))
     (native-inputs
-     (list perl-capture-tiny perl-config-autoconf perl-extutils-libbuilder
-           perl-module-build))
-    (home-page "https://metacpan.org/release/Text-BibTeX")
-    (synopsis "Interface to read and parse BibTeX files")
-    (description "@code{Text::BibTeX} is a Perl library for reading, parsing,
-and processing BibTeX files.  @code{Text::BibTeX} gives you access to the data
-at many different levels: you may work with BibTeX entries as simple field to
-string mappings, or get at the original form of the data as a list of simple
-values (strings, macros, or numbers) pasted together.")
-    (license license:perl-license)))
-
-(define-public biber
-  (package
-    ;; Note: When updating Biber, make sure it matches our BibLaTeX version by
-    ;; checking the Biber/BibLaTeX compatibility matrix in the BibLaTeX manual
-    ;; at <https://ctan.org/pkg/biblatex>.
-    (name "biber")
-    (version "2.16")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/plk/biber/")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0586q8y1f2k23mvb02ccm3qsb35cwskafksixsjaih7a7xcf5gxx"))
-              (patches (search-patches "biber-adapt-perl-5.36.patch"))))
-    (build-system perl-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'wrap-programs
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (perl5lib (getenv "PERL5LIB")))
-               (wrap-program (string-append out "/bin/biber")
-                 `("PERL5LIB" ":" prefix
-                   (,(string-append perl5lib ":" out
-                                    "/lib/perl5/site_perl")))))
-             #t)))))
+     (list perl-config-autoconf
+           perl-extutils-libbuilder
+           perl-file-which
+           perl-module-build
+           perl-test-differences))
     (inputs
-     (list perl-autovivification
+     (list perl
+           perl-autovivification
            perl-class-accessor
            perl-data-dump
            perl-data-compare
@@ -9625,19 +9603,15 @@ values (strings, macros, or numbers) pasted together.")
            perl-business-issn
            perl-business-ismn
            perl-lingua-translit))
-    (native-inputs
-     `(("perl-config-autoconf" ,perl-config-autoconf)
-       ("perl-extutils-libbuilder" ,perl-extutils-libbuilder)
-       ("perl-module-build" ,perl-module-build)
-       ;; for tests
-       ("perl-file-which" ,perl-file-which)
-       ("perl-test-more" ,perl-test-most) ; FIXME: "more" would be sufficient
-       ("perl-test-differences" ,perl-test-differences)))
-    (home-page "https://biblatex-biber.sourceforge.net/")
-    (synopsis "Backend for the BibLaTeX citation management tool")
-    (description "Biber is a BibTeX replacement for users of biblatex.  Among
-other things it comes with full Unicode support.")
-    (license license:artistic2.0)))
+    (home-page "https://ctan.org/pkg/biber")
+    (synopsis "BibTeX replacement for users of BibLaTeX")
+    (description
+     "Biber is a BibTeX replacement for users of BibLaTeX.  It supports full
+UTF-8, can (re)-encode input and output, supports highly configurable sorting,
+dynamic bibliography sets and many other features.")
+    (license license:gpl3+)))
+
+(define-deprecated-package biber texlive-biber)
 
 (define-public rubber
   (package
-- 
cgit 1.4.1


From 425e7dba4daffa0893496606d3c4c89980cee47b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 14:48:56 +0200
Subject: gnu: Add texlive-barcodes.

* gnu/packages/tex.scm (texlive-barcodes): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bd81c33bee..6b4b02fce3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4314,6 +4314,30 @@ a language chosen by the user.  In addition, the package supports commands to
 change the typography of the bibliographies.")
     (license license:lppl1.0+)))
 
+(define-public texlive-barcodes
+  (package
+    (name "texlive-barcodes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/barcodes/"
+                   "fonts/source/public/barcodes/"
+                   "fonts/tfm/public/barcodes/"
+                   "source/latex/barcodes/"
+                   "tex/latex/barcodes/")
+             (base32
+              "1bxvmmmb4x0zpdkqa399rwdhz6yamfzx2kn2i7a8vz172q0b2msc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/barcodes")
+    (synopsis "Fonts for making barcodes")
+    (description
+     "The package deals with EAN barcodes; Metafont sources for fonts are
+provided, and a set of examples; for some codes, a small Perl script is
+needed.")
+    (license license:lppl)))
+
 (define-public texlive-bbcard
   (package
     (name "texlive-bbcard")
-- 
cgit 1.4.1


From b427ca3c0768d436f3016b44cef209ac8e1a6886 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 14:49:20 +0200
Subject: gnu: Add texlive-bookcover.

* gnu/packages/tex.scm (texlive-bookcover): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6b4b02fce3..2ef6cb4e08 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4376,6 +4376,24 @@ diagrams and bond graphs. While the task is not itself difficult to program,
 it is felt that many users will be happy to have a library for the job.")
     (license license:lppl)))
 
+(define-public texlive-bookcover
+  (package
+    (name "texlive-bookcover")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bookcover/"
+                   "source/latex/bookcover/"
+                   "tex/latex/bookcover/")
+             (base32
+              "0m5km26diwv7xij4r64c3gk2hl8xc22lrbcccqlrk1fhdlz3i8zb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bookcover")
+    (synopsis "Class for book covers and dust jackets")
+    (description "This class helps typesetting book covers and dust jackets.")
+    (license license:lppl1.2+)))
+
 (define-public texlive-bpolynomial
   (package
     (name "texlive-bpolynomial")
-- 
cgit 1.4.1


From 675192ed0d8646fd6576984aac6e33575bccf589 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 14:49:53 +0200
Subject: gnu: Add texlive-latexmk.

* gnu/packages/tex.scm (texlive-latexmk): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2ef6cb4e08..bc3f909ad2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5611,6 +5611,33 @@ between various classes of Unix systems.")
 
 (define-deprecated-package texlive-latex-ifplatform texlive-ifplatform)
 
+(define-public texlive-latexmk
+  (package
+    (name "texlive-latexmk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/latexmk.1"
+                   "doc/man/man1/latexmk.man1.pdf"
+                   "doc/support/latexmk/" "scripts/latexmk/")
+             (base32
+              "1hgzx4xcny2ffm63afhfh3msy1i9llmcdqq2xf3fqlc95rkzn59z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "latexmk.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/latexmk")
+    (synopsis "Fully automated LaTeX document generation")
+    (description
+     "Latexmk completely automates the process of generating a LaTeX document.
+Given the source files for a document, @command{latexmk} issues the
+appropriate sequence of commands to generate a @file{.dvi}, @file{.ps},
+@file{.pdf} or hardcopy version of the document.  An important feature is the
+preview continuous mode, where the script watches all of the source files and
+reruns LaTeX, etc., whenever a source file has changed.  Thus a previewer can
+offer a display of the document's latest state.")
+    (license license:gpl2)))
+
 (define-public texlive-latexmp
   (package
     (name "texlive-latexmp")
-- 
cgit 1.4.1


From 76b2288826ebde2aa6fc87975f16a32e6b3e026d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 14:50:21 +0200
Subject: gnu: Add texlive-markdown.

* gnu/packages/tex.scm (texlive-markdown): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bc3f909ad2..c312f0eb35 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5661,6 +5661,34 @@ 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-markdown
+  (package
+    (name "texlive-markdown")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/markdown/examples/"
+                   "doc/generic/markdown/"
+                   "doc/latex/markdown/examples/"
+                   "scripts/markdown/"
+                   "source/generic/markdown/"
+                   "tex/context/third/markdown/"
+                   "tex/generic/markdown/"
+                   "tex/latex/markdown/"
+                   "tex/luatex/markdown/")
+             (base32
+              "0nmw1c4ynn0vzdkgpz2dnqimbxbyl6pc0khl2gbi8bd4g9dkai55")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/markdown")
+    (synopsis "Converting and rendering Markdown documents inside TeX")
+    (description
+     "The package provides facilities for the conversion of Markdown markup to
+plain TeX.  These are provided both in form of a Lua module and in form of
+plain TeX, LaTeX, and ConTeXt macro packages that enable the direct inclusion
+of Markdown documents inside TeX documents.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-mcf2graph
   (package
     (name "texlive-mcf2graph")
-- 
cgit 1.4.1


From 985069096c6e33bdf5a21622bb3ab94db57654e1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 14:50:50 +0200
Subject: gnu: Add texlive-novel.

* gnu/packages/tex.scm (texlive-novel): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c312f0eb35..ef8054ba29 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6144,6 +6144,29 @@ the NotoSerif, NotoSans and NotoSansMono families of fonts, designed by Steve
 Matteson for Google.")
     (license (list license:lppl license:silofl1.1))))
 
+(define-public texlive-novel
+  (package
+    (name "texlive-novel")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/novel/"
+                   "fonts/opentype/novel/"
+                   "tex/lualatex/novel/")
+             (base32
+              "0qg6rs54w1n1vr5dmi6vjks8xn8x04zngk8zz4cv0035jxn4irpc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/novel")
+    (synopsis "Class for printing fiction, such as novels")
+    (description
+     "This LuaLaTeX document class is specifically written to meet the needs
+of original fiction writers, who are typesetting their own novels for
+non-color print-on-demand technology.  The package is well suited for
+detective novels, science fiction, and short stories.  It is however not
+recommended for creating color picture books or dissertations.")
+    (license (list license:lppl1.3c license:silofl1.1))))
+
 (define-public texlive-pdftexcmds
   (package
     (name "texlive-pdftexcmds")
-- 
cgit 1.4.1


From 179fc598ec8ef28db3949c7393e32b9afb222819 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 14:51:13 +0200
Subject: gnu: Add texlive-octavo.

* gnu/packages/tex.scm (texlive-octavo): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ef8054ba29..cc9eae3584 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6167,6 +6167,32 @@ detective novels, science fiction, and short stories.  It is however not
 recommended for creating color picture books or dissertations.")
     (license (list license:lppl1.3c license:silofl1.1))))
 
+(define-public texlive-octavo
+  (package
+    (name "texlive-octavo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/octavo/" "source/latex/octavo/"
+                   "tex/latex/octavo/")
+             (base32
+              "10ycj2xg2v7cq4my51dcc749hrrkg2gd41xyrwv1dg1lp9vh7j4z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/octavo")
+    (synopsis "Typeset books following classical design and layout")
+    (description
+     "The @code{octavo} class is a modification of the standard LaTeX
+@code{book} class.  Its purpose is to typeset books following classical design
+and layout principles, with the express intention of encouraging the making of
+beautiful books by anyone with access to a good printer and with an
+inclination towards venerable crafts, e.g., bookbinding.  The @code{octavo}
+class differs from the book class by implementing many of the proposals and
+insights of respected experts, especially Jan Tschichold and Hugh Williamson.
+The documentation discusses methods to organise and print out any text into
+signatures, which can then be gathered, folded and sewn into a book.")
+    (license license:lppl)))
+
 (define-public texlive-pdftexcmds
   (package
     (name "texlive-pdftexcmds")
-- 
cgit 1.4.1


From 69b3c53e29508cf49477eb04152d0794bbb3bdb7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 14:51:30 +0200
Subject: gnu: Add texlive-placeins.

* gnu/packages/tex.scm (texlive-placeins): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cc9eae3584..ac2212bb6b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6237,6 +6237,25 @@ possibility of suppressing some segments of the chart, thus creating the
 possibility of several charts from the same data.")
     (license license:lppl)))
 
+(define-public texlive-placeins
+  (package
+    (name "texlive-placeins")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/placeins/" "tex/latex/placeins/")
+             (base32
+              "0785ppjhf4x3by61mskwz289nzvbbw6iw7n0fq2dckgywjw3p2mz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/placeins")
+    (synopsis "Control float placement")
+    (description
+     "This package defines a @code{\\FloatBarrier} command, beyond which
+floats may not pass; useful, for example, to ensure all floats for a section
+appear before the next @code{\\section} command.")
+    (license license:public-domain)))
+
 (define-public texlive-psfrag
   (package
     (name "texlive-psfrag")
-- 
cgit 1.4.1


From 43aec15ba22b8707b78546d8487a16ee2c58525c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 14:52:00 +0200
Subject: gnu: Add texlive-sauerj.

* gnu/packages/tex.scm (texlive-sauerj): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ac2212bb6b..2d5fb4987a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6394,6 +6394,32 @@ rectangles, which may or may not contain a title bar or text (the title bar
 may itself contain text).")
     (license license:lppl1.3+)))
 
+(define-public texlive-sauerj
+  (package
+    (name "texlive-sauerj")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sauerj/" "source/latex/sauerj/"
+                   "tex/latex/sauerj/")
+             (base32
+              "03dmw150qcravzndikijhq2a89sjdplxgi93fx0zxln2l4flvz5k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sauerj")
+    (synopsis "Bundle of utilities by Jonathan Sauer")
+    (description
+     "The bundle consists of:
+@itemize
+@item a tool for collecting text for later re-use,
+@item a tool for typesetting the meta-information within a text,
+@item a tool for use in constructing macros with multiple optional parameters,
+@item a package for multiple column parallel texts,
+@item a tool for processing key-value structured lists,
+@item macros for typesetting a number as a German-language string.
+@end itemize")
+    (license license:lppl)))
+
 (define-public texlive-selinput
   (package
     (name "texlive-selinput")
-- 
cgit 1.4.1


From 8dc9bb02b289943584807686fff5486dddfeed0c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 14:52:27 +0200
Subject: gnu: Add texlive-tufte-latex.

* gnu/packages/tex.scm (texlive-tufte-latex): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2d5fb4987a..2c489e5e08 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6756,6 +6756,33 @@ definition, or to define space-stripped macros.")
 
 (define-deprecated-package texlive-latex-trimspaces texlive-trimspaces)
 
+(define-public texlive-tufte-latex
+  (package
+    (name "texlive-tufte-latex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/tufte-latex/"
+                   "doc/latex/tufte-latex/"
+                   "tex/latex/tufte-latex/")
+             (base32
+              "16jqf8assirdj769rajrdb70w8rc0kyj0q07bs6v13kfil5h0bdp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-changepage
+           texlive-ifmtarg
+           texlive-paralist
+           texlive-placeins
+           texlive-sauerj
+           texlive-xifthen))
+    (home-page "https://ctan.org/pkg/tufte-latex")
+    (synopsis "Document classes inspired by the work of Edward Tufte")
+    (description
+     "This package provides two classes inspired, respectively, by handouts
+and books created by Edward Tufte.")
+    (license license:asl2.0)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From 51e6dfb138fb9ce6666ff9b0b1bf8c05cbec9a1f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 14:52:52 +0200
Subject: gnu: Add texlive-willowtreebook.

* gnu/packages/tex.scm (texlive-willowtreebook): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2c489e5e08..63e5299585 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9404,6 +9404,27 @@ implements an easy to use interface for these symbols.")
 
 (define-deprecated-package texlive-latex-wasysym texlive-wasysym)
 
+(define-public texlive-willowtreebook
+  (package
+    (name "texlive-willowtreebook")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/willowtreebook/"
+                   "tex/latex/willowtreebook/")
+             (base32
+              "1rv6pmyl02fpysviz4mvz9az9bgk96p6s7mbi9ykxxp74xzh8jik")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/willowtreebook")
+    (synopsis "Easy basic book class, built on @code{memoir}")
+    (description
+     "The @code{willowtreebook} class is a simple book class, which the author
+uses for his lecture notes to be found on his web page Benjamin McKay.  It
+actually just selects options for the more sophisticated @code{memoir}
+class.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-wrapfig
   (package
     (name "texlive-wrapfig")
-- 
cgit 1.4.1


From ae83879c585ffee398bc314f1ef5eaf513b8c4a0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 14:53:34 +0200
Subject: gnu: Add texlive-scheme-bookpub.

* gnu/packages/tex.scm (texlive-scheme-bookpub): New variable.
---
 gnu/packages/tex.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 63e5299585..4ca991e439 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -15690,6 +15690,50 @@ Computer Modern fonts.  This scheme corresponds to @code{collection-basic} and
 
 (define-deprecated-package texlive-base texlive-scheme-basic)
 
+(define-public texlive-scheme-bookpub
+  (package
+    (name "texlive-scheme-bookpub")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-barcodes
+           texlive-biber
+           texlive-biblatex
+           texlive-bookcover
+           texlive-caption
+           texlive-collection-basic
+           texlive-collection-latex
+           texlive-enumitem
+           texlive-fontspec
+           texlive-latexmk
+           texlive-lipsum
+           texlive-listings
+           texlive-markdown
+           texlive-memoir
+           texlive-microtype
+           texlive-minted
+           texlive-novel
+           texlive-octavo
+           texlive-pdfpages
+           texlive-pgf
+           texlive-qrcode
+           texlive-shapes
+           texlive-titlesec
+           texlive-tocloft
+           texlive-tufte-latex
+           texlive-willowtreebook))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Book publishing scheme (core LaTeX and add-ons)")
+    (description
+     "This is a book publishing scheme, containing core (Lua)LaTeX and
+selected additional packages likely to be useful for non-technical book
+publication.  It does not contain additional fonts (different books need
+different fonts, and the packages are large), nor does it contain additional
+mathematical or other technical packages.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-scheme-context
   (package
     (name "texlive-scheme-context")
-- 
cgit 1.4.1


From f3cdb6e20336560ed40a7fe6b752ce27152c5743 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:18:35 +0200
Subject: guix: texlive importer allows meta-packages to build TeX formats.

* guix/import/texlive.scm (tlpdb->package): A package with no locations can
still build TeX format files, and therefore may use TEXLIVE-BUILD-SYSTEM.
---
 guix/import/texlive.scm | 51 +++++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index da25df0487..a26e467dca 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -394,9 +394,10 @@ of those files are returned that are unexpectedly installed."
              (source (with-store store
                        (download-multi-svn-to-store
                         store ref (string-append name "-svn-multi-checkout")))))
-    (let* ((meta-package? (null? locs))
-           (scripts (and (not meta-package?)
-                         (linked-scripts texlive-name package-database))))
+    (let* ((scripts (linked-scripts texlive-name package-database))
+           (tex-formats (formats data))
+           (meta-package? (null? locs))
+           (empty-package? (and meta-package? (not (pair? tex-formats)))))
       (values
        `(package
           (name ,name)
@@ -414,29 +415,33 @@ of those files are returned that are unexpectedly installed."
           ,@(if (assoc-ref data 'docfiles)
                 '((outputs '("out" "doc")))
                 '())
-          (build-system ,(if meta-package?
+          ;; Set build-system.
+          ;;
+          ;; Use trivial build system only when the package contains no files,
+          ;; and no TeX format file is expected to be built.
+          (build-system ,(if empty-package?
                              'trivial-build-system
                              'texlive-build-system))
           ;; Generate arguments field.
-          ,@(if meta-package?
-                '((arguments (list #:builder #~(mkdir #$output))))
-                (let* ((formats (formats data))
-                       (latex-bin-dependency?
-                        (member texlive-name
-                                (latex-bin-dependency-tree package-database)))
-                       (arguments
-                        (append (if latex-bin-dependency?
-                                    '(#:texlive-latex-bin? #f)
-                                    '())
-                                (if (pair? scripts)
-                                    `(#:link-scripts #~(list ,@scripts))
-                                    '())
-                                (if (pair? formats)
-                                    `(#:create-formats #~(list ,@formats))
-                                    '()))))
-                  (if (pair? arguments)
-                      `((arguments (list ,@arguments)))
-                      '())))
+          ,@(let* ((latex-bin-dependency?
+                    (member texlive-name
+                            (latex-bin-dependency-tree package-database)))
+                   (arguments
+                    (append (if empty-package?
+                                '(#:builder #~(mkdir #$output))
+                                '())
+                            (if latex-bin-dependency?
+                                '(#:texlive-latex-bin? #f)
+                                '())
+                            (if (pair? scripts)
+                                `(#:link-scripts #~(list ,@scripts))
+                                '())
+                            (if (pair? tex-formats)
+                                `(#:create-formats #~(list ,@tex-formats))
+                                '()))))
+              (if (pair? arguments)
+                  `((arguments (list ,@arguments)))
+                  '()))
           ;; Native inputs.
           ;;
           ;; Texlive build system generates font metrics whenever a font
-- 
cgit 1.4.1


From 4d171bf03faa5cf16b4d99a023c24d81c8d39e75 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:28:26 +0200
Subject: guix: texlive importer ignores "-dev" packages in propagated inputs.

* guix/import/texlive.scm (translate-depends): Skip "-dev" packages.
---
 guix/import/texlive.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index a26e467dca..3b5c7192b1 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -153,6 +153,9 @@ When TEXLIVE-ONLY is true, only TeX Live packages are returned."
                  ((or (? (cut string-prefix? "texlive-" <>))
                       "tlshell" "texlive.infra")
                   #f)
+                 ;; And also development packages, which should inherit from
+                 ;; the current package anyway.
+                 ((? (cut string-suffix? "-dev" <>)) #f)
                  ;; Others.
                  (name name))
                depends)))
-- 
cgit 1.4.1


From 089add98d20447de2657cb0504b51681382561a7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:43:52 +0200
Subject: gnu: Add texlive-arabxetex.

* gnu/packages/tex.scm (texlive-arabxetex): New variable.
---
 gnu/packages/tex.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4ca991e439..4207af65ed 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12836,6 +12836,68 @@ the @code{psnfss} distribution.")
     ;; Either LPPL version 1.0 or later, or GPL version 2
     (license (list license:lppl1.0+ license:gpl2))))
 
+(define-public texlive-arabxetex
+  (package
+    (name "texlive-arabxetex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/arabxetex/"
+                   "fonts/misc/xetex/fontmapping/arabxetex/"
+                   "source/xelatex/arabxetex/"
+                   "tex/xelatex/arabxetex/")
+             (base32
+              "097lh7ksw9rg93f1c7a4fqglgfpydf1qp3sbgy9xfgszcdpknmrk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:tex-format "xelatex"
+      #:phases
+           #~(modify-phases %standard-phases
+               ;; Use dummy fonts to avoid pulling in needless dependencies.
+               ;; We're only interested in building the package, not the
+               ;; documentation.
+               (add-after 'unpack 'change-fonts
+                 (lambda _
+                   (substitute* "source/xelatex/arabxetex/arabxetex.dtx"
+                     (("(newfontfamily.*?\\{)[^}]+}" _ prefix)
+                      (string-append prefix "FreeSans}"))
+                     (("(set(main|mono|sans)font(\\[.*?])?\\{)[^}]+}" _ prefix)
+                      (string-append prefix "FreeSans}"))))))))
+    (native-inputs
+     (list fontconfig
+           font-gnu-freefont
+           texlive-amsmath
+           texlive-amsfonts
+           texlive-bidi
+           texlive-fancyvrb
+           texlive-fontspec
+           texlive-hologo
+           texlive-hypdoc
+           texlive-hyperref
+           texlive-infwarerr
+           texlive-kvdefinekeys
+           texlive-kvoptions
+           texlive-kvsetkeys
+           texlive-ltxcmds
+           texlive-paralist
+           texlive-pdftexcmds
+           texlive-supertabular
+           texlive-tools
+           texlive-xetex
+           texlive-xkeyval
+           texlive-zref))
+    (home-page "https://ctan.org/pkg/arabxetex")
+    (synopsis "ArabTeX-like interface for XeLaTeX")
+    (description
+     "ArabXeTeX provides a convenient ArabTeX-like user-interface for
+typesetting languages using the Arabic script in XeLaTeX, with flexible access
+to font features.  Input in ArabTeX notation can be set in three different
+vocalization modes or in roman transliteration.  Direct UTF-8 input is also
+supported.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-arev
   (package
     (name "texlive-arev")
-- 
cgit 1.4.1


From e025003e0f3b03b30efbf41c24b3e3ad7617b97a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:44:29 +0200
Subject: gnu: Add texlive-awesomebox.

* gnu/packages/tex.scm (texlive-awesomebox): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4207af65ed..2a89510150 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12933,6 +12933,26 @@ packages.")
                    license:lppl1.3a     ;for TeX support files
                    license:gpl2))))     ;for ams-mdbch.sty
 
+(define-public texlive-awesomebox
+  (package
+    (name "texlive-awesomebox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/awesomebox/"
+                   "tex/latex/awesomebox/")
+             (base32
+              "0jmxhas12fs30x2csv1rbsjr71a60fv2r3i5q7xd5n9zmmrnh32f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/awesomebox")
+    (synopsis "Draw admonition blocks in your documents")
+    (description
+     "Awesome Box is all about drawing admonition blocks around text to inform
+or alert readers about something particular.  The specific aim of this package
+is to use FontAwesome icons to ease the illustration of these blocks.")
+    (license license:wtfpl2)))
+
 (define-public texlive-mathdesign
   (package
     (name "texlive-mathdesign")
-- 
cgit 1.4.1


From 3db87db2d85ef180a4901606780ce68b17e222e8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:44:50 +0200
Subject: gnu: Add texlive-bidi-atbegshi.

* gnu/packages/tex.scm (texlive-bidi-atbegshi): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2a89510150..28248f2cdf 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -812,6 +812,27 @@ bidirectional texts with plain TeX and LaTeX.  The package includes
 adaptations for use with many other commonly-used packages.")
     (license license:lppl1.3+)))
 
+(define-public texlive-bidi-atbegshi
+  (package
+    (name "texlive-bidi-atbegshi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/bidi-atbegshi/"
+                   "tex/xelatex/bidi-atbegshi/")
+             (base32
+              "08gawna9hf5p3rn0v5qzszk61zqknixafvh6d2x37x960x493gn7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bidi-atbegshi")
+    (synopsis "Bidi-aware shipout macros")
+    (description
+     "The package adds some commands to the @code{atbegshi} package for proper
+placement of background material in the left and right corners of the output
+page, in both LTR and RTL modes.  The package only works with @code{xelatex}
+format and should be loaded before the @code{bidi} package.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-libkpathsea
   (package/inherit texlive-bin
     (name "texlive-libkpathsea")
-- 
cgit 1.4.1


From 53537fd75a07154881e4ee5f5950ceafcfb67f2c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:45:08 +0200
Subject: gnu: Add texlive-bidicontour.

* gnu/packages/tex.scm (texlive-bidicontour): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 28248f2cdf..4117bcf07e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -833,6 +833,26 @@ page, in both LTR and RTL modes.  The package only works with @code{xelatex}
 format and should be loaded before the @code{bidi} package.")
     (license license:lppl1.3+)))
 
+(define-public texlive-bidicontour
+  (package
+    (name "texlive-bidicontour")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/bidicontour/"
+                   "tex/xelatex/bidicontour/")
+             (base32
+              "1kiqbn5map3d9bmlvr5cq1snssw44c772xzjp6yyjvg6wg1zy0bn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bidicontour")
+    (synopsis "Bidi-aware coloured contour around text")
+    (description
+     "The package is a re-implementation of the @code{contour} package, making
+it Bidi-aware, and adding support of the xdvipdfmx (when the outline option of
+the package is used).")
+    (license license:lppl1.3+)))
+
 (define-public texlive-libkpathsea
   (package/inherit texlive-bin
     (name "texlive-libkpathsea")
-- 
cgit 1.4.1


From b8602b566848da36c18e5bb77f90cf46581bf483 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:45:24 +0200
Subject: gnu: Add texlive-bidipagegrid.

* gnu/packages/tex.scm (texlive-bidipagegrid): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4117bcf07e..de941e19a8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -853,6 +853,24 @@ it Bidi-aware, and adding support of the xdvipdfmx (when the outline option of
 the package is used).")
     (license license:lppl1.3+)))
 
+(define-public texlive-bidipagegrid
+  (package
+    (name "texlive-bidipagegrid")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/bidipagegrid/"
+                   "tex/xelatex/bidipagegrid/")
+             (base32
+              "19jkg4apf1g3whigcchbcf8p14lpxkz9ih2vrw00akwfh8v3ssrk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bidipagegrid")
+    (synopsis "Bidi-aware page grid in background")
+    (description "The package provides Bidi-aware page grid in background.  It
+is based on @code{pagegrid}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-libkpathsea
   (package/inherit texlive-bin
     (name "texlive-libkpathsea")
-- 
cgit 1.4.1


From b9c3c6b5abe36c3070a779352dd74178f090eb2e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:45:39 +0200
Subject: gnu: Add texlive-bidipresentation.

* gnu/packages/tex.scm (texlive-bidipresentation): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index de941e19a8..cf181f25cb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -871,6 +871,26 @@ the package is used).")
 is based on @code{pagegrid}.")
     (license license:lppl1.3+)))
 
+(define-public texlive-bidipresentation
+  (package
+    (name "texlive-bidipresentation")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/bidipresentation/"
+                   "tex/xelatex/bidipresentation/")
+             (base32
+              "0b9md68zzj3nzi9b4hdavjz43nwair1xg3b240p0bp5ly5l6pvmr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bidipresentation")
+    (synopsis "Experimental bidi presentation")
+    (description
+     "This package provides a great portion of the code is borrowed from the
+texpower bundle, with modifications to get things working properly in both
+right to left and left to right modes.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-libkpathsea
   (package/inherit texlive-bin
     (name "texlive-libkpathsea")
-- 
cgit 1.4.1


From 9f0d9453d9c9b70e03574d801ca27ae819e3e2de Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:45:55 +0200
Subject: gnu: Add texlive-bidishadowtext.

* gnu/packages/tex.scm (texlive-bidishadowtext): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cf181f25cb..96ac7b0279 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -891,6 +891,25 @@ texpower bundle, with modifications to get things working properly in both
 right to left and left to right modes.")
     (license license:lppl1.3+)))
 
+(define-public texlive-bidishadowtext
+  (package
+    (name "texlive-bidishadowtext")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/bidishadowtext/"
+                   "tex/xelatex/bidishadowtext/")
+             (base32
+              "1nq71bgz7vag9k138mx8hsf42cjvgry2g4z9jiqmq4almm23a1gq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bidishadowtext")
+    (synopsis "Bidi-aware shadow text")
+    (description
+     "This package allows you to typeset Bidi-aware shadow text.  It is
+a re-implementation of the @code{shadowtext} package adding Bidi support.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-libkpathsea
   (package/inherit texlive-bin
     (name "texlive-libkpathsea")
-- 
cgit 1.4.1


From 6ca69d663266fd3a38ac13b8c2fa33864fad9d31 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:47:37 +0200
Subject: gnu: Add texlive-businesscard-qrcode.

* gnu/packages/tex.scm (texlive-businesscard-qrcode): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 96ac7b0279..dd3dce00c0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4514,6 +4514,27 @@ cubic root function.  In addition, tangents on all functions and derivatives
 of polynomials can be calculated.")
     (license license:lppl)))
 
+(define-public texlive-businesscard-qrcode
+  (package
+    (name "texlive-businesscard-qrcode")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/businesscard-qrcode/"
+                   "tex/xelatex/businesscard-qrcode/")
+             (base32
+              "0r942lv7mymi9wmmshjgf3vnz2n38m91dzqzrg0dg6bckb09dhmf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/businesscard-qrcode")
+    (synopsis "Business cards with QR-Code")
+    (description
+     "This package generates a configurable business card or visiting card
+with full vcard as QR-Code, ready to send to online printers.  You can specify
+the exact size of the paper and the content within the paper, including
+generation of crop marks.")
+    (license license:lgpl3)))
+
 (define-public texlive-cmarrows
   (package
     (name "texlive-cmarrows")
-- 
cgit 1.4.1


From 6155972866d1f34d2d32e0df3c8385e479432d85 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:48:01 +0200
Subject: gnu: Add texlive-cqubeamer.

* gnu/packages/tex.scm (texlive-cqubeamer): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dd3dce00c0..4a82956b89 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4574,6 +4574,27 @@ Computer Modern style.")
 @file{.pfb} file.")
     (license license:public-domain)))   ;see "README-cmexb"
 
+(define-public texlive-cqubeamer
+  (package
+    (name "texlive-cqubeamer")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/cqubeamer/"
+                   "tex/xelatex/cqubeamer/")
+             (base32
+              "13ma7i3z64w59m2hkrh68j3vqa2k93hhb2lmarqb4pkhr72vk4s7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cqubeamer")
+    (synopsis "LaTeX Beamer Template for Chongqing University")
+    (description
+     "This package provides a LaTeX beamer template designed for researchers
+of Chongqing University.  It can be used for academic reports, conferences, or
+thesis defense, and can be helpful for delivering a speech.  It should be used
+with the XeTeX engine.")
+    (license (list license:expat license:cc-by4.0))))
+
 (define-public texlive-cs
   (package
     (name "texlive-cs")
-- 
cgit 1.4.1


From 8c7497bcbeec3d16fa7843139ee85f771f29c6a9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:48:35 +0200
Subject: gnu: Add texlive-fixlatvian.

* gnu/packages/tex.scm (texlive-fixlatvian): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4a82956b89..90bfe967e1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5566,6 +5566,27 @@ that column has any marks at all; keep two column floats like @code{figure*}
 in sequence with single column floats like figure.")
     (license license:lppl)))
 
+(define-public texlive-fixlatvian
+  (package
+    (name "texlive-fixlatvian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/fixlatvian/"
+                   "makeindex/fixlatvian/"
+                   "source/xelatex/fixlatvian/"
+                   "tex/xelatex/fixlatvian/")
+             (base32
+              "09bivnc287z57k9rhwfl16w66dkvb55shnwpqv972n6dsjdcrh7j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fixlatvian")
+    (synopsis "Improve Latvian language support in XeLaTeX")
+    (description
+     "The package offers improvement of the Latvian language support in
+@code{polyglossia}, in particular in the area of the standard classes.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-fiziko
   (package
     (name "texlive-fiziko")
-- 
cgit 1.4.1


From 01803f0809a258043665ecc4d5e665d0f08c26a7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:48:55 +0200
Subject: gnu: Add texlive-font-change-xetex.

* gnu/packages/tex.scm (texlive-font-change-xetex): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 90bfe967e1..525855fcd9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5608,6 +5608,32 @@ The library also contains functions to draw some objects constructed from
 these primitives.")
     (license (list license:gpl3+ license:cc-by-sa4.0))))
 
+(define-public texlive-font-change-xetex
+  (package
+    (name "texlive-font-change-xetex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xetex/font-change-xetex/"
+                   "tex/xetex/font-change-xetex/")
+             (base32
+              "1qhkxsk3wl6a8isik4ln1jq7ifhk7hbidq2i1lfy18c1py87xw5k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/font-change-xetex")
+    (synopsis "Macros to change text and mathematics fonts in plain XeTeX")
+    (description
+     "This package consists of macros that can be used to typeset plain XeTeX
+documents using any OpenType or TrueType font installed on the computer
+system.  The macros allow the user to change the text mode fonts and some math
+mode fonts.  For any declared font family, various font style, weight, and
+size variants like bold, italics, small caps, etc., are available through
+standard and custom TeX control statements.  Using the optional argument of
+the macros, the available XeTeX font features and OpenType tags can be
+accessed.  Other features of the package include activating and deactivating
+hanging punctuation, and support for special Unicode characters.")
+    (license license:cc-by-sa4.0)))
+
 (define-public texlive-garrigues
   (package
     (name "texlive-garrigues")
-- 
cgit 1.4.1


From 2ac3526bdf2dc43e9b35b404878350f82c823063 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:49:11 +0200
Subject: gnu: Add texlive-fontbook.

* gnu/packages/tex.scm (texlive-fontbook): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 525855fcd9..21805a5dfe 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5634,6 +5634,26 @@ accessed.  Other features of the package include activating and deactivating
 hanging punctuation, and support for special Unicode characters.")
     (license license:cc-by-sa4.0)))
 
+(define-public texlive-fontbook
+  (package
+    (name "texlive-fontbook")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/fontbook/"
+                   "source/xelatex/fontbook/"
+                   "tex/xelatex/fontbook/")
+             (base32
+              "1n5yn6rgndk0yr91bhglby9nr5mifgfi895klvsixmxc0k5bqp97")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fontbook")
+    (synopsis "Generate a font book")
+    (description
+     "The package provides a means of producing a book of font samples (for
+evaluation, etc.).")
+    (license license:lppl1.3+)))
+
 (define-public texlive-garrigues
   (package
     (name "texlive-garrigues")
-- 
cgit 1.4.1


From 50e433f08c49652fe9c236edca2bf7665e8e4531 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:49:26 +0200
Subject: gnu: Add texlive-fontwrap.

* gnu/packages/tex.scm (texlive-fontwrap): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 21805a5dfe..974434859b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5654,6 +5654,25 @@ hanging punctuation, and support for special Unicode characters.")
 evaluation, etc.).")
     (license license:lppl1.3+)))
 
+(define-public texlive-fontwrap
+  (package
+    (name "texlive-fontwrap")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/fontwrap/"
+                   "tex/xelatex/fontwrap/")
+             (base32
+              "0nzphhwgm9387mn2rfhmsandyvcwv99lxm5978jg6pycs43dggs7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fontwrap")
+    (synopsis "Bind fonts to specific Unicode blocks")
+    (description
+     "The package (which runs under XeLaTeX) lets you bind fonts to specific
+Unicode blocks, for automatic font tagging of multilingual text.")
+    (license license:gpl3+)))
+
 (define-public texlive-garrigues
   (package
     (name "texlive-garrigues")
-- 
cgit 1.4.1


From 6e33208a28dd6edf284d22d35df13b6065fe5dc0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:49:53 +0200
Subject: gnu: Add texlive-interchar.

* gnu/packages/tex.scm (texlive-interchar): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 974434859b..dda8135b2e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5837,6 +5837,27 @@ between various classes of Unix systems.")
 
 (define-deprecated-package texlive-latex-ifplatform texlive-ifplatform)
 
+(define-public texlive-interchar
+  (package
+    (name "texlive-interchar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/interchar/"
+                   "tex/xelatex/interchar/")
+             (base32
+              "06pvpaph1gi3rjvwzpvzc2rlx0wb8fqmidbfh8dw2qazzbirdlnz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/interchar")
+    (synopsis "Managing character class schemes in XeTeX")
+    (description
+     "The package manages character class schemes of XeTeX.  Using this
+package, you may switch among different character class schemes.  Migration
+commands are provided for make packages using this mechanism compatible with
+each others.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-latexmk
   (package
     (name "texlive-latexmk")
-- 
cgit 1.4.1


From 388d0c14391dbf5345c292a51a06241bcdc59042 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:50:18 +0200
Subject: gnu: Add texlive-na-position.

* gnu/packages/tex.scm (texlive-na-position): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dda8135b2e..90de5ccc92 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6248,6 +6248,28 @@ trees.  One command and several parameters to control the output are
 provided.")
     (license license:lppl1.3+)))
 
+(define-public texlive-na-position
+  (package
+    (name "texlive-na-position")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/na-position/"
+                   "tex/xelatex/na-position/")
+             (base32
+              "0rp1css44sl6j762kfwzq53k6690djgag6yc85dd9134i837gvqr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/na-position")
+    (synopsis
+     "Tables of relative positions of curves, asymptotes, tangents in Arabic documents")
+    (description
+     "This package facilitates, in most cases, the creation of tables of
+relative positions of a curve and its asymptote, or a curve and a tangent in
+one of its points.  This package has to be used with @code{polyglossia} and
+XeLaTeX to produce documents in Arabic.")
+    (license license:lppl)))
+
 (define-public texlive-natbib
   (package
     (name "texlive-natbib")
-- 
cgit 1.4.1


From ccf2d15eb247643bff0d1a6e2e274a83a6aa361c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:50:54 +0200
Subject: gnu: Add texlive-philokalia.

* gnu/packages/tex.scm (texlive-philokalia): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 90de5ccc92..50b7b1c1f6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6484,6 +6484,28 @@ available for LuaTeX by reimplementing them using Lua.")
 
 (define-deprecated-package texlive-latex-pdftexcmds texlive-pdftexcmds)
 
+(define-public texlive-philokalia
+  (package
+    (name "texlive-philokalia")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/philokalia/"
+                   "fonts/opentype/public/philokalia/"
+                   "source/xelatex/philokalia/"
+                   "tex/xelatex/philokalia/")
+             (base32
+              "1pcszddyyc4caqd1ahcl10rf1mn0m1lrdgn1gldv94cpa89653kg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/philokalia")
+    (synopsis "Font to typeset the Philokalia Books")
+    (description
+     "The @code{philokalia} package has been designed to ease the use of the
+Philokalia-Regular OpenType font with XeLaTeX.  The font started as a project
+to digitize the typeface used to typeset the Philokalia books.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-piechartmp
   (package
     (name "texlive-piechartmp")
-- 
cgit 1.4.1


From e2f661a3838413b76075f44bff3a2da08913785b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:51:13 +0200
Subject: gnu: Add texlive-ptext.

* gnu/packages/tex.scm (texlive-ptext): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 50b7b1c1f6..c11205e007 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6597,6 +6597,25 @@ re-processing.")
 
 (define-deprecated-package texlive-latex-pstool texlive-pstool)
 
+(define-public texlive-ptext
+  (package
+    (name "texlive-ptext")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/ptext/" "tex/xelatex/ptext/")
+             (base32
+              "0ipb1mlg266rziznskdxi3iwi0s6374lp8ky0hhbi5llryg505p9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ptext")
+    (synopsis "Lipsum for Persian")
+    (description
+     "The package provides lipsum-like facilities for the Persian language.
+The source of the filling text is the Persian epic @emph{the Shanameh} (100
+paragraphs are used).")
+    (license license:lppl1.2+)))
+
 (define-public texlive-refcount
   (package
     (name "texlive-refcount")
-- 
cgit 1.4.1


From 29dfa377add90ef3dc09d19fc868350e07e151bf Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:51:44 +0200
Subject: gnu: Add texlive-realscripts.

* gnu/packages/tex.scm (texlive-realscripts): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c11205e007..7235b64091 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6616,6 +6616,29 @@ The source of the filling text is the Persian epic @emph{the Shanameh} (100
 paragraphs are used).")
     (license license:lppl1.2+)))
 
+(define-public texlive-realscripts
+  (package
+    (name "texlive-realscripts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/realscripts/"
+                   "source/latex/realscripts/"
+                   "tex/latex/realscripts/")
+             (base32
+              "1yk1v1ybd1zv1x6rc8qd2mbbwc5h91i44scnih6v2n5nrh61jfxb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/realscripts")
+    (synopsis "Access OpenType subscript and superscript glyphs")
+    (description
+     "This package replaces @code{\\textsuperscript} and
+@code{\\textsubscript} commands by equivalent commands that use OpenType font
+features to access appropriate glyphs if possible.  It also patches LaTeX's
+default footnote command to use this new @code{\\textsuperscript} for footnote
+symbols.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-refcount
   (package
     (name "texlive-refcount")
-- 
cgit 1.4.1


From f7885d7b0f91004cd7f02d3dc1ca8224fa688e47 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:52:09 +0200
Subject: gnu: Add texlive-simple-resume-cv.

* gnu/packages/tex.scm (texlive-simple-resume-cv): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7235b64091..cc3352ce07 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6914,6 +6914,26 @@ MetaPost.")
 result in the same document.")
     (license license:lppl1.2+)))
 
+(define-public texlive-simple-resume-cv
+  (package
+    (name "texlive-simple-resume-cv")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/simple-resume-cv/"
+                   "tex/xelatex/simple-resume-cv/")
+             (base32
+              "07lqmjfjr58q7jgl59syv67hsy54rsig9f002wkwr1297z02k862")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/simple-resume-cv")
+    (synopsis "Template for a simple resume or curriculum vitae (CV)")
+    (description
+     "This package provides a template for a simple resume or curriculum
+vitae (CV), in XeLaTeX.  This simple template can be further customized or
+extended, with numerous examples.")
+    (license license:public-domain)))
+
 (define-public texlive-slideshow
   (package
     (name "texlive-slideshow")
-- 
cgit 1.4.1


From 1a09e224c84ac56e14582bf6090f7ca6cc60a117 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:52:25 +0200
Subject: gnu: Add texlive-simple-thesis-dissertation.

* gnu/packages/tex.scm (texlive-simple-thesis-dissertation): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cc3352ce07..a32a991c5a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6934,6 +6934,27 @@ vitae (CV), in XeLaTeX.  This simple template can be further customized or
 extended, with numerous examples.")
     (license license:public-domain)))
 
+(define-public texlive-simple-thesis-dissertation
+  (package
+    (name "texlive-simple-thesis-dissertation")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list
+              "doc/xelatex/simple-thesis-dissertation/Figures/"
+              "tex/xelatex/simple-thesis-dissertation/")
+             (base32
+              "023bl8ic6bn86297wbxip5lm34wkbq1kcrizkmmsdz7cfxpn6637")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/simple-thesis-dissertation")
+    (synopsis "Template for a simple thesis, dissertation, or technical report")
+    (description
+     "This package provides a template for a simple thesis or dissertation or
+technical report, in XeLaTeX.  This simple template that can be further
+customized or extended, with numerous examples.")
+    (license license:public-domain)))
+
 (define-public texlive-slideshow
   (package
     (name "texlive-slideshow")
-- 
cgit 1.4.1


From e099105bf8cd25b8f2aa71e162c01140308f2c84 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:52:54 +0200
Subject: gnu: Add texlive-tetragonos.

* gnu/packages/tex.scm (texlive-tetragonos): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a32a991c5a..c6e4276f75 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7034,6 +7034,25 @@ of which make use of the @code{stackengine} core.")
      "The package provides macros for drawing Chinese and Japanese abaci.")
     (license license:lppl)))
 
+(define-public texlive-tetragonos
+  (package
+    (name "texlive-tetragonos")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/tetragonos/"
+                   "tex/xelatex/tetragonos/")
+             (base32
+              "191727d2craai25847i2xfzlm04852afvrwdjsk3jjss46a43ixn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tetragonos")
+    (synopsis "Four-Corner codes of Chinese characters")
+    (description
+     "This is a XeLaTeX package for mapping Chinese characters to their codes
+in the Four-Corner method.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-threeddice
   (package
     (name "texlive-threeddice")
-- 
cgit 1.4.1


From 0c77a0fd60b08af2c6596a50761e3814a756d90a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:53:18 +0200
Subject: gnu: Add texlive-ucharclasses.

* gnu/packages/tex.scm (texlive-ucharclasses): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c6e4276f75..ef85a5aec9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7176,6 +7176,27 @@ definition, or to define space-stripped macros.")
 and books created by Edward Tufte.")
     (license license:asl2.0)))
 
+(define-public texlive-ucharclasses
+  (package
+    (name "texlive-ucharclasses")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/ucharclasses/"
+                   "tex/xelatex/ucharclasses/")
+             (base32
+              "0pgzs730zqmcck693i7fq771p7szq6nqdxb9w8dy6l2b4zdql14m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ucharclasses")
+    (synopsis "Font actions in XeTeX according to what is being processed")
+    (description
+     "The package takes care of switching fonts when you switch from one
+Unicode block to another in the text of a document.  This way, you can write
+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-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From 98d4d2140aa9268a2d6ffc59533fa9f6d34b9f06 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:53:33 +0200
Subject: gnu: Add texlive-unicode-bidi.

* gnu/packages/tex.scm (texlive-unicode-bidi): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ef85a5aec9..14804a84af 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7197,6 +7197,25 @@ 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-unicode-bidi
+  (package
+    (name "texlive-unicode-bidi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/unicode-bidi/"
+                   "tex/xelatex/unicode-bidi/")
+             (base32
+              "0anwaaf21qcdgni9z85hqap1wb4y9pv13p96x13w29hbqizmf69l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unicode-bidi")
+    (synopsis "Experimental Unicode Bidi package for XeTeX")
+    (description
+     "The experimental Unicode-Bidi package allows to mix non-RTL script with
+RTL script without any markup.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From c78945b85ec30418bd7435351c85843b20421a87 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:53:46 +0200
Subject: gnu: Add texlive-unimath-plain-xetex.

* gnu/packages/tex.scm (texlive-unimath-plain-xetex): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 14804a84af..947ecf2318 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7216,6 +7216,26 @@ a document with no explicit font selection, but a series of rules of the form
 RTL script without any markup.")
     (license license:lppl1.3+)))
 
+(define-public texlive-unimath-plain-xetex
+  (package
+    (name "texlive-unimath-plain-xetex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xetex/unimath-plain-xetex/"
+                   "fonts/misc/xetex/fontmapping/unimath-plain-xetex/"
+                   "tex/xetex/unimath-plain-xetex/")
+             (base32
+              "0vqnqfklg1mj7mipgrfng0qq1i9psiqri0yh30ixrz8j6mkaqb35")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unimath-plain-xetex")
+    (synopsis "OpenType math support in (plain) XeTeX")
+    (description
+     "This package provides OpenType math font support in plain TeX format.
+It only works with the XeTeX engine.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From f2b4b2e1cca2d8f17f301db5f56ee552e4223d06 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:54:14 +0200
Subject: gnu: Add texlive-unisugar.

* gnu/packages/tex.scm (texlive-unisugar): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 947ecf2318..edc76985af 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7236,6 +7236,27 @@ RTL script without any markup.")
 It only works with the XeTeX engine.")
     (license license:lppl1.3c)))
 
+(define-public texlive-unisugar
+  (package
+    (name "texlive-unisugar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/unisugar/"
+                   "tex/xelatex/unisugar/")
+             (base32
+              "1bn88ghfn14am1grph1pjw9k0xy1rz8swzhsbxsxyzz6cqk9s161")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unisugar")
+    (synopsis "Define syntactic sugar for Unicode LaTeX")
+    (description
+     "The package allows the user to define shorthand aliases for single
+Unicode characters, and also provides support for such aliases in RTL-text.
+The package requires an TeX-alike system that uses Unicode input in a native
+way: current examples are XeTeX and LuaTeX.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From 551ecdb8d516f0638c74d564fe5632707427f109 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:54:31 +0200
Subject: gnu: Add texlive-xebaposter.

* gnu/packages/tex.scm (texlive-xebaposter): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index edc76985af..9b4a07579a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7257,6 +7257,25 @@ The package requires an TeX-alike system that uses Unicode input in a native
 way: current examples are XeTeX and LuaTeX.")
     (license license:lppl1.3+)))
 
+(define-public texlive-xebaposter
+  (package
+    (name "texlive-xebaposter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xebaposter/"
+                   "tex/latex/xebaposter/")
+             (base32
+              "18fnwfhfk3jzkp4yd0dfi49jnf8njccbhhd6k15pvghs4brd9hba")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xebaposter")
+    (synopsis "Create scientific Persian/Latin posters using TikZ")
+    (description
+     "This package is designed for making scientific Persian/Latin posters.
+It is a fork of @code{baposter} by Brian Amberg and Reinhold Kainhofer.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From b3fabf244ed6c07c66f52cb797ee0d8f60b02adc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:54:47 +0200
Subject: gnu: Add texlive-xechangebar.

* gnu/packages/tex.scm (texlive-xechangebar): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9b4a07579a..5610bdcfd7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7276,6 +7276,27 @@ way: current examples are XeTeX and LuaTeX.")
 It is a fork of @code{baposter} by Brian Amberg and Reinhold Kainhofer.")
     (license license:lppl1.3+)))
 
+(define-public texlive-xechangebar
+  (package
+    (name "texlive-xechangebar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/xechangebar/"
+                   "tex/xelatex/xechangebar/")
+             (base32
+              "0a7b9bffh5b435gw4qxydmfrpizly79cjgjhhlgywwg6gibvxn4s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xechangebar")
+    (synopsis "Extension of package @code{changebar} for use with XeLaTeX")
+    (description
+     "The package extends package @code{changebar} so it can be used with
+XeLaTeX.  It introduces the new option @code{xetex} for use with XeLaTeX.
+Everything else remains the same and users should consult the original
+documentation for usage information.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From f7295b10ccbfc98493757502b8ae5eec2c65a446 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:55:00 +0200
Subject: gnu: Add texlive-xecolor.

* gnu/packages/tex.scm (texlive-xecolor): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5610bdcfd7..5ea1ff1f8d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7297,6 +7297,26 @@ Everything else remains the same and users should consult the original
 documentation for usage information.")
     (license license:lppl1.3+)))
 
+(define-public texlive-xecolor
+  (package
+    (name "texlive-xecolor")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/xecolor/"
+                   "tex/xelatex/xecolor/")
+             (base32
+              "0adzg2j1lmclr5zcs8da3m1b9q5xs50rxga6k2pzzxy2x0nh1xpi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xecolor")
+    (synopsis "Support for color in XeLaTeX")
+    (description
+     "This is a simple package which defines about 140 different colours using
+XeTeX's colour feature.  The colours can be used in bidirectional texts
+without any problem.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From 4fb5d377ff61cf37742749d666410d7017cc63e7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:55:18 +0200
Subject: gnu: Add texlive-xecyr.

* gnu/packages/tex.scm (texlive-xecyr): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5ea1ff1f8d..83c06a7d70 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7317,6 +7317,24 @@ XeTeX's colour feature.  The colours can be used in bidirectional texts
 without any problem.")
     (license license:lppl1.3+)))
 
+(define-public texlive-xecyr
+  (package
+    (name "texlive-xecyr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/xecyr/" "tex/xelatex/xecyr/")
+             (base32
+              "07qvxfnwha6iqzcv84ws074jdi8jn60h42l93jn037n3zj2qxkg8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xecyr")
+    (synopsis "Using Cyrillic languages in XeTeX")
+    (description
+     "This package provides helper tools for using Cyrillic languages with
+XeLaTeX and @code{babel}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From f598b0fb97db4352692843096c2e39993199b23c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:55:33 +0200
Subject: gnu: Add texlive-xeindex.

* gnu/packages/tex.scm (texlive-xeindex): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 83c06a7d70..ef757ed369 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7335,6 +7335,27 @@ without any problem.")
 XeLaTeX and @code{babel}.")
     (license license:lppl1.3+)))
 
+(define-public texlive-xeindex
+  (package
+    (name "texlive-xeindex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/xeindex/"
+                   "tex/xelatex/xeindex/")
+             (base32
+              "1sps9lrzm9y2rrin5pkgzyk56c77xnydvp21ljmvsimqgafr5aqb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xeindex")
+    (synopsis "Automatic index generation for XeLaTeX")
+    (description
+     "The package is based on XeSearch, and will automatically index words or
+phrases in an XeLaTeX document.  Words are declared in a list, and every
+occurrence then creates an index entry whose content can be fully specified
+beforehand.")
+    (license license:lppl)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From 98cf64ec2f23ac8424ff23e492d239e486470c2c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:55:48 +0200
Subject: gnu: Add texlive-xesearch.

* gnu/packages/tex.scm (texlive-xesearch): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ef757ed369..26680d6f0d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7356,6 +7356,28 @@ occurrence then creates an index entry whose content can be fully specified
 beforehand.")
     (license license:lppl)))
 
+(define-public texlive-xesearch
+  (package
+    (name "texlive-xesearch")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xetex/xesearch/" "tex/xetex/xesearch/")
+             (base32
+              "13fdllqswyyvvyjqn0a4ld18dixxnn7zlpagsdaq8cl1svpaxpk5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xesearch")
+    (synopsis "String finder for XeTeX")
+    (description
+     "The package finds strings (e.g., parts of words or phrases) and
+manipulates them, thus turning each word or phrase into a possible command.
+It is written in plain XeTeX and should thus work with any format.  The main
+application for the moment is XeIndex, an automatic index for XeLaTeX, but
+examples are given of simple use to check spelling, count words, and highlight
+syntax of programming languages.")
+    (license license:lppl)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From 5ec1ac2194b7f929c16f791914d880a9a38d431f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:56:02 +0200
Subject: gnu: Add texlive-xespotcolor.

* gnu/packages/tex.scm (texlive-xespotcolor): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 26680d6f0d..4ab8db8678 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7378,6 +7378,27 @@ examples are given of simple use to check spelling, count words, and highlight
 syntax of programming languages.")
     (license license:lppl)))
 
+(define-public texlive-xespotcolor
+  (package
+    (name "texlive-xespotcolor")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/xespotcolor/"
+                   "source/xelatex/xespotcolor/"
+                   "tex/xelatex/xespotcolor/")
+             (base32
+              "0pqv4y2idcazwdy94ryyrk5s2g66sb7liy9hypqaq69symn8myf7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xespotcolor")
+    (synopsis "Spot colours support for XeLaTeX")
+    (description
+     "The package provides macros for using spot colours in LaTeX documents.
+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-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From 749e4be61ad567a8179a68ce8c80984415b15cb3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:56:19 +0200
Subject: gnu: Add texlive-xetex-itrans.

* gnu/packages/tex.scm (texlive-xetex-itrans): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4ab8db8678..bdc7d5c896 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7399,6 +7399,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-itrans
+  (package
+    (name "texlive-xetex-itrans")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/xetex-itrans/"
+                   "fonts/misc/xetex/fontmapping/xetex-itrans/")
+             (base32
+              "1chx2s0p6y5p767cr23jh9x61axjrdnyc5lcvf7kyrg74cszsmql")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xetex-itrans")
+    (synopsis "Itrans input maps for use with XeLaTeX")
+    (description
+     "The package provides maps for use with XeLaTeX with coding done using
+@code{itrans}.  Fontspec maps are provided for Devanagari (Sanskrit), for
+Sanskrit in Kannada and for Kannada itself.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From f9aeaee2dbb6380021b63a5db446ce48fe76a8c1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:56:57 +0200
Subject: gnu: Add texlive-xetex-pstricks.

* gnu/packages/tex.scm (texlive-xetex-pstricks): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bdc7d5c896..4e4eba1219 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7419,6 +7419,29 @@ XeLaTeX.  As such, it has the same user interface and the same capabilities.")
 Sanskrit in Kannada and for Kannada itself.")
     (license license:lppl1.3+)))
 
+(define-public texlive-xetex-pstricks
+  (package
+    (name "texlive-xetex-pstricks")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xetex/xetex-pstricks/"
+                   "tex/xelatex/xetex-pstricks/"
+                   "tex/xetex/xetex-pstricks/")
+             (base32
+              "195zjdxddlwl69gnp2x3jg3l8gn36mxsdbz03qs0r940frx533ls")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xetex-pstricks")
+    (synopsis "Running PSTricks under XeTeX")
+    (description
+     "The package provides an indirection scheme for XeTeX to use the PSTricks
+@file{xdvipdfmx.cfg} configuration file, so that XeTeX documents will load it
+in preference to the standard pstricks.con configuration file.  With this
+configuration, many PSTricks features can be used in XeLaTeX or plain XeTeX
+documents.")
+    (license license:public-domain)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From f07a9e22bdafe8fb71f2d5e50a32533ce6b257a1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:57:11 +0200
Subject: gnu: Add texlive-xetex-tibetan.

* gnu/packages/tex.scm (texlive-xetex-tibetan): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4e4eba1219..1b7d37d5c9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7442,6 +7442,25 @@ configuration, many PSTricks features can be used in XeLaTeX or plain XeTeX
 documents.")
     (license license:public-domain)))
 
+(define-public texlive-xetex-tibetan
+  (package
+    (name "texlive-xetex-tibetan")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xetex/xetex-tibetan/"
+                   "fonts/misc/xetex/fontmapping/xetex-tibetan/")
+             (base32
+              "02z3jzf16hi9zj50lpf9map5f6ydvxw66f0k4n5ry88s7frbxwmw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xetex-tibetan")
+    (synopsis "XeTeX input maps for Unicode Tibetan")
+    (description
+     "The package provides a map for use with Jonathan Kew's TECkit, to
+translate Tibetan to Unicode (range 0F00-0FFF).")
+    (license license:lppl)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From 7af6070ecd26a8b0eda75f2bbd8913c77de3fa0f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:57:29 +0200
Subject: gnu: Add texlive-xetexfontinfo.

* gnu/packages/tex.scm (texlive-xetexfontinfo): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1b7d37d5c9..4492ab8ec0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7461,6 +7461,25 @@ documents.")
 translate Tibetan to Unicode (range 0F00-0FFF).")
     (license license:lppl)))
 
+(define-public texlive-xetexfontinfo
+  (package
+    (name "texlive-xetexfontinfo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xetex/xetexfontinfo/"
+                   "tex/xetex/xetexfontinfo/")
+             (base32
+              "0x1llikcvwlf74anmvaks73gvd99xha9dg49zh75dwki0nwisn2j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xetexfontinfo")
+    (synopsis "Report font features in XeTeX")
+    (description
+     "This package provides a pair of documents to reveal the font features
+supported by fonts usable in XeTeX.")
+    (license license:asl2.0)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From 3e09a00e3099548129c881ef8c9eeb7100810c06 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:57:47 +0200
Subject: gnu: Add texlive-xetexko.

* gnu/packages/tex.scm (texlive-xetexko): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4492ab8ec0..0132640f43 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7480,6 +7480,25 @@ translate Tibetan to Unicode (range 0F00-0FFF).")
 supported by fonts usable in XeTeX.")
     (license license:asl2.0)))
 
+(define-public texlive-xetexko
+  (package
+    (name "texlive-xetexko")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xetex/xetexko/" "tex/xetex/xetexko/")
+             (base32
+              "1jp5caxnyjf5fnndszaqpzsgcm2rhk5iapnpf1ca6mvxbnpf1x5l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xetexko")
+    (synopsis "Typeset Korean with Xe(La)TeX")
+    (description
+     "The package supports typesetting Korean documents (including old Hangul
+texts), using XeTeX.  It enhances the existing support, in XeTeX, providing
+features that provide quality typesetting.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From 05dbdd6244182441704de602f210d7ea3b5da837 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:58:04 +0200
Subject: gnu: Add texlive-xevlna.

* gnu/packages/tex.scm (texlive-xevlna): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0132640f43..33b4fbd9f3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7499,6 +7499,25 @@ texts), using XeTeX.  It enhances the existing support, in XeTeX, providing
 features that provide quality typesetting.")
     (license license:lppl1.3c)))
 
+(define-public texlive-xevlna
+  (package
+    (name "texlive-xevlna")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/xevlna/" "tex/xelatex/xevlna/")
+             (base32
+              "0gwh1rd5s01rnb11nxk6nxwyqj32bi739p10hwqz3sw1hfy8mnfi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xevlna")
+    (synopsis "Insert non-breakable spaces using XeTeX")
+    (description
+     "The package will directly insert nonbreakable spaces (in Czech, vlna or
+vlnka), after nonsyllabic prepositions and single letter conjuctions, while
+the document is being typeset.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-currfile
   (package
     (name "texlive-currfile")
-- 
cgit 1.4.1


From e6a2dbd35b3547220c21cce1da597fff3242d52a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:58:27 +0200
Subject: gnu: Add texlive-zbmath-review-template.

* gnu/packages/tex.scm (texlive-zbmath-review-template): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 33b4fbd9f3..a23c996d43 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9073,6 +9073,26 @@ Adobe's basic set.")
     ;; No license version specified.
     (license license:gpl3+)))
 
+(define-public texlive-zbmath-review-template
+  (package
+    (name "texlive-zbmath-review-template")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/zbmath-review-template/"
+                   "tex/xelatex/zbmath-review-template/")
+             (base32
+              "1m5q03vjscla4wmy9fr3kl23pk8zmqw760i89zg62pj4np8vyplj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/zbmath-review-template")
+    (synopsis "Template for a zbMATH Open review")
+    (description
+     "This package contains a template for zbMATH Open reviews.  It will show
+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-zhspacing
   (package
     (name "texlive-zhspacing")
-- 
cgit 1.4.1


From 0561616a3208aa17fe5b1f9c425c44fe00218b08 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 19 Jun 2023 15:58:57 +0200
Subject: gnu: Add texlive-collection-xetex.

* gnu/packages/tex.scm (texlive-collection-xetex): New variable.
---
 gnu/packages/tex.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a23c996d43..c67c037700 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -14613,6 +14613,63 @@ LaTeX which have widespread use.")
 with packages in @code{collection-basic}.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-collection-xetex
+  (package
+    (name "texlive-collection-xetex")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-arabxetex
+           texlive-awesomebox
+           texlive-bidi-atbegshi
+           texlive-bidicontour
+           texlive-bidipagegrid
+           texlive-bidipresentation
+           texlive-bidishadowtext
+           texlive-businesscard-qrcode
+           texlive-collection-basic
+           texlive-cqubeamer
+           texlive-fixlatvian
+           texlive-font-change-xetex
+           texlive-fontbook
+           texlive-fontwrap
+           texlive-interchar
+           texlive-na-position
+           texlive-philokalia
+           texlive-ptext
+           texlive-realscripts
+           texlive-simple-resume-cv
+           texlive-simple-thesis-dissertation
+           texlive-tetragonos
+           texlive-ucharclasses
+           texlive-unicode-bidi
+           texlive-unimath-plain-xetex
+           texlive-unisugar
+           texlive-xebaposter
+           texlive-xechangebar
+           texlive-xecolor
+           texlive-xecyr
+           texlive-xeindex
+           texlive-xesearch
+           texlive-xespotcolor
+           texlive-xetex
+           texlive-xetex-itrans
+           texlive-xetex-pstricks
+           texlive-xetex-tibetan
+           texlive-xetexconfig
+           texlive-xetexfontinfo
+           texlive-xetexko
+           texlive-xevlna
+           texlive-zbmath-review-template))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "XeTeX and packages")
+    (description
+     "This collection includes packages for XeTeX, the Unicode and
+OpenType-enabled TeX by Jonathan Kew.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-grfext
   (package
     (name "texlive-grfext")
-- 
cgit 1.4.1


From 19fd1004138b60c4479d7516aa0cee261c0b6b57 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 12:00:51 +0200
Subject: gnu: Externalize libkpathsea in texlive and texlive-bin.

* gnu/packages/tex.scm (texlive-libkpathsea): New variable.
(texlive-bin): Inherit from above.
[arguments]<#:configure-flags>: Use "--disable-kpathsea",
"--with-system-kpathsea", "--with-kpathsea-includes" and
"--with-kpathsea-lib".
<#:phases>: Remove phases now handled by the package above.
[native-inputs]: Add GROFF-MINIMAL.
[propagated-inputs]: Add TEXLIVE-LIBKPATHSEA.
(texlive-bin-full): New variable.
(texlive-texmf)[build-system]: Use COPY-BUILD-SYSTEM.
[arguments]: Set #:INSTALL-PLAN accordingly.  Replace TEXLIVE-BIN with
TEXLIVE-BIN-FULL.
* guix/profiles.scm (texlive-font-maps): Fetch executables from
TEXLIVE-LIBKPATHSEA instead of TEXLIVE-BIN.
---
 gnu/packages/tex.scm | 557 +++++++++++++++++++++++++++++++--------------------
 guix/profiles.scm    |  10 +-
 2 files changed, 350 insertions(+), 217 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c67c037700..e6ad2746aa 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -77,6 +77,7 @@
   #:use-module (gnu packages gd)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages groff)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
@@ -108,6 +109,96 @@
   (define-deprecated/public old-name name
     (deprecated-package (symbol->string 'old-name) name)))
 
+(define-public texlive-libkpathsea
+  (package
+    (name "texlive-libkpathsea")
+    (version "20230313")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "ftp://tug.org/historic/systems/texlive/"
+                           (string-take version 4)
+                           "/texlive-" version "-source.tar.xz"))
+       (sha256
+        (base32
+         "1fbrkv7g9j6ipmwjx27l8l9l974rmply8bhf7c2iqc6h3q7aly1q"))
+       (modules '((guix build utils)
+                  (ice-9 ftw)))
+       (snippet
+        #~(begin
+            (with-directory-excursion "libs"
+              (for-each
+               delete-file-recursively
+               (scandir "."
+                        (lambda (file)
+                          (and (not (member file '("." "..")))
+                               (eq? 'directory (stat:type (stat file))))))))
+            (with-directory-excursion "texk"
+              (let ((preserved-directories '("." ".." "kpathsea")))
+                (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)
+    (arguments
+     (list
+      #:out-of-source? #t
+      #:configure-flags
+      #~(list "--disable-static"
+              "--disable-native-texlive-build"
+              "--enable-shared"
+              "--with-banner-add=/GNU Guix"
+              "--disable-all-pkgs"
+              "--enable-kpathsea")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'customize-texmf.cnf
+            ;; The default "texmf.cnf" file is provided by this package.
+            ;; Every variable of interest is set relatively to the GUIX_TEXMF
+            ;; environment variable defined via a search path below.
+            ;;
+            ;; This phase must happen before the `configure' phase, because
+            ;; the value of the TEXMFCNF variable (modified along with the
+            ;; SELFAUTOLOC reference below) is used at compile time to
+            ;; generate "paths.h" file.
+            (lambda _
+              (substitute* "texk/kpathsea/texmf.cnf"
+                (("^TEXMFROOT = .*")
+                 "TEXMFROOT = {$GUIX_TEXMF}/..\n")
+                (("^TEXMF = .*")
+                 "TEXMF = {$GUIX_TEXMF}\n")
+                (("\\$SELFAUTOLOC(/share/texmf-dist/web2c)" _ suffix)
+                 (string-append #$output suffix))
+                ;; Don't truncate lines.
+                (("^error_line = .*$") "error_line = 254\n")
+                (("^half_error_line = .*$") "half_error_line = 238\n")
+                (("^max_print_line = .*$") "max_print_line = 1000\n"))))
+          (add-after 'unpack 'patch-directory-traversal
+            ;; When ST_NLINK_TRICK is set, kpathsea attempts to avoid work
+            ;; when searching files by assuming that a directory with exactly
+            ;; two links has no subdirectories.  This assumption does not hold
+            ;; in our case, so some directories with symlinked sub-directories
+            ;; would not be traversed.
+            (lambda _
+              (substitute* "texk/kpathsea/config.h"
+                (("#define ST_NLINK_TRICK") ""))))
+          (add-after 'install 'post-install
+            (lambda _
+              (with-directory-excursion "texk/kpathsea"
+                (invoke "make" "install")))))))
+    (native-search-paths
+     (list (search-path-specification
+            (variable "GUIX_TEXMF")
+            (files '("share/texmf-dist")))))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Path searching library")
+    (description
+     "Kpathsea is a library whose purpose is to return a filename from a list
+of user-specified directories similar to how shells look up executables.")
+    (license license:lgpl2.1)))
+
 (define-public texlive-scripts
   (package
     (name "texlive-scripts")
@@ -473,20 +564,11 @@ and should be preferred to it whenever a package would otherwise depend on
 (define-deprecated-package texlive-ukrhyph texlive-hyphen-complete)
 
 (define-public texlive-bin
-  (package
+  (package/inherit texlive-libkpathsea
     (name "texlive-bin")
-    (version "20230313")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "ftp://tug.org/historic/systems/texlive/"
-                           (string-take version 4)
-                           "/texlive-" version "-source.tar.xz"))
-       (sha256
-        (base32
-         "1fbrkv7g9j6ipmwjx27l8l9l974rmply8bhf7c2iqc6h3q7aly1q"))
-       (modules '((guix build utils)
-                  (ice-9 ftw)))
+       (inherit (package-source texlive-libkpathsea))
        (snippet
         ;; TODO: Unbundle stuff in texk/dvisvgm/dvisvgm-src/libs too.
         #~(with-directory-excursion "libs"
@@ -498,36 +580,8 @@ and should be preferred to it whenever a package would otherwise depend on
                         (scandir "."
                                  (lambda (file)
                                    (and (not (member file preserved-directories))
-                                        (eq? 'directory (stat:type (stat file))))))))))))
-    (build-system gnu-build-system)
-    (native-inputs (list pkg-config))
-    (inputs
-     (list config
-           cairo
-           fontconfig
-           fontforge
-           freetype
-           gd
-           gmp
-           ghostscript
-           graphite2
-           harfbuzz
-           icu4c
-           libpaper
-           libpng
-           libxaw
-           libxt
-           mpfr
-           perl
-           pixman
-           potrace
-           python
-           ruby-2.7
-           tcsh
-           teckit
-           zlib
-           zziplib))
-    (propagated-inputs (list texlive-scripts))
+                                        (eq? 'directory
+                                             (stat:type (stat file))))))))))))
     (arguments
      (list
       #:modules '((guix build gnu-build-system)
@@ -538,36 +592,41 @@ and should be preferred to it whenever a package would otherwise depend on
       #:out-of-source? #t
       #:parallel-tests? #f              ;bibtex8.test fails otherwise
       #:configure-flags
-      #~(list "--disable-static"
-              ;; "Linked scripts" are taken care of in their respective
-              ;; packages.
-              "--disable-linked-scripts"
-              "--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-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"
-              ;; LuaJIT is not ported to some architectures yet.
-              #$@(if (or (target-ppc64le?)
-                         (target-riscv64?))
-                     '("--disable-luajittex"
-                       "--disable-luajithbtex"
-                       "--disable-mfluajit")
-                     '()))
+      #~(let ((kpathsea #$(this-package-input "texlive-libkpathsea")))
+          (list "--with-banner-add=/GNU Guix"
+                "--enable-shared"
+                "--disable-native-texlive-build"
+                "--disable-static"
+                "--disable-linked-scripts"
+                "--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")
+                       '())))
       ;; Disable tests on some architectures to cope with a failure of
       ;; luajiterr.test.
       ;;
@@ -579,6 +638,14 @@ and should be preferred to it whenever a package would otherwise depend on
                           (string-prefix? "powerpc64le" s))))
       #:phases
       #~(modify-phases %standard-phases
+          (add-after 'unpack 'locate-external-kpathsea
+            ;; Despite our best efforts, the configure scripts below is not
+            ;; able to find external kpathsea.
+            (lambda _
+              (substitute* "texk/web2c/configure"
+                (("/usr/include /usr/local/include")
+                 (string-append #$(this-package-input "texlive-libkpathsea")
+                                "/include")))))
           (add-after 'unpack 'patch-psutils-test
             (lambda _
               ;; This test fails due to a rounding difference with libpaper
@@ -621,15 +688,6 @@ and should be preferred to it whenever a package would otherwise depend on
                          (("srcdir/tests/pprecA-0.ind pprecA-0.ind1 \\|\\| exit 1")
                           "srcdir/tests/pprecA-0.ind pprecA-0.ind1 || exit 77")))))
                  '())
-          ;; When ST_NLINK_TRICK is set, kpathsea attempts to avoid work when
-          ;; searching files by assuming that a directory with exactly two
-          ;; links has no subdirectories.  This assumption does not hold in our
-          ;; case, so some directories with symlinked subdirectories would not
-          ;; be traversed.
-          (add-after 'unpack 'patch-directory-traversal
-            (lambda _
-              (substitute* "texk/kpathsea/config.h"
-                (("#define ST_NLINK_TRICK") ""))))
           #$@(if (target-arm32?)
                  `((add-after 'unpack 'skip-faulty-test
                      (lambda _
@@ -640,31 +698,6 @@ and should be preferred to it whenever a package would otherwise depend on
                          (("^TEXMFCNF=" all)
                           (string-append "exit 77 # skip\n" all))))))
                  '())
-          (add-after 'check 'customize-texmf.cnf
-            ;; The default texmf.cnf is provided by this package, texlive-bin.
-            ;; Every variable of interest is set relatively to the GUIX_TEXMF
-            ;; environment variable defined via a search path specification
-            ;; further below.  The configuration file is patched after the test
-            ;; suite has run, as it relies on the default configuration to find
-            ;; its paths (and the GUIX_TEXMF variable isn't set yet).
-            (lambda _
-              ;; The current directory is build/ because of the out-of-tree
-              ;; build.
-              (let* ((source    (first (scandir ".." (cut string-suffix?
-                                                          "source" <>))))
-                     (texmf.cnf (string-append "../" source
-                                               "/texk/kpathsea/texmf.cnf")))
-                (substitute* texmf.cnf
-                  (("^TEXMFROOT = .*")
-                   "TEXMFROOT = {$GUIX_TEXMF}/..\n")
-                  (("^TEXMF = .*")
-                   "TEXMF = {$GUIX_TEXMF}\n")
-                  (("^%TEXMFCNF = .*")
-                   "TEXMFCNF = {$GUIX_TEXMF}/web2c\n")
-                  ;; Don't truncate lines.
-                  (("^error_line = .*$") "error_line = 254\n")
-                  (("^half_error_line = .*$") "half_error_line = 238\n")
-                  (("^max_print_line = .*$") "max_print_line = 1000\n")))))
           (add-after 'install 'post-install
             (lambda _
               ;; Create symbolic links for the latex variants.  We link
@@ -680,10 +713,34 @@ and should be preferred to it whenever a package would otherwise depend on
                       (string-append (getenv "PATH") ":" #$output "/bin"))
               (with-directory-excursion #$output
                 (assoc-ref %standard-phases 'patch-source-shebangs)))))))
-    (native-search-paths
-     (list (search-path-specification
-            (variable "GUIX_TEXMF")
-            (files '("share/texmf-dist")))))
+    (native-inputs (list groff-minimal pkg-config))
+    (inputs
+     (list cairo
+           config
+           fontconfig
+           fontforge
+           freetype
+           gd
+           ghostscript
+           gmp
+           graphite2
+           harfbuzz
+           icu4c
+           libpaper
+           libpng
+           libxaw
+           libxt
+           mpfr
+           perl
+           pixman
+           potrace
+           python
+           ruby-2.7
+           tcsh
+           teckit
+           zlib
+           zziplib))
+    (propagated-inputs (list texlive-libkpathsea texlive-scripts))
     (synopsis "TeX Live, a package of the TeX typesetting system")
     (description
      "TeX Live provides a comprehensive TeX document production system.
@@ -910,40 +967,6 @@ right to left and left to right modes.")
 a re-implementation of the @code{shadowtext} package adding Bidi support.")
     (license license:lppl1.3+)))
 
-(define-public texlive-libkpathsea
-  (package/inherit texlive-bin
-    (name "texlive-libkpathsea")
-    (source
-     (origin
-       (inherit (package-source texlive-bin))
-       (snippet
-        `(begin
-           ,(origin-snippet (package-source texlive-bin))
-           (with-directory-excursion "texk"
-             (let ((preserved-directories '("." ".." "kpathsea")))
-               (for-each
-                delete-file-recursively
-                (scandir "."
-                         (lambda (file)
-                           (and (not (member file preserved-directories))
-                                (eq? 'directory (stat:type (stat file)))))))))))))
-    (arguments
-     (substitute-keyword-arguments (package-arguments texlive-bin)
-       ((#:configure-flags flags)
-        `(cons* "--disable-all-pkgs" "--enable-kpathsea"
-                "--enable-shared" ,flags))
-       ((#:phases phases)
-        `(modify-phases %standard-phases
-           (add-after 'install 'post-install
-             (lambda* (#:key inputs outputs #:allow-other-keys)
-               (with-directory-excursion "texk/kpathsea"
-                 (invoke "make" "install"))))))))
-    (inputs '())
-    (synopsis "Path searching library")
-    (description "kpathsea is a library, whose purpose is to return a filename
-from a list of user-specified directories similar to how shells look up
-executables.  It is maintained as a part of TeX Live.")))
-
 (define-public texlive-alphalph
   (package
     (name "texlive-alphalph")
@@ -10358,6 +10381,133 @@ 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")
@@ -10370,71 +10520,55 @@ documents as well as DVI output.")
               (sha256
                (base32
                 "0lqjm11pr9vasvivaci3k9xcmdyd08ldnh31zf8avjjs09xcfkac"))))
-    (build-system gnu-build-system)
-    (inputs
-     (list lua
-           perl
-           python
-           ruby
-           tcsh
-           texlive-bin))
+    (build-system copy-build-system)
     (arguments
      (list
-      #:modules '((guix build gnu-build-system)
+      #: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 (map (cut assq <> %standard-phases)
-                            '(set-paths unpack patch-source-shebangs))
-          (add-after 'unpack 'unset-environment-variables
-            (lambda _
-              (unsetenv "TEXMF")
-              (unsetenv "TEXMFCNF")))
-          (add-after 'patch-source-shebangs 'install
-            (lambda _
-              (let ((share (string-append #$output "/share")))
-                (mkdir-p share)
-                (invoke "mv" "texmf-dist" share))))
+      #~(modify-phases %standard-phases
           (add-after 'install 'texmf-config
-            (lambda _
+            (lambda* (#:key inputs native-inputs  #:allow-other-keys)
               (let* ((share (string-append #$output "/share"))
-                     (texmfroot (string-append share "/texmf-dist/web2c"))
-                     (texmfcnf (string-append texmfroot "/texmf.cnf"))
-                     (fmtutilcnf (string-append texmfroot "/fmtutil.cnf"))
-                     (texlive-bin #$(this-package-input "texlive-bin"))
-                     (texbin (string-append texlive-bin "/bin"))
-                     (tlpkg (string-append texlive-bin "/share/tlpkg")))
+                     (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* fmtutilcnf
+                    (substitute* fmtutil.cnf
                       (("^(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")
+                (substitute* (string-append web2c "/texmfcnf.lua")
                   (("selfautodir:") #$output)
                   (("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")))))))
+                        (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
@@ -10453,52 +10587,51 @@ This package contains the complete tree of texmf-dist data.")
     (version (package-version texlive-bin))
     (source #f)
     (build-system trivial-build-system)
-    (inputs
-     (list bash-minimal                 ;for wrap-program
-           texlive-bin
-           texlive-texmf))
-    (native-search-paths
-     (list (search-path-specification
-            (variable "TEXMFLOCAL")
-            (files '("share/texmf-local")))))
     (arguments
      (list
       #:modules '((guix build utils))
       #:builder
-      ;; Build the union of texlive-bin and texlive-texmf, but take the
+      ;; 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"))
-                (texmf #$(this-package-input "texlive-texmf"))
-                (bash #$(this-package-input "bash-minimal")))
+          (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"
-                (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")))))
+                 (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"))
-                (for-each
-                 (lambda (name)
-                   (symlink (string-append texmf "/share/" name) name))
-                 '("texmf-dist" "texmf-var"))))))))
+                (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.
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 35208dd0c9..75ce2b4d08 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1791,8 +1791,8 @@ MANIFEST."
     (append-map entry->texlive-input (manifest-entries manifest)))
   (define texlive-scripts
     (module-ref (resolve-interface '(gnu packages tex)) 'texlive-scripts))
-  (define texlive-bin
-    (module-ref (resolve-interface '(gnu packages tex)) 'texlive-bin))
+  (define texlive-libkpathsea
+    (module-ref (resolve-interface '(gnu packages tex)) 'texlive-libkpathsea))
   (define coreutils
     (module-ref (resolve-interface '(gnu packages base)) 'coreutils))
   (define grep
@@ -1818,8 +1818,8 @@ MANIFEST."
                        #:create-all-directories? #t
                        #:log-port (%make-void-port "w"))
 
-          ;; XXX: This is annoying, but it's necessary because texlive-bin
-          ;; does not provide wrapped executables.
+          ;; XXX: This is annoying, but it's necessary because
+          ;; texlive-libkpathsea does not provide wrapped executables.
           (setenv "PATH"
                   (string-append #$(file-append coreutils "/bin")
                                  ":"
@@ -1827,7 +1827,7 @@ MANIFEST."
                                  ":"
                                  #$(file-append sed "/bin")
                                  ":"
-                                 #$(file-append texlive-bin "/bin")))
+                                 #$(file-append texlive-libkpathsea "/bin")))
           (setenv "PERL5LIB" #$(file-append texlive-scripts "/share/tlpkg"))
           (setenv "GUIX_TEXMF" "/tmp/texlive/share/texmf-dist")
 
-- 
cgit 1.4.1


From 3f8b75b35ca553c46cde34736f57b52aad02af72 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 12:22:32 +0200
Subject: gnu: Remove texlive-default-updmap.cfg.

* gnu/packages/tex.scm (texlive-scripts): Provide "updmap.cfg", along with
other similar files.
(texlive-default-updmap.cfg): Remove variable.
(texlive-updmap.cfg)[source]: Use TEXLIVE-SCRIPTS source.
[arguments]: Use G-expressions.  Adapt #:INSTALL-PLAN according to source change.
* guix/profiles.scm (texlive-font-maps): Use "updmap.cfg" provided by
TEXLIVE-SCRIPTS instead of now defunct TEXLIVE-DEFAULT-UPDMAP.CFG.
---
 gnu/packages/tex.scm | 73 +++++++++++++++++++++++++---------------------------
 guix/profiles.scm    |  9 ++++---
 2 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e6ad2746aa..1efa5f6f4b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -260,6 +260,7 @@ of user-specified directories similar to how shells look up executables.")
                            "texmf-dist/scripts/texlive/updmap.pl"
                            "texmf-dist/web2c/fmtutil-hdr.cnf"
                            "texmf-dist/web2c/updmap-hdr.cfg"
+                           "texmf-dist/web2c/updmap.cfg"
                            "tlpkg/gpg/"
                            "tlpkg/installer/config.guess"
                            "tlpkg/installer/curl/curl-ca-bundle.crt"
@@ -267,7 +268,7 @@ of user-specified directories similar to how shells look up executables.")
                            "tlpkg/texlive.tlpdb"))
                     (revision %texlive-revision)))
               (sha256
-               "191p4rznf19wl9sbjm61v143wap3izhsql6s1bpq1nnbf1p4bakq")))
+               "0sqbg5kjpzkpm1fq2c9hpf4f21bvjs3xas944dlbqp44lsqhcmsk")))
     (outputs '("out" "doc"))
     (build-system copy-build-system)
     (arguments
@@ -4948,13 +4949,6 @@ part of the LaTeX required set of packages.")
 
 (define-deprecated-package texlive-latex-psnfss texlive-psnfss)
 
-(define-public texlive-default-updmap.cfg
-  (texlive-origin
-   "updmap.cfg" (number->string %texlive-revision)
-   (list "web2c/updmap.cfg")
-   (base32
-    "10b9il84x6vwfns7cvf8jv0bfcjr7icph3mhci9cq088v216k3kb")))
-
 (define-public texlive-updmap.cfg
   (lambda* (#:optional (packages '()))
     "Return a 'texlive-updmap.cfg' package which contains the fonts map
@@ -4978,42 +4972,45 @@ configuration of a base set of packages plus PACKAGES."
                   texlive-tools)))
       (package
         (version (number->string %texlive-revision))
-        (source texlive-default-updmap.cfg)
+        (source (package-source texlive-scripts))
         (name "texlive-updmap.cfg")
         (build-system copy-build-system)
         (arguments
-         '(#:modules ((guix build copy-build-system)
+         (list
+          #:modules '((guix build copy-build-system)
                       (guix build utils)
                       (ice-9 popen)
                       (ice-9 textual-ports))
-           #:install-plan '(("web2c/updmap.cfg" "share/texmf-config/web2c/")
-                            ("web2c/map" "share/texmf-dist/fonts/map"))
-           #:phases
-           (modify-phases %standard-phases
-             (add-before 'install 'regenerate-updmap.cfg
-               (lambda _
-                 (with-directory-excursion "web2c"
-                   (make-file-writable "updmap.cfg")
-
-                   ;; Disable unavailable map files.
-                   (let* ((port (open-pipe* OPEN_WRITE "updmap-sys"
-                                            "--syncwithtrees"
-                                            "--nohash"
-                                            "--cnffile" "updmap.cfg")))
-                     (display "Y\n" port)
-                     (when (not (zero? (status:exit-val (close-pipe port))))
-                       (error "failed to filter updmap.cfg")))
-
-                   ;; Set TEXMFSYSVAR to a sane and writable value; updmap fails
-                   ;; if it cannot create its log file there.
-                   (setenv "TEXMFSYSVAR" (getcwd))
-
-                   ;; Generate maps.
-                   (invoke "updmap-sys"
-                           "--cnffile"           "updmap.cfg"
-                           "--dvipdfmxoutputdir" "map/dvipdfmx/updmap/"
-                           "--dvipsoutputdir"    "map/dvips/updmap/"
-                           "--pdftexoutputdir"   "map/pdftex/updmap/")))))))
+          #:install-plan
+          #~'(("texmf-dist/web2c/updmap.cfg" "share/texmf-config/web2c/")
+              ("texmf-dist/web2c/map" "share/texmf-dist/fonts/map"))
+          #:phases
+          #~(modify-phases %standard-phases
+              (add-before 'install 'regenerate-updmap.cfg
+                (lambda _
+                  (with-directory-excursion "texmf-dist/web2c"
+                    (make-file-writable "updmap.cfg")
+
+                    ;; Disable unavailable map files.
+                    (let* ((port (open-pipe* OPEN_WRITE "updmap-sys"
+                                             "--syncwithtrees"
+                                             "--nohash"
+                                             "--cnffile" "updmap.cfg")))
+                      (display "Y\n" port)
+                      (when (not (zero? (status:exit-val (close-pipe port))))
+                        (error "failed to filter updmap.cfg")))
+
+                    ;; Set TEXMFSYSVAR to a sane and writable value; updmap fails
+                    ;; if it cannot create its log file there.
+                    (setenv "TEXMFSYSVAR" (getcwd))
+
+                    ;; Generate maps.
+                    (invoke "updmap-sys"
+                            "--cnffile"           "updmap.cfg"
+                            "--dvipdfmxoutputdir" "map/dvipdfmx/updmap/"
+                            "--dvipsoutputdir"    "map/dvips/updmap/"
+                            "--pdftexoutputdir"   "map/pdftex/updmap/")))))))
+        (native-inputs (list texlive-scripts))
         (propagated-inputs (map (lambda (package)
                                   (list (package-name package) package))
                                 (append default-packages packages)))
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 75ce2b4d08..d0006dc2bf 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1799,9 +1799,6 @@ MANIFEST."
     (module-ref (resolve-interface '(gnu packages base)) 'grep))
   (define sed
     (module-ref (resolve-interface '(gnu packages base)) 'sed))
-  (define updmap.cfg
-    (module-ref (resolve-interface '(gnu packages tex))
-                'texlive-default-updmap.cfg))
   (define build
     (with-imported-modules '((guix build utils)
                              (guix build union))
@@ -1835,7 +1832,9 @@ MANIFEST."
           (let* ((web2c (string-append #$output "/share/texmf-dist/web2c/"))
                  (maproot (string-append #$output "/share/texmf-dist/fonts/map/"))
                  (updmap.cfg (string-append web2c "updmap.cfg")))
-            (install-file #$(file-append updmap.cfg "/web2c/updmap.cfg") web2c)
+            (install-file #$(file-append texlive-scripts
+                                         "/share/texmf-dist/web2c/updmap.cfg")
+                          web2c)
             (make-file-writable updmap.cfg)
             (let* ((port (open-pipe* OPEN_WRITE
                                      #$(file-append texlive-scripts "/bin/updmap-sys")
@@ -1867,6 +1866,8 @@ MANIFEST."
             (let ((a (string-append #$output "/share/texmf-dist"))
                   (b "/tmp/texlive/share/texmf-dist")
                   (mktexlsr #$(file-append texlive-scripts "/bin/mktexlsr")))
+              ;; Ignore original "updmap.cfg" from texlive-scripts input.
+              (delete-file "/tmp/texlive/share/texmf-dist/web2c/updmap.cfg")
               (copy-recursively a b)
               (invoke mktexlsr b)
               (install-file (string-append b "/ls-R") a))))))
-- 
cgit 1.4.1


From 7977913c25205d3efa1fde1f14263cdd0ee3f13f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:22:58 +0200
Subject: gnu: Add texlive-addliga.

* gnu/packages/tex.scm (texlive-addliga): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1efa5f6f4b..5b6ee015cc 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -14819,6 +14819,26 @@ OpenType-enabled TeX by Jonathan Kew.")
 graphics file extensions recognised by package @code{graphics}.")
     (license license:lppl1.3c+)))
 
+(define-public texlive-addliga
+  (package
+    (name "texlive-addliga")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/addliga/"
+                   "tex/lualatex/addliga/")
+             (base32
+              "1gbdbwskba1rf3bmvwms3i3crj3dcqqg69wdzfdyy1a6ml05qpc7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/addliga")
+    (synopsis "Access basic ligatures in legacy TrueType fonts")
+    (description
+     "This small and simple package allows LuaLaTeX users to access basic
+ligatures (ff, fi, ffi, fl, ffl) in legacy TrueType fonts (those
+lacking a liga table) accessed via @code{fontspec}.")
+    (license license:public-domain)))
+
 (define-public texlive-adjustbox
   (package
     (name "texlive-adjustbox")
-- 
cgit 1.4.1


From dcff8457b1244610ef7773cdf8672d41cf2d73ce Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:23:36 +0200
Subject: gnu: Add texlive-auto-pst-pdf-lua.

* gnu/packages/tex.scm (texlive-auto-pst-pdf-lua): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5b6ee015cc..b44bcc91f6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -14868,6 +14868,28 @@ provided box macros are @code{\\lapbox}, @code{\\marginbox},
 @code{\\minsizebox}, @code{\\maxsizebox} and @code{\\phantombox}.")
     (license license:lppl1.3+)))
 
+(define-public texlive-auto-pst-pdf-lua
+  (package
+    (name "texlive-auto-pst-pdf-lua")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/auto-pst-pdf-lua/"
+                   "tex/latex/auto-pst-pdf-lua/")
+             (base32
+              "1wkhdg47qjpc0yv47z1jmrmpnq8zic6bqfmay3ry6lvv47f775z1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-iftex))
+    (home-page "https://ctan.org/pkg/auto-pst-pdf-lua")
+    (synopsis "Using LuaLaTeX together with PostScript code")
+    (description
+     "This package is a slightly modified version of @code{auto-pst-pdf} by
+Will Robertson, which itself is a wrapper for @code{pst-pdf} by Rolf
+Niepraschk.  The package allows the use of LuaLaTeX together with PostScript
+related code, e.g., PSTricks.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-qrcode
   (package
     (name "texlive-qrcode")
-- 
cgit 1.4.1


From 463710da2352c6225ca834e98ddd878e2e945066 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:23:52 +0200
Subject: gnu: Add texlive-barracuda.

* gnu/packages/tex.scm (texlive-barracuda): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b44bcc91f6..039834d31f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -14890,6 +14890,27 @@ Niepraschk.  The package allows the use of LuaLaTeX together with PostScript
 related code, e.g., PSTricks.")
     (license license:lppl1.3c)))
 
+(define-public texlive-barracuda
+  (package
+    (name "texlive-barracuda")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/barracuda/" "scripts/barracuda/"
+                   "tex/luatex/barracuda/")
+             (base32
+              "1v318nbbbp2klp0rykzb3skqqw4hhj1hbliigmp3qh34iiq3wqh0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/barracuda")
+    (synopsis "Draw barcodes with Lua")
+    (description
+     "The Barracuda library is a modular Lua package for drawing barcode
+symbols.  It provides modules for writing barcodes from a LuaTeX document.  It
+is also possible to use Barracuda with a standalone Lua interpreter to draw
+barcodes in different graphic formats like SVG.")
+    (license license:gpl2)))
+
 (define-public texlive-qrcode
   (package
     (name "texlive-qrcode")
-- 
cgit 1.4.1


From 4133c2d38633c828d2e0f138dab5fd3bb1e0674a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:24:16 +0200
Subject: gnu: Add texlive-bezierplot.

* gnu/packages/tex.scm (texlive-bezierplot): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 039834d31f..ec6e5d7516 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -14911,6 +14911,30 @@ is also possible to use Barracuda with a standalone Lua interpreter to draw
 barcodes in different graphic formats like SVG.")
     (license license:gpl2)))
 
+(define-public texlive-bezierplot
+  (package
+    (name "texlive-bezierplot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/bezierplot/"
+                   "tex/lualatex/bezierplot/")
+             (base32
+              "125gdb9d160g729v3fbsrsrw5abk34jwa4x43yil0mzjls2aq550")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bezierplot")
+    (synopsis "Approximate smooth function graphs with cubic Bezier splines")
+    (description
+     "This package consists of a Lua program as well as a (Lua)LaTeX
+@file{.sty} file.  Given a smooth function, @code{bezierplot} returns a smooth
+Bezier path written in TikZ notation, which also matches MetaPost, that
+approximates the graph of the function.  For polynomial functions of degree
+lesser or equal to 3 and their inverses the approximation is exact (up to
+numeric precision).  @code{bezierplot} also finds special points such as
+extreme points and inflection points and reduces the number of used points.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-qrcode
   (package
     (name "texlive-qrcode")
-- 
cgit 1.4.1


From c288e1cc95bcc416c062db47c1af50cb5d6eb915 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:24:35 +0200
Subject: gnu: Add texlive-gates.

* gnu/packages/tex.scm (texlive-gates): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ec6e5d7516..bfdb11e96b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -14935,6 +14935,34 @@ numeric precision).  @code{bezierplot} also finds special points such as
 extreme points and inflection points and reduces the number of used points.")
     (license license:lppl1.3c)))
 
+(define-public texlive-gates
+  (package
+    (name "texlive-gates")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/gates/" "tex/generic/gates/")
+             (base32
+              "0brcms8qbnsyiqnnqxyzqp12z1xpvfzb5hgh6kqm28904lr84i4g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gates")
+    (synopsis "Support for writing modular and customisable code")
+    (description
+     "The package provides the means of writing code in a modular fashion: big
+macros or functions are divided into small chunks (called gates) with names,
+which can be externally controlled (e.g., they can be disabled, subjected to
+conditionals, loops...) and/or augmented with new chunks.  Thus complex code
+may easily be customised without having to rewrite it, or even understand its
+implementation: the behavior of existing gates can be modified, and new ones
+can be added, without endangering the whole design.  This allows code to be
+hacked in ways the original authors might have never envisioned.  The
+@code{gates} package is implemented independently for both TeX and Lua.  The
+TeX implementation, running in any current environment, requires the
+@code{texapi} package, whereas the Lua version can be run with any Lua
+interpreter, not just LuaTeX.")
+    (license license:lppl)))
+
 (define-public texlive-qrcode
   (package
     (name "texlive-qrcode")
-- 
cgit 1.4.1


From aa11f73eebc607938ab02e46564a3d3bc817ef87 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:25:20 +0200
Subject: gnu: Add texlive-texapi.

* gnu/packages/tex.scm (texlive-texapi): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bfdb11e96b..a633ddbc71 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -15221,6 +15221,27 @@ This package is not intended to be used to automatically translate more than
 a few words.")
     (license (list license:lppl license:gpl1+))))
 
+(define-public texlive-texapi
+  (package
+    (name "texlive-texapi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/texapi/" "tex/generic/texapi/")
+             (base32
+              "0ivg2a2pgl6bmb2242cjjcz7n9cs514dp1r8c89mva2zlm9l323j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/texapi")
+    (synopsis "Macros to write format-independent packages")
+    (description
+     "Texapi provides utility macros to write format-independent (and -aware)
+packages.  It is similar in spirit to the etoolbox, except that it isn't tied
+to LaTeX.  The tools include engine and format detection, expansion control,
+command definition and manipulation, various testing macros, string
+operations, and highly customizable while and for loops.")
+    (license license:lppl)))
+
 (define-public texlive-textpos
   (package
     (name "texlive-textpos")
-- 
cgit 1.4.1


From a8308aa4187b03c4db05a8558b1840f6953b3f50 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:25:48 +0200
Subject: gnu: Add texlive-yax.

* gnu/packages/tex.scm (texlive-yax): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a633ddbc71..f597b36c9f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12996,6 +12996,29 @@ standards-compliant PDF documents with pdfTeX, LuaTeX and XeTeX.")
 
 (define-deprecated-package texlive-latex-pdfx texlive-pdfx)
 
+(define-public texlive-yax
+  (package
+    (name "texlive-yax")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/yax/" "tex/generic/yax/")
+             (base32
+              "01hv550qkmxw63m41v4qykfiracvzvjwxk49y6fc6abg89hfvsj6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/yax")
+    (synopsis "Yet Another Key System")
+    (description
+     "YaX is advertised as a key system, but it rather organizes attributes in
+parameters, which parameters can be executed, so that YaX is halfway between
+key management and macro definition (and actually hopes to provide a user's
+interface).  Values assigned to attributes can be retrieved and tested in
+various ways, with full expandability ensured as much as possible.  Finally,
+YaX's syntax is a quite peculiar (as few braces as possible), but may be
+customized.")
+    (license license:lppl)))
+
 (define-public texlive-ydoc
   (package
     (name "texlive-ydoc")
-- 
cgit 1.4.1


From da0b9e4f92bf3734c137bcb915b64bc35b46d92a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:26:07 +0200
Subject: gnu: Add texlive-blopentype.

* gnu/packages/tex.scm (texlive-blopentype): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f597b36c9f..f0a3951026 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4498,6 +4498,26 @@ diagrams and bond graphs. While the task is not itself difficult to program,
 it is felt that many users will be happy to have a library for the job.")
     (license license:lppl)))
 
+(define-public texlive-blopentype
+  (package
+    (name "texlive-blopentype")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/blopentype/"
+                   "tex/luatex/blopentype/")
+             (base32
+              "1zz19a0glxad0bq8kpa2qlrmgysdlda1hpxacf3m42m9n3byrb75")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-gates texlive-texapi texlive-yax))
+    (home-page "https://ctan.org/pkg/blopentype")
+    (synopsis "Basic LuaTeX OpenType handler")
+    (description
+     "This is a basic LuaTeX OpenType handler, based on Paul Isambert's PiTeX
+code.")
+    (license (list license:lppl1.3c license:expat))))
+
 (define-public texlive-bookcover
   (package
     (name "texlive-bookcover")
-- 
cgit 1.4.1


From b2525ab75ee7d90cada226d109fc992d77346513 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:26:43 +0200
Subject: gnu: Add texlive-checkcites.

* gnu/packages/tex.scm (texlive-checkcites): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f0a3951026..10bcc1ff3a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8360,6 +8360,26 @@ drivers, and VTeX and pdfTeX.")
 
 (define-deprecated-package texlive-latex-changebar texlive-changebar)
 
+(define-public texlive-checkcites
+  (package
+    (name "texlive-checkcites")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/checkcites/"
+                   "scripts/checkcites/")
+             (base32
+              "0zfghyyq86xrbnb9bzl7z1p96s0n255b39v2srqslb2z37ppvjyz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/checkcites")
+    (synopsis "Check citation commands in a document")
+    (description
+     "The package provides a Lua script written for the sole purpose of
+detecting undefined and unused references from LaTeX auxiliary or bibliography
+files.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-cmap
   (package
     (name "texlive-cmap")
-- 
cgit 1.4.1


From 2f0023b2c0e851254efe480439eaf8f5c49c1336 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:28:03 +0200
Subject: gnu: Add texlive-chickenize.

* gnu/packages/tex.scm (texlive-chickenize): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 10bcc1ff3a..2a2c5231f9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8380,6 +8380,29 @@ detecting undefined and unused references from LaTeX auxiliary or bibliography
 files.")
     (license license:lppl1.3+)))
 
+(define-public texlive-chickenize
+  (package
+    (name "texlive-chickenize")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/chickenize/"
+                   "source/luatex/chickenize/"
+                   "tex/luatex/chickenize/")
+             (base32
+              "055lkxc2igr0qh1lcdbnh2w0z92v3wkjgp1hpbbrj8r5kvpm7nvy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chickenize")
+    (synopsis "Use Lua callbacks for some textual effects")
+    (description
+     "The package allows manipulations of any LuaTeX document.  Most of the
+package's functions are merely for fun or educational use, but some
+functions (for example, @code{colorstretch} for visualising the badness and
+font expansion of each line, and @code{letterspaceadjust} doing what its name
+says) could be useful in a normal LuaTeX document.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-cmap
   (package
     (name "texlive-cmap")
-- 
cgit 1.4.1


From a0d0dbc56b257d390b8c472f2c201b389df9ca3e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:28:18 +0200
Subject: gnu: Add texlive-chinese-jfm.

* gnu/packages/tex.scm (texlive-chinese-jfm): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2a2c5231f9..5fe8dcde6c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8403,6 +8403,27 @@ font expansion of each line, and @code{letterspaceadjust} doing what its name
 says) could be useful in a normal LuaTeX document.")
     (license license:lppl1.3+)))
 
+(define-public texlive-chinese-jfm
+  (package
+    (name "texlive-chinese-jfm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/chinese-jfm/"
+                   "tex/luatex/chinese-jfm/")
+             (base32
+              "0ixlwivijp6vvzn2j3drr13hk0ylslcd9ws8df24abda93wjm35r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chinese-jfm")
+    (synopsis "Luatexja-jfm files for Chinese typesetting")
+    (description
+     "ChineseJFM is a series of @code{luatexja-jfm} files for better Chinese
+typesetting, providing @code{quanjiao}, @code{banjiao}, and @code{kaiming}
+three styles and other fancy features.  It can be used for both horizontal and
+vertical writing mode in Simplified/Traditional Chinese or Japanese fonts.")
+    (license license:expat)))
+
 (define-public texlive-cmap
   (package
     (name "texlive-cmap")
-- 
cgit 1.4.1


From 3d47f2c1511da9a3dbf6f1007f4a30f4193a8e9a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:28:31 +0200
Subject: gnu: Add texlive-cloze.

* gnu/packages/tex.scm (texlive-cloze): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5fe8dcde6c..a60dc62f7c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8424,6 +8424,26 @@ three styles and other fancy features.  It can be used for both horizontal and
 vertical writing mode in Simplified/Traditional Chinese or Japanese fonts.")
     (license license:expat)))
 
+(define-public texlive-cloze
+  (package
+    (name "texlive-cloze")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/cloze/" "scripts/cloze/"
+                   "source/luatex/cloze/" "tex/luatex/cloze/")
+             (base32
+              "0i0bsflqgw14bik1r8qlx2287fx6lv8jmha57bx54d7icaswssf9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cloze")
+    (synopsis "Lualatex package for creating cloze texts")
+    (description
+     "This is a LuaTeX or LuaLaTeX package for generating cloze texts.  The
+main feature of the package is that the formatting doesn't change when using
+the hide and show options.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-cmap
   (package
     (name "texlive-cmap")
-- 
cgit 1.4.1


From ef0baf0bed543b91ff5eec0d18c604c90c483e8c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:28:59 +0200
Subject: gnu: Add texlive-combofont.

* gnu/packages/tex.scm (texlive-combofont): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a60dc62f7c..4865d3ed74 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8506,6 +8506,25 @@ individual cells.")
 
 (define-deprecated-package texlive-latex-colortbl texlive-colortbl)
 
+(define-public texlive-combofont
+  (package
+    (name "texlive-combofont")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/combofont/"
+                   "tex/lualatex/combofont/")
+             (base32
+              "05p044znavjjd7cpgjx46i8n6b56rpybhixqs9yaam86nb70ha7n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/combofont")
+    (synopsis "Add NFSS-declarations of combo fonts to LuaLaTeX documents")
+    (description
+     "This highly experimental package can be used to add NFSS-declarations of
+combo fonts to LuaLaTeX documents.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-fancybox
   (package
     (name "texlive-fancybox")
-- 
cgit 1.4.1


From a98cf00c19037771ad21851e622b68a976349a2f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:29:16 +0200
Subject: gnu: Add texlive-cstypo.

* gnu/packages/tex.scm (texlive-cstypo): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4865d3ed74..666b46cf5a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8525,6 +8525,25 @@ individual cells.")
 combo fonts to LuaLaTeX documents.")
     (license license:lppl1.3c)))
 
+(define-public texlive-cstypo
+  (package
+    (name "texlive-cstypo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/cstypo/"
+                   "tex/lualatex/cstypo/" "tex/luatex/cstypo/")
+             (base32
+              "07cgcda6jcmkvhp90n4a8g4x98jmzwf4199gp6nh19718v6n15j8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cstypo")
+    (synopsis "Czech typography rules enforced through LuaTeX hooks")
+    (description
+     "This package provides macros that enforce basic Czech typography rules
+through Lua hooks available in LuaTeX.")
+    (license license:expat)))
+
 (define-public texlive-fancybox
   (package
     (name "texlive-fancybox")
-- 
cgit 1.4.1


From 9acef59889ef6744b8113a7a6c479269d5664b43 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:31:50 +0200
Subject: gnu: Add texlive-ekdosis.

* gnu/packages/tex.scm (texlive-ekdosis): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 666b46cf5a..3ced59f1b0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8996,6 +8996,33 @@ texlive-2019.3/Master/texmf-dist/doc/fonts/ec/copyrite.txt"))))
 
 (define-deprecated-package texlive-fonts-ec texlive-ec)
 
+(define-public texlive-ekdosis
+  (package
+    (name "texlive-ekdosis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/ekdosis/"
+                   "source/lualatex/ekdosis/"
+                   "tex/lualatex/ekdosis/")
+             (base32
+              "0bzydy6gcmikqsdiaji30a2ycifzaafbg0ccv5lq5an7rv2hajmj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ekdosis")
+    (synopsis "Typesetting TEI-xml compliant Critical Editions")
+    (description
+     "@code{ekdosis} is a LuaLaTeX package designed for multilingual critical
+editions.  It can be used to typeset texts and different layers of critical
+notes in any direction accepted by LuaTeX. Texts can be arranged in running
+paragraphs or on facing pages, in any number of columns which in turn can be
+synchronized or not.  In addition to printed texts, @code{ekdosis} can convert
+@file{.tex} source files so as to produce TEI XML-compliant critical editions.
+Database-driven encoding under LaTeX then allows extraction of texts entered
+segment by segment according to various criteria: main edited text, variant
+readings, translations or annotated borrowings between texts.")
+    (license (list license:gpl3+ license:fdl1.3+))))
+
 (define-public texlive-ae
   (package
     (name "texlive-ae")
-- 
cgit 1.4.1


From 4f5ae7ef9cac8743b96ae693957a14e0255de1c9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:32:06 +0200
Subject: gnu: Add texlive-emoji.

* gnu/packages/tex.scm (texlive-emoji): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3ced59f1b0..7fffb62dd3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9023,6 +9023,24 @@ segment by segment according to various criteria: main edited text, variant
 readings, translations or annotated borrowings between texts.")
     (license (list license:gpl3+ license:fdl1.3+))))
 
+(define-public texlive-emoji
+  (package
+    (name "texlive-emoji")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/emoji/" "tex/latex/emoji/")
+             (base32
+              "17i2kjb1rlgj2ipg6bkni1n8l1yhhnm1m96ynj1nv8gkmgkfklal")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/emoji")
+    (synopsis "Emoji support in (Lua)LaTeX")
+    (description
+     "This package allows users to typeset emojis in LaTeX documents.  It
+requires the LuaHBTeX engine.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-ae
   (package
     (name "texlive-ae")
-- 
cgit 1.4.1


From 8f0c88467e5c1f95f016bb7e52e650e33eebccc2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:32:23 +0200
Subject: gnu: Add texlive-emojicite.

* gnu/packages/tex.scm (texlive-emojicite): New variable.
---
 gnu/packages/tex.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7fffb62dd3..8c2ef614f5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9041,6 +9041,23 @@ readings, translations or annotated borrowings between texts.")
 requires the LuaHBTeX engine.")
     (license license:lppl1.3c)))
 
+(define-public texlive-emojicite
+  (package
+    (name "texlive-emojicite")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/emojicite/"
+                   "tex/lualatex/emojicite/")
+             (base32
+              "0wfr4alglwhsp728fp91qxdmc9413c6k9j7hgg0qk3j4w464srbj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/emojicite")
+    (synopsis "Add emojis to citations")
+    (description "This package adds emojis to citations.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-ae
   (package
     (name "texlive-ae")
-- 
cgit 1.4.1


From b56f210fb75e8fa126f1b29445327824d713cc66 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:32:52 +0200
Subject: gnu: Add texlive-enigma.

* gnu/packages/tex.scm (texlive-enigma): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8c2ef614f5..b93b62a225 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9058,6 +9058,29 @@ requires the LuaHBTeX engine.")
     (description "This package adds emojis to citations.")
     (license license:lppl1.3c)))
 
+(define-public texlive-enigma
+  (package
+    (name "texlive-enigma")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/enigma/enigma/"
+                   "scripts/context/lua/third/enigma/mtx-t-enigma.lua/"
+                   "tex/context/third/enigma/t-enigma.mkv/"
+                   "tex/generic/enigma/"
+                   "tex/latex/enigma/"
+                   "tex/plain/enigma/")
+             (base32
+              "1rnp2c903bfgq0gqshaccd1zxcb0zpbk2sh7w3lwynpp0zx8d435")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/enigma")
+    (synopsis "Encrypt documents with a three rotor Enigma")
+    (description
+     "The package provides historical encryption (Enigma cipher) for
+LuaTeX-based formats.")
+    (license license:bsd-2)))
+
 (define-public texlive-ae
   (package
     (name "texlive-ae")
-- 
cgit 1.4.1


From 98dc1825330243948d65e2ee2641c17f509e1056 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:33:20 +0200
Subject: gnu: Add texlive-innerscript.

* gnu/packages/tex.scm (texlive-innerscript): New variable.
---
 gnu/packages/tex.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b93b62a225..4c6d9e619b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9176,6 +9176,53 @@ TeX, and LaTeX font definition and other relevant files.")
                    license:silofl1.1
                    license:asl2.0))))
 
+(define-public texlive-innerscript
+  (package
+    (name "texlive-innerscript")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/innerscript/"
+                   "source/lualatex/innerscript/"
+                   "tex/lualatex/innerscript/")
+             (base32
+              "1nq2il8av1169is3kbq761375vk4znb2cc3f8vk9ab3fh5vqkcjv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:tex-format "lualatex"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'skip-documentation-build
+            ;; Only extract the ".sty" file.  Documentation build fails with
+            ;; "Command \code already defined" error.
+            (lambda _
+              (substitute* "source/lualatex/innerscript/innerscript.dtx"
+                (("\\DocInput\\{innerscript.dtx\\}") "")))))))
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-amsfonts
+                  texlive-booktabs
+                  texlive-epstopdf-pkg
+                  texlive-etoolbox
+                  texlive-geometry
+                  texlive-hypdoc
+                  texlive-hyperref
+                  texlive-infwarerr
+                  texlive-kvoptions
+                  texlive-microtype
+                  texlive-pdftexcmds))))
+    (home-page "https://ctan.org/pkg/innerscript")
+    (synopsis "Modifies automatic mathematics spacing")
+    (description
+     "This package modifies two aspects of TeX's automatic interatom
+mathematics spacing.  It uses LuaTeX's @code{\\Umath} primitives to make
+superscripts and subscripts more closely resemble @code{\\textstyle} and
+@code{\\displaystyle} math and to treat @code{\\mathinner} subformulas as
+@code{\\mathord}, effectively eliminating this class.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-times
   (package
     (name "texlive-times")
-- 
cgit 1.4.1


From 487f16723091a16bfc3fc886f882547c4cc0eaf2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:35:54 +0200
Subject: gnu: Add texlive-interpreter.

* gnu/packages/tex.scm (texlive-interpreter): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4c6d9e619b..d6460bb555 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9223,6 +9223,28 @@ superscripts and subscripts more closely resemble @code{\\textstyle} and
 @code{\\mathord}, effectively eliminating this class.")
     (license license:lppl1.3c)))
 
+(define-public texlive-interpreter
+  (package
+    (name "texlive-interpreter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/interpreter/"
+                   "tex/luatex/interpreter/")
+             (base32
+              "03h6bjhvbl3bfkiyssplivqmn2986asv8b1jvr1ahsh7p04bkk4j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/interpreter")
+    (synopsis "Translate input files on the fly")
+    (description
+     "The package preprocesses input files to a Lua(La)TeX run, on the fly.
+The user defines Lua regular expressions to search for patterns and modify
+input lines (or entire paragraphs) accordingly, before TeX reads the material.
+In this way, documents may be prepared in a non-TeX language (e.g., some
+lightweight markup language) and turned into proper TeX for processing.")
+    (license license:lppl)))
+
 (define-public texlive-times
   (package
     (name "texlive-times")
-- 
cgit 1.4.1


From 65064b0013506580251f67ca1faaf9a789755422 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:36:39 +0200
Subject: gnu: Add texlive-kanaparser.

* gnu/packages/tex.scm (texlive-kanaparser): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d6460bb555..8c17fc7e73 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -15466,6 +15466,30 @@ package which defines the macro, pre-compiled @file{tfm} files, and
 documentation.")
     (license (license:non-copyleft "file:///doc/fonts/eurosym/COPYING"))))
 
+(define-public texlive-kanaparser
+  (package
+    (name "texlive-kanaparser")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/kanaparser/"
+                   "tex/luatex/kanaparser/")
+             (base32
+              "0bcvxkdb2y60w7c0swi3f8yncli0yswalrdzxjv7h0xp21c202hp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/kanaparser")
+    (synopsis "Kana parser for LuaTeX")
+    (description
+     "The package provides a kana parser for LuaTeX.  It is a set of four
+macros that handle transliteration of text: from hiragana and katakana to
+Latin from Latin and katakana to hiragana from Latin and hiragana to katakana
+It can be used to write kana directly using only the ASCII character set or
+for education purposes.  The package has support for obsolete and rarely used
+syllables, some only accessible via the provided toggle macro.")
+    ;; License is BSD.  Assuming original BSD-4.
+    (license license:bsd-4)))
+
 (define-public texlive-kastrup
   (package
     (name "texlive-kastrup")
-- 
cgit 1.4.1


From 59b33cbe062cf774582871038f7bec7e9c7bd703 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:37:09 +0200
Subject: gnu: Add texlive-ligtype.

* gnu/packages/tex.scm (texlive-ligtype): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8c17fc7e73..63f7f79c5a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16054,6 +16054,29 @@ Lehmann's @code{etoolbox}.")
 package to tables created using the @code{longtable} package.")
     (license license:lppl1.3+)))
 
+(define-public texlive-ligtype
+  (package
+    (name "texlive-ligtype")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/ligtype/"
+                   "tex/lualatex/ligtype/")
+             (base32
+              "18m4j01zhp3kj2ixd53b9z0k5f6idbpr6jv45gw149j5niax1dxg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ligtype")
+    (synopsis "Comprehensive ligature suppression functionalities")
+    (description
+     "This package suppresses inappropriate ligatures following specified
+rules.  Both font and user kerning are applied correctly, and f-glyphs are
+automatically replaced with their short-arm variant (if available).  Also
+there is an emphasis on speed.  By default the package applies German language
+ligature suppression rules.  With the help of options and macros it can be
+used for other languages as well.  The package requires LuaLaTeX.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-lineno
   (package
     (name "texlive-lineno")
-- 
cgit 1.4.1


From 35466639a0cc4450303826f8483318c0e24719d0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:39:37 +0200
Subject: gnu: Add texlive-linebreaker.

* gnu/packages/tex.scm (texlive-linebreaker): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 63f7f79c5a..58f4d9fd23 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16077,6 +16077,28 @@ ligature suppression rules.  With the help of options and macros it can be
 used for other languages as well.  The package requires LuaLaTeX.")
     (license license:lppl1.3c)))
 
+(define-public texlive-linebreaker
+  (package
+    (name "texlive-linebreaker")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/linebreaker/"
+                   "tex/lualatex/linebreaker/")
+             (base32
+              "1rppq2dlj7g5djq5f0hhgk9sgk0ip1ha4vqhx6ajfpzdchg7b1cw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/linebreaker")
+    (synopsis "Prevent overflow boxes with LuaLaTeX")
+    (description
+     "This package tries to prevent overflow lines in paragraphs or boxes.  It
+changes LuaTeX's @code{\\linebreak} callback and re-typesets the paragraph
+with increased values of @code{\\tolerance} and @code{\\emergencystretch}
+until the overflow no longer happens.  If that doesn't help, it chooses the
+solution with the lowest badness.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-lineno
   (package
     (name "texlive-lineno")
-- 
cgit 1.4.1


From 290a006aaa420283a41fd2df42b59196b2103bbc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:43:41 +0200
Subject: gnu: Add texlive-lparse.

* gnu/packages/tex.scm (texlive-lparse): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 58f4d9fd23..1f6f209940 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16119,6 +16119,28 @@ reference mechanism.  Line numbering may be extended to footnote lines, using
 the @code{fnlineno} package.")
     (license license:lppl1.3a+)))
 
+(define-public texlive-lparse
+  (package
+    (name "texlive-lparse")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/lparse/" "tex/luatex/lparse/")
+             (base32
+              "1m75w69qm67j82ja0lp38yckdsbn465aipzdbi2kg4y2xz34hli1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lparse")
+    (synopsis "Lua module for parsing key-value options")
+    (description
+     "@code{lparse} is derived from @code{xparse}, but only works with LuaTeX.
+Just as with xparse, it is possible to use a special syntax consisting of
+single letters to express the arguments of a macro.  However, @code{lparse} is
+able to read arguments regardless of the macro systemd used -- whether LaTeX,
+or ConTeXt, or even plain TeX.  Of course, LuaTeX must always be used as the
+engine.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 00acc32e49385dc0dbe7754fad21f1e0702a1afe Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:43:58 +0200
Subject: gnu: Add texlive-lt3luabridge.

* gnu/packages/tex.scm (texlive-lt3luabridge): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1f6f209940..b2db9942c1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16141,6 +16141,27 @@ or ConTeXt, or even plain TeX.  Of course, LuaTeX must always be used as the
 engine.")
     (license license:lppl1.3c)))
 
+(define-public texlive-lt3luabridge
+  (package
+    (name "texlive-lt3luabridge")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/lt3luabridge/"
+                   "source/generic/lt3luabridge/"
+                   "tex/generic/lt3luabridge/")
+             (base32
+              "00nfi3c545kmm6d9hxwl0m3pawg8322g36gm8sfa3y2p8kah6p8d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lt3luabridge")
+    (synopsis "Execute Lua code in any TeX engine that exposes the shell")
+    (description
+     "This is an expl3(-generic) package for plain TeX, LaTeX, and ConTeXt
+that allows you to execute Lua code in LuaTeX or any other TeX engine that
+exposes the shell.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 0719c4c4b5e29b2db9f8469209e1240b30d37b50 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:44:12 +0200
Subject: gnu: Add texlive-lua-typo.

* gnu/packages/tex.scm (texlive-lua-typo): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b2db9942c1..8570cfab3e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16162,6 +16162,29 @@ that allows you to execute Lua code in LuaTeX or any other TeX engine that
 exposes the shell.")
     (license license:lppl1.3c)))
 
+(define-public texlive-lua-typo
+  (package
+    (name "texlive-lua-typo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/lua-typo/"
+                   "source/lualatex/lua-typo/"
+                   "tex/lualatex/lua-typo/")
+             (base32
+              "0lhjgs7jxdwk2cn9zb99mk2c56awi249zk839waqxnzfr18ky63k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lua-typo")
+    (synopsis "Highlighting typographical flaws with LuaLaTeX")
+    (description
+     "This package tracks common typographic flaws in LuaLaTeX documents,
+especially widows, orphans, hyphenated words split over two pages, consecutive
+lines ending with hyphens, paragraphs ending on too short lines, etc.
+Customisable colours are used to highlight these flaws, and the list of pages
+on which typographical flaws were found is printed.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 6bc9993d038a87549e9a8f8702260a4f2841aed9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:45:00 +0200
Subject: gnu: Add texlive-lua-uca.

* gnu/packages/tex.scm (texlive-lua-uca): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8570cfab3e..74d84240ea 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16185,6 +16185,28 @@ Customisable colours are used to highlight these flaws, and the list of pages
 on which typographical flaws were found is printed.")
     (license license:lppl1.3c)))
 
+(define-public texlive-lua-uca
+  (package
+    (name "texlive-lua-uca")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/lua-uca/" "scripts/lua-uca/"
+                   "source/support/lua-uca/")
+             (base32
+              "03wpdaz0z3zqfjs43ar65lx521qyf0c2q62b5p53kdx17xfr09jz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lua-uca")
+    (synopsis "Unicode Collation Algorithm library for Lua")
+    (description
+     "The Lua-UCA library provides basic support for Unicode Collation
+Algorithm in Lua.  It can be used to sort arrays of strings according to rules
+of particular languages.  It can be used in other Lua projects that need to
+sort text in a language dependent way, like indexing processors, bibliographic
+generators, etc.")
+    (license license:expat)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 8cb294628a161776be1e69af9189b85c6345992e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:45:13 +0200
Subject: gnu: Add texlive-lua-ul.

* gnu/packages/tex.scm (texlive-lua-ul): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 74d84240ea..130cae2505 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16207,6 +16207,28 @@ sort text in a language dependent way, like indexing processors, bibliographic
 generators, etc.")
     (license license:expat)))
 
+(define-public texlive-lua-ul
+  (package
+    (name "texlive-lua-ul")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/lua-ul/"
+                   "source/lualatex/lua-ul/"
+                   "tex/lualatex/lua-ul/")
+             (base32
+              "0xpa41hkjzqcws7yjj6s8ys93qyhnv6zfv7479qbv58h5mgfxzhh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lua-ul")
+    (synopsis "Underlining for LuaLaTeX")
+    (description
+     "This package provides underlining, strikethough, and highlighting using
+features in LuaLaTeX which avoid the restrictions imposed by other methods.
+In particular, kerning is not affected, the underlined text can use arbitrary
+commands, hyphenation works etc.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 1bd8f4e1cb2b287b9b1cc71a44865a4cb25affe2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:45:25 +0200
Subject: gnu: Add texlive-lua-visual-debug.

* gnu/packages/tex.scm (texlive-lua-visual-debug): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 130cae2505..ab178273aa 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16229,6 +16229,26 @@ In particular, kerning is not affected, the underlined text can use arbitrary
 commands, hyphenation works etc.")
     (license license:lppl1.3c)))
 
+(define-public texlive-lua-visual-debug
+  (package
+    (name "texlive-lua-visual-debug")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/lua-visual-debug/"
+                   "tex/luatex/lua-visual-debug/")
+             (base32
+              "1g4n4xfqbgcja2x3b7yi59nn76jq695yndv90610pakask2k560l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lua-visual-debug")
+    (synopsis "Visual debugging with LuaLaTeX")
+    (description
+     "The package uses Lua code to provide visible indications of boxes,
+glues, kerns and penalties in the PDF output.  The package is known to work in
+LaTeX and Plain TeX documents.")
+    (license license:expat)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 341075687fbd1b411e1339a8d8083d2278358d38 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:48:27 +0200
Subject: gnu: Add texlive-lua-widow-control.

* gnu/packages/tex.scm (texlive-lua-widow-control): New variable.
---
 gnu/packages/tex.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ab178273aa..c2bc7f19af 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16249,6 +16249,39 @@ glues, kerns and penalties in the PDF output.  The package is known to work in
 LaTeX and Plain TeX documents.")
     (license license:expat)))
 
+(define-public texlive-lua-widow-control
+  (package
+    (name "texlive-lua-widow-control")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/lua-widow-control/"
+                   "source/luatex/lua-widow-control/"
+                   "tex/context/third/lua-widow-control/"
+                   "tex/lualatex/lua-widow-control/"
+                   "tex/luatex/lua-widow-control/"
+                   "tex/optex/lua-widow-control/")
+             (base32
+              "1c2n0hmf4kgvdfqday9pk673nxmpddg2wr91wkgalvrn7jw82js4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lua-widow-control")
+    (synopsis "Automatically remove widows and orphans from any document")
+    (description
+     "Unmodified TeX has very few ways of preventing widows and orphans.  In
+documents with figures, section headings, and equations, TeX can stretch the
+vertical glue between items in order to prevent widows and orphans, but many
+documents have no figures or headings.  TeX can also shorten the page by
+1 line, but this will give each page a different length which can make
+a document look uneven.  The typical solution is to strategically insert
+@samp{\\looseness=1}, but this requires manual editing every time that the
+document is edited.  Lua-widow-control is essentially an automation of the
+@code{\\looseness} method: it uses Lua callbacks to find stretchy paragraphs,
+then it lengthens them to remove widows and orphans.  Lua-widow-control is
+compatible with all LuaTeX and LuaMetaTeX-based formats.")
+    ;; Use either license.
+    (license (list license:mpl2.0 license:cc-by-sa4.0))))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From df7913fbe0a3280c0250fe4622a102d0edfb6a78 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:48:46 +0200
Subject: gnu: Add texlive-luaaddplot.

* gnu/packages/tex.scm (texlive-luaaddplot): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c2bc7f19af..421d158766 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16282,6 +16282,28 @@ compatible with all LuaTeX and LuaMetaTeX-based formats.")
     ;; Use either license.
     (license (list license:mpl2.0 license:cc-by-sa4.0))))
 
+(define-public texlive-luaaddplot
+  (package
+    (name "texlive-luaaddplot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/luaaddplot/"
+                   "source/luatex/luaaddplot/"
+                   "tex/luatex/luaaddplot/")
+             (base32
+              "0r7n2s8isw3rm0g2l0zljh86ysh1zyfbmypci3kgciad5smjzx15")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luaaddplot")
+    (synopsis "Extension to @code{pgfplots}' @code{\\addplot} macro")
+    (description
+     "This package is an extension to @code{pgfplots}.  It extends the
+@code{\\addplot} macro by a facility which allows modification of data files
+while they are read.  With @code{luaaddplot} it is no longer necessary to
+pre-process data files generated by measuring devices with external scripts.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From affd215764d0b7a9aa2d6ad7908478bbe64c3d3c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:50:02 +0200
Subject: gnu: Add texlive-luacas.

* gnu/packages/tex.scm (texlive-luacas): New variable.
---
 gnu/packages/tex.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 421d158766..6dfa589646 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16304,6 +16304,39 @@ while they are read.  With @code{luaaddplot} it is no longer necessary to
 pre-process data files generated by measuring devices with external scripts.")
     (license license:lppl1.3+)))
 
+(define-public texlive-luacas
+  (package
+    (name "texlive-luacas")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luacas/"
+                   "tex/lualatex/luacas/_lib/"
+                   "tex/lualatex/luacas/algebra/"
+                   "tex/lualatex/luacas/calculus/"
+                   "tex/lualatex/luacas/core/binaryoperation/"
+                   "tex/lualatex/luacas/test/calculus/"
+                   "tex/lualatex/luacas/test/expressions/"
+                   "tex/lualatex/luacas/test/polynomials/"
+                   "tex/lualatex/luacas/test/rings/")
+             (base32
+              "03z33kphj85y5w0sdgrgsh1pajbxwjiiir0s972cjn3f8ns6xw9x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luacas")
+    (synopsis "Computer algebra system for users of LuaLaTeX")
+    (description
+     "This package provides a portable computer algebra system capable of
+symbolic computation, written entirely in Lua, designed for use in LuaLaTeX.
+Its features are: arbitrary-precision integer and rational arithmetic,
+factoring of univariate polynomials over the rationals and finite fields,
+number theoretic algorithms, symbolic differentiation and integration, and
+more.  The target audience for this package are mathematics students,
+instructors, and professionals who would like some ability to perform basic
+symbolic computations within LaTeX without the need for laborious and
+technical setup.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 5b84e7f82b1829dc33af9c13aac615587a4f798d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:50:17 +0200
Subject: gnu: Add texlive-luacensor.

* gnu/packages/tex.scm (texlive-luacensor): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6dfa589646..25c6c36f6a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16337,6 +16337,30 @@ symbolic computations within LaTeX without the need for laborious and
 technical setup.")
     (license license:lppl1.3c)))
 
+(define-public texlive-luacensor
+  (package
+    (name "texlive-luacensor")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luacensor/"
+                   "tex/lualatex/luacensor/")
+             (base32
+              "0nw83zzpb9y4vnm4rjz786nz9fxv1vzlz3dv8fjwxqpxngqws4g8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luacensor")
+    (synopsis "Securely redact sensitive information using Lua")
+    (description
+     "This package provides simple tools for creating redacted contents.  Its
+tools are useful for lawyers, workers in sensitive industries, and others who
+need to easily produce both unrestricted versions of documents (for limited,
+secure release) and restricted versions of documents (for general release).
+Redaction is done both by hiding all characters and by slightly varying the
+length of strings to prevent jigsaw identification.  It also is friendly to
+screen readers by adding alt-text indicating redacted content.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From ef93bf62ad7d0b06bd62affdb13c02a25714dea5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:52:16 +0200
Subject: gnu: Add texlive-luacolor.

* gnu/packages/tex.scm (texlive-luacolor): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 25c6c36f6a..982cdb0fe6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16361,6 +16361,26 @@ length of strings to prevent jigsaw identification.  It also is friendly to
 screen readers by adding alt-text indicating redacted content.")
     (license license:lppl1.3+)))
 
+(define-public texlive-luacolor
+  (package
+    (name "texlive-luacolor")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/luacolor/"
+                   "source/latex/luacolor/"
+                   "tex/latex/luacolor/")
+             (base32
+              "0c91m5iq095f04wiy3dfnhyh458d9scww51np88x8islz1l3psbp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luacolor")
+    (synopsis "Color support based on LuaTeX's node attributes")
+    (description
+     "This package implements color support based on LuaTeX's node
+attributes.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From be5e260da1796935785cd48cbca2e312fc6053cf Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:52:37 +0200
Subject: gnu: Add texlive-luacomplex.

* gnu/packages/tex.scm (texlive-luacomplex): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 982cdb0fe6..9461cc1d63 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16381,6 +16381,29 @@ screen readers by adding alt-text indicating redacted content.")
 attributes.")
     (license license:lppl1.3+)))
 
+(define-public texlive-luacomplex
+  (package
+    (name "texlive-luacomplex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luacomplex/"
+                   "tex/lualatex/luacomplex/")
+             (base32
+              "0fb75jzvl0gqqyfl6vrfwdpsxjfq7dyhmfbfibg9w6rqxzcd013p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luacomplex")
+    (synopsis "Operations on complex numbers inside LaTeX documents using Lua")
+    (description
+     "The @code{luacomplex} package is developed to define complex numbers and
+perform basic arithmetic on complex numbers in LaTeX.  It also loads the
+@code{luamathspackage}.  It provides an easy way to define complex numbers and
+perform operations on complex numbers.  There is no particular environment for
+performing operations on complex numbers.  The package commands can be used in
+any environment (including the mathematics environment).")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 8d0b56dd4bcd80ad1e0b20d3c24d7f568d97490b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:53:09 +0200
Subject: gnu: Add texlive-luagcd.

* gnu/packages/tex.scm (texlive-luagcd): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9461cc1d63..cc0f3139dc 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16404,6 +16404,29 @@ performing operations on complex numbers.  The package commands can be used in
 any environment (including the mathematics environment).")
     (license license:lppl1.3c)))
 
+(define-public texlive-luagcd
+  (package
+    (name "texlive-luagcd")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luagcd/"
+                   "tex/lualatex/luagcd/")
+             (base32
+              "17d1am1c4gmbc0z1fllk6kf6b8fmihw4bv8bl0vvwvnk2acj4zj9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luagcd")
+    (synopsis "Computation of gcd of integers inside LaTeX using Lua")
+    (description
+     "Using Lua, the @code{luagcd} package is developed to find the greatest
+common divisor (gcd) of integers in LaTeX.  The package provides commands to
+obtain step-by-step computation of gcd of two integers by using the Euclidean
+algorithm.  In addition, the package has the command to express gcd of two
+integers as a linear combination.  The Bezout's Identity can be verified for
+any two integers using commands in the package.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 51e2ec6f7f68812e6e223de717854cf132a6ede6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:53:40 +0200
Subject: gnu: Add texlive-luahyphenrules.

* gnu/packages/tex.scm (texlive-luahyphenrules): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cc0f3139dc..f84ef1fb2c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16427,6 +16427,28 @@ integers as a linear combination.  The Bezout's Identity can be verified for
 any two integers using commands in the package.")
     (license license:lppl1.3c)))
 
+(define-public texlive-luahyphenrules
+  (package
+    (name "texlive-luahyphenrules")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luahyphenrules/"
+                   "tex/lualatex/luahyphenrules/")
+             (base32
+              "1a23bp4a7nix4lhi4dl6kwxp1bs6dvldxxrx143i1ps95l3clasj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luahyphenrules")
+    (synopsis "Loading patterns in LuaLaTeX with @file{language.dat}")
+    (description
+     "Preloading hyphenation patterns (or hyphen rules) into any format based
+upon LuaTeX is not required in LuaTeX and recent releases of Babel don't do it
+anyway.  This package is addressed to those who just want to select the
+languages and load their patterns by means of @file{language.dat} without
+loading @code{babel}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 7ab5567de0a960e32e50e3bae7fc05bc05c0b0a7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:53:54 +0200
Subject: gnu: Add texlive-luaimageembed.

* gnu/packages/tex.scm (texlive-luaimageembed): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f84ef1fb2c..e4b2e38a9e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16449,6 +16449,27 @@ languages and load their patterns by means of @file{language.dat} without
 loading @code{babel}.")
     (license license:lppl1.3+)))
 
+(define-public texlive-luaimageembed
+  (package
+    (name "texlive-luaimageembed")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luaimageembed/"
+                   "tex/lualatex/luaimageembed/")
+             (base32
+              "0nn4vw7hjyjr8an04dd8xmaskf9qn3zjv29dj37pias3pjq7nqi5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luaimageembed")
+    (synopsis "Embed images as base64-encoded strings")
+    (description
+     "This package allows to embed images directly as base64-encoded strings
+into a LuaLaTeX document.  This can be useful, e.g., to package a document
+with images into a single TeX file, or with automatically generated
+graphics.")
+    (license license:expat)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 9e6e3981785162810d9808b19df5c33905befae3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:54:14 +0200
Subject: gnu: Add texlive-luaindex.

* gnu/packages/tex.scm (texlive-luaindex): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e4b2e38a9e..efa5ee793c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16470,6 +16470,33 @@ with images into a single TeX file, or with automatically generated
 graphics.")
     (license license:expat)))
 
+(define-public texlive-luaindex
+  (package
+    (name "texlive-luaindex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luaindex/" "scripts/luaindex/"
+                   "source/lualatex/luaindex/"
+                   "tex/lualatex/luaindex/")
+             (base32
+              "0a2xfzrc663jmd2s5vi5p38pwd16mbm5602pxc3kszza8whqlfdn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:tex-format "lualatex"
+           #:phases
+           #~(modify-phases %standard-phases
+               ;; FIXME: Building documentation requires shell-escape to be
+               ;; allowed.  I couldn't find a way to generate the package
+               ;; only.
+               (delete 'build))))
+    (home-page "https://ctan.org/pkg/luaindex")
+    (synopsis "Create index using LuaLaTeX")
+    (description
+     "Luaindex provides (yet another) index processor, written in Lua.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 940d00adda7cd28ab4600d6d5e29f1477ee91d18 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:54:38 +0200
Subject: gnu: Add texlive-luainputenc.

* gnu/packages/tex.scm (texlive-luainputenc): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index efa5ee793c..19ece13c73 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16497,6 +16497,29 @@ graphics.")
      "Luaindex provides (yet another) index processor, written in Lua.")
     (license license:lppl1.3+)))
 
+(define-public texlive-luainputenc
+  (package
+    (name "texlive-luainputenc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luainputenc/"
+                   "source/lualatex/luainputenc/"
+                   "tex/lualatex/luainputenc/")
+             (base32
+              "17xglqil5mbv47kjzklp22vvsn29vajf6q0v45af4pd6yk9kcc6w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luainputenc")
+    (synopsis "Replacing @code{inputenc} for use in LuaTeX")
+    (description
+     "LuaTeX operates by default in UTF-8 input; thus LaTeX documents that
+need 8-bit character-sets need special treatment.  The package, therefore,
+replaces the LaTeX standard @code{inputenc} for use under LuaTeX.  With
+a current LuaTeX,the package has the same behaviour with LuaTeX as
+@code{inputenc} has under pdfTeX.")
+    (license license:public-domain)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From aeff82b87d5861c3da1b92abf2c74c30d25f8bf0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:54:53 +0200
Subject: gnu: Add texlive-luaintro.

* gnu/packages/tex.scm (texlive-luaintro): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 19ece13c73..6fccd4f8ef 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16520,6 +16520,25 @@ a current LuaTeX,the package has the same behaviour with LuaTeX as
 @code{inputenc} has under pdfTeX.")
     (license license:public-domain)))
 
+(define-public texlive-luaintro
+  (package
+    (name "texlive-luaintro")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/luaintro/")
+             (base32
+              "0xab7yymknvhsh4c30xnhrlvk798mbnl9fbf7njqx8mbmnv869bi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luaintro")
+    (synopsis "Examples from the book ``Einfuhrung in LuaTeX und LuaLaTeX''")
+    (description
+     "The bundle provides source of all the examples published in the German
+book ``Einfuhrung in LuaTeX und LuaLaTeX'', published by Lehmans Media and
+DANTE, Berlin.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From c290a4263a1f5860b6bbe258deecc4c12e095c68 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:55:15 +0200
Subject: gnu: Add texlive-luakeys.

* gnu/packages/tex.scm (texlive-luakeys): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6fccd4f8ef..7ca5fcf3bb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16539,6 +16539,25 @@ book ``Einfuhrung in LuaTeX und LuaLaTeX'', published by Lehmans Media and
 DANTE, Berlin.")
     (license license:lppl1.3+)))
 
+(define-public texlive-luakeys
+  (package
+    (name "texlive-luakeys")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/luakeys/" "tex/luatex/luakeys/")
+             (base32
+              "0nsd9d2rfwbjadnfykhi0c4wj39cscpx496acjcixg1irlxii7z8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luakeys")
+    (synopsis "Lua module for parsing key-value options")
+    (description
+     "This package provides a Lua module that can parse key-value options like
+the TeX packages @code{keyval}, @code{kvsetkeys}, @code{kvoptions},
+@code{xkeyval}, @code{pgfkeys}, etc.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From f487b57a182617b173ae2e821e67c11f202bad60 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:56:09 +0200
Subject: gnu: Add texlive-lualatex-doc.

* gnu/packages/tex.scm (texlive-lualatex-doc): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7ca5fcf3bb..9582563406 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16558,6 +16558,27 @@ the TeX packages @code{keyval}, @code{kvsetkeys}, @code{kvoptions},
 @code{xkeyval}, @code{pgfkeys}, etc.")
     (license license:lppl1.3c)))
 
+(define-public texlive-lualatex-doc
+  (package
+    (name "texlive-lualatex-doc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/lualatex-doc/"
+                   "source/lualatex/lualatex-doc/")
+             (base32
+              "1nbanlp3qfk0hylih64qnkh5cd1mjd3j99jk36rnbjhd3f840d9q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lualatex-doc")
+    (synopsis "Guide to use of LaTeX with LuaTeX")
+    (description
+     "The document is a guide to the world of LuaLaTeX.  Coverage supports
+both new users and package developers.  Apart from the introductory material,
+the document gathers information from several sources, and offers links to
+others.")
+    (license license:fdl1.3+)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 9460219a1ae215506fc993d2313a315baeb9b789 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:56:22 +0200
Subject: gnu: Add texlive-lualatex-truncate.

* gnu/packages/tex.scm (texlive-lualatex-truncate): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9582563406..576d2dc7b3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16579,6 +16579,26 @@ the document gathers information from several sources, and offers links to
 others.")
     (license license:fdl1.3+)))
 
+(define-public texlive-lualatex-truncate
+  (package
+    (name "texlive-lualatex-truncate")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/lualatex-truncate/"
+                   "source/lualatex/lualatex-truncate/"
+                   "tex/lualatex/lualatex-truncate/")
+             (base32
+              "1ash4zy97qr9vl3j0gpf16srhi8ymfz3h9khlp59kyq9c921rcla")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lualatex-truncate")
+    (synopsis "Wrapper for using the @code{truncate} package with LuaLaTeX")
+    (description
+     "This package provides a wrapper for the @code{truncate} package, thus
+fixing issues related to LuaTeX's hyphenation algorithm.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From a37a87ddf19fa9651b2db601c9f8bd7270e25223 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:56:42 +0200
Subject: gnu: Add texlive-lualinalg.

* gnu/packages/tex.scm (texlive-lualinalg): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 576d2dc7b3..b3737b723b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16599,6 +16599,33 @@ others.")
 fixing issues related to LuaTeX's hyphenation algorithm.")
     (license license:lppl1.3c)))
 
+(define-public texlive-lualinalg
+  (package
+    (name "texlive-lualinalg")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/lualinalg/"
+                   "tex/lualatex/lualinalg/")
+             (base32
+              "0f29ymc5adcg8mh8lhgir6cj6f0kni0i53r6g35yqnd1jw9qr24q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lualinalg")
+    (synopsis "Linear algebra package for LaTeX")
+    (description
+     "The @code{lualinalg} package is developed to perform operations on
+vectors and matrices defined over the field of real or complex numbers inside
+LaTeX documents.  It provides flexible ways for defining and displaying
+vectors and matrices.  No particular environment of LaTeX is required to use
+commands in the package.  The package is written in Lua, and @file{.tex} file
+is to be compiled with the LuaLaTeX engine.  It may also save users efforts to
+copy vectors and matrices from other software (which may not be in
+LaTeX-compatible format) and to use them in a TeX file.  The vectors and
+matrices of reasonable size can be handled with ease.  The package can be
+modified or extended by writing custom Lua programs.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 3f57677d26a3a92f87f38c25ca2d7ddeaf066bbd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:56:53 +0200
Subject: gnu: Add texlive-luamathalign.

* gnu/packages/tex.scm (texlive-luamathalign): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b3737b723b..2f6f207312 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16626,6 +16626,27 @@ matrices of reasonable size can be handled with ease.  The package can be
 modified or extended by writing custom Lua programs.")
     (license license:lppl1.3c)))
 
+(define-public texlive-luamathalign
+  (package
+    (name "texlive-luamathalign")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luamathalign/"
+                   "source/lualatex/luamathalign/"
+                   "tex/lualatex/luamathalign/")
+             (base32
+              "0lj5lc6s30l9k83xrwfjva0v7c9ajv22ybsaz07hadgj17fxqbdn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luamathalign")
+    (synopsis "More flexible alignment in @code{amsmath} environments")
+    (description
+     "This package allows aligning mathematical expressions on points where
+directly using @samp{&} is not possible, especially in nested macros or
+environments.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From c9c31047593cec59015d0beef88c921addc84f84 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:57:05 +0200
Subject: gnu: Add texlive-luamaths.

* gnu/packages/tex.scm (texlive-luamaths): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2f6f207312..eb95827d46 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16647,6 +16647,29 @@ directly using @samp{&} is not possible, especially in nested macros or
 environments.")
     (license license:lppl1.3c)))
 
+(define-public texlive-luamaths
+  (package
+    (name "texlive-luamaths")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin name version
+                            (list "doc/lualatex/luamaths/"
+                                  "tex/lualatex/luamaths/")
+                            (base32
+                             "1dswh6jjkl7jbs3f5pvwh30874x4xycvw7n9cbfd5m9wfcv97rw9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luamaths")
+    (synopsis
+     "Provide standard mathematical operations inside LaTeX documents using Lua")
+    (description
+     "The @code{luamaths} package is developed to perform standard
+mathematical operations inside LaTeX documents using Lua.  It provides an easy
+way to perform standard mathematical operations.  There is no particular
+environment in the package for performing mathematical operations.  The
+package commands can be used in any environment (including the mathematics
+environment).")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 6c51d9ec0122ce4543fb602f93406dc867d9b7a9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:57:20 +0200
Subject: gnu: Add texlive-luamodulartables.

* gnu/packages/tex.scm (texlive-luamodulartables): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index eb95827d46..96477ff6c7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16670,6 +16670,31 @@ package commands can be used in any environment (including the mathematics
 environment).")
     (license license:lppl1.3c)))
 
+(define-public texlive-luamodulartables
+  (package
+    (name "texlive-luamodulartables")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luamodulartables/"
+                   "tex/lualatex/luamodulartables/")
+             (base32
+              "18yc3fincdvfk1zj5m2gah35mzlvg6rbby8m71clnjk9knmzjcxy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luamodulartables")
+    (synopsis "Generate modular addition and multiplication tables")
+    (description
+     "This package is developed to generate modular addition and
+multiplication tables for positive integers.  It provides an easy way to
+generate modular addition and modular multiplication tables for positive
+integers in LaTeX documents.  The commands in the package have optional
+arguments for the formatting of tables.  These commands can be used in an
+environment similar to a tabular or array environment.  The commands can also
+be used with the @code{booktabs} package, which provides nice formatting of
+tables in LaTeX.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From f757ed3552e3d36f14c7e061c9df366b8650584a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:57:33 +0200
Subject: gnu: Add texlive-luamplib.

* gnu/packages/tex.scm (texlive-luamplib): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 96477ff6c7..4b44369ec9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16695,6 +16695,28 @@ be used with the @code{booktabs} package, which provides nice formatting of
 tables in LaTeX.")
     (license license:lppl1.3c)))
 
+(define-public texlive-luamplib
+  (package
+    (name "texlive-luamplib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/luamplib/"
+                   "source/luatex/luamplib/"
+                   "tex/luatex/luamplib/")
+             (base32
+              "1f2r93daddjwmj7fcy5rds2yz0c8qmww7yw93vgwffmm49d9ims5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luamplib")
+    (synopsis "Use LuaTeX's built-in MetaPost interpreter")
+    (description
+     "The package enables the user to specify MetaPost diagrams (which may
+include colour specifications from the color or xcolor packages) into
+a document, using LuaTeX's built-in MetaPost library.  The facility is only
+available in PDF mode.")
+    (license license:gpl2)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From be4964964e6ea02124f547f115542002acfadec6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:58:08 +0200
Subject: gnu: Add texlive-luaoptions.

* gnu/packages/tex.scm (texlive-luaoptions): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4b44369ec9..2c83ad62e4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16717,6 +16717,32 @@ a document, using LuaTeX's built-in MetaPost library.  The facility is only
 available in PDF mode.")
     (license license:gpl2)))
 
+(define-public texlive-luaoptions
+  (package
+    (name "texlive-luaoptions")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luaoptions/"
+                   "tex/lualatex/luaoptions/")
+             (base32
+              "143cjll4dkjb3bp9755c5wsq447mvw8k043mqyi01qskz5wq45yf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luaoptions")
+    (synopsis "Option handling for LuaLaTeX packages")
+    (description
+     "This LuaLaTeX package provides extensive support for handling options,
+on package level and locally.  It allows the declaration of sets of options,
+along with defaults, allowed values and limited type checking.  These options
+can be enforced as package options, changed at any point during a document, or
+overwritten locally by optional macro arguments.  It is also possible to
+instantiate an Options object as an independent Lua object, without linking it
+to a package.  Luaoptions can be used to enforce and prepopulate options, or
+it can be used to simply handle the parsing of optional @samp{key=value}
+arguments into proper Lua tables.")
+    (license license:expat)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From f3c0d2f8606779c655b655e453b427d0714d6c2f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:58:21 +0200
Subject: gnu: Add texlive-luapackageloader.

* gnu/packages/tex.scm (texlive-luapackageloader): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2c83ad62e4..c9f8fe2a35 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16743,6 +16743,27 @@ it can be used to simply handle the parsing of optional @samp{key=value}
 arguments into proper Lua tables.")
     (license license:expat)))
 
+(define-public texlive-luapackageloader
+  (package
+    (name "texlive-luapackageloader")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/luapackageloader/"
+                   "tex/luatex/luapackageloader/")
+             (base32
+              "0cf2p4zhfvf7f10pbpp332chj46ajknqgb7a8i16v63ivvmgb8m3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-iftex))
+    (home-page "https://ctan.org/pkg/luapackageloader")
+    (synopsis "Allow LuaTeX to load external Lua packages")
+    (description
+     "This package allows LuaTeX to load packages from the default
+@code{package.path} and @code{package.cpath} locations.  This could be useful
+to load external Lua modules, including modules installed via LuaRocks.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 92d75955a3ee4337ae9726fada2c377a680c8b8c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:58:32 +0200
Subject: gnu: Add texlive-luaprogtable.

* gnu/packages/tex.scm (texlive-luaprogtable): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c9f8fe2a35..b2c6c7cd2c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16764,6 +16764,25 @@ arguments into proper Lua tables.")
 to load external Lua modules, including modules installed via LuaRocks.")
     (license license:lppl1.3c)))
 
+(define-public texlive-luaprogtable
+  (package
+    (name "texlive-luaprogtable")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luaprogtable/"
+                   "tex/lualatex/luaprogtable/")
+             (base32
+              "0vx4vsqa777hv4bdw8m7x8hrjg5p9h8d68z0l2ji60h67bziy161")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luaprogtable")
+    (synopsis "Programmable table interface for LuaLaTeX")
+    (description
+     "This package allows you to modify a cell based on the contents of other
+cells using LaTeX macros.")
+    (license license:expat)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From fd128f8c5af4af0fa6bc9da7bb69138678f648ee Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:58:46 +0200
Subject: gnu: Add texlive-luaquotes.

* gnu/packages/tex.scm (texlive-luaquotes): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b2c6c7cd2c..0c92ce95a8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16783,6 +16783,25 @@ to load external Lua modules, including modules installed via LuaRocks.")
 cells using LaTeX macros.")
     (license license:expat)))
 
+(define-public texlive-luaquotes
+  (package
+    (name "texlive-luaquotes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luaquotes/"
+                   "tex/lualatex/luaquotes/")
+             (base32
+              "0lla3bd5prh5ld1p88f8c3mfck6c6jn241fq1fzz0a9vdhfsbpv0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luaquotes")
+    (synopsis "Smart setting of quotation marks")
+    (description
+     "This package automatically generates quotation marks and punctuation
+depending on the selected language.")
+    (license (list license:lppl1.3c license:cc-by-sa3.0))))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From d047f46ce23bfb8d27b05d07690d778a14e5046c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:59:02 +0200
Subject: gnu: Add texlive-luarandom.

* gnu/packages/tex.scm (texlive-luarandom): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0c92ce95a8..36f7c6e979 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16802,6 +16802,26 @@ cells using LaTeX macros.")
 depending on the selected language.")
     (license (list license:lppl1.3c license:cc-by-sa3.0))))
 
+(define-public texlive-luarandom
+  (package
+    (name "texlive-luarandom")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luarandom/"
+                   "tex/lualatex/luarandom/")
+             (base32
+              "1hzq29prnwgvp400d26fdjhh812gwwgmlwb22xhj29s9f0k2g1qy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luarandom")
+    (synopsis "Create lists of random numbers")
+    (description
+     "This package can create lists of random numbers for any given interval.
+It is possible to get lists with or without multiple numbers.  The random
+generator will be initialized by the system time.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From ad8e83f82c645144f1ffaeb51fca6f4bfdb599d8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:59:14 +0200
Subject: gnu: Add texlive-luaset.

* gnu/packages/tex.scm (texlive-luaset): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 36f7c6e979..ec483db7ba 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16822,6 +16822,29 @@ It is possible to get lists with or without multiple numbers.  The random
 generator will be initialized by the system time.")
     (license license:lppl1.3+)))
 
+(define-public texlive-luaset
+  (package
+    (name "texlive-luaset")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luaset/"
+                   "tex/lualatex/luaset/")
+             (base32
+              "1xbr7m1fb71xnlc3p4lb2gz10i6bz6f4bbzyfcclggriq7bkv1iq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luaset")
+    (synopsis "Set Operations inside LaTeX documents using Lua")
+    (description
+     "The @code{luaset} package is developed to define finite sets and perform
+operations on them inside LaTeX documents.  There is no particular environment
+in the package for performing set operations.  The package commands can be
+used in any environment (including the mathematics environment).  It is
+written in Lua, and the @file{.tex} file is to be compiled with the LuaLaTeX
+engine.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 8db7053537194058459dd4cb8bcadd76b73fb64e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:59:27 +0200
Subject: gnu: Add texlive-luatexko.

* gnu/packages/tex.scm (texlive-luatexko): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ec483db7ba..2b6f3c4d4a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16845,6 +16845,28 @@ written in Lua, and the @file{.tex} file is to be compiled with the LuaLaTeX
 engine.")
     (license license:lppl1.3c)))
 
+(define-public texlive-luatexko
+  (package
+    (name "texlive-luatexko")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/luatexko/"
+                   "tex/luatex/luatexko/")
+             (base32
+              "0pbpi8g2bdakrl3lpb4vmsbvccjzcb4d6y2ivnv0pncn0k5zfmfv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luatexko")
+    (synopsis "Typeset Korean with Lua(La)TeX")
+    (description
+     "This is a Lua(La)TeX macro package that supports typesetting Korean
+documents including Old Hangul texts.  As LuaTeX has opened up access to
+almost all the hidden routines of TeX engine, users can obtain more beautiful
+outcome using this package rather than other Hangul macros operating on other
+engines.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 6a7cf8060cb55386049f4e432910d5b1dba03bc3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 14:59:40 +0200
Subject: gnu: Add texlive-luatextra.

* gnu/packages/tex.scm (texlive-luatextra): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2b6f3c4d4a..d35d641122 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16867,6 +16867,27 @@ outcome using this package rather than other Hangul macros operating on other
 engines.")
     (license license:lppl1.3c)))
 
+(define-public texlive-luatextra
+  (package
+    (name "texlive-luatextra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luatextra/"
+                   "source/lualatex/luatextra/"
+                   "tex/lualatex/luatextra/")
+             (base32
+              "1i82x51rcdll5r6x63j5qqahb277a1xdrzpck30xlggwwlns0jdc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luatextra")
+    (synopsis "Additional macros for Plain TeX and LaTeX in LuaTeX")
+    (description
+     "The package provides a coherent extended programming environment for use
+with LuaTeX.  It loads packages @code{fontspec}, @code{luatexbase} and
+@code{lualibs}, and provides additional user-level features and goodies.")
+    (license license:public-domain)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From c1449c68a2ebc4112260af4986926060ed1be9a2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:00:05 +0200
Subject: gnu: Add texlive-luatruthtable.

* gnu/packages/tex.scm (texlive-luatruthtable): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d35d641122..5181411310 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16888,6 +16888,29 @@ with LuaTeX.  It loads packages @code{fontspec}, @code{luatexbase} and
 @code{lualibs}, and provides additional user-level features and goodies.")
     (license license:public-domain)))
 
+(define-public texlive-luatruthtable
+  (package
+    (name "texlive-luatruthtable")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luatruthtable/"
+                   "tex/lualatex/luatruthtable/")
+             (base32
+              "18k0zk9zxfprcjxzkmfb2j1lk4ldk5hxi0ch1sy0n29f06qcl740")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luatruthtable")
+    (synopsis "Generate truth tables of boolean values in LuaLaTeX")
+    (description
+     "This package provides an easy way for generating truth tables of boolean
+values in LuaLaTeX. The time required for operations is no issue while
+compiling with LuaLaTeX. The package supports nesting of commands for multiple
+operations.  It can be modified or extended by writing custom lua programs.
+There is no need to install lua on users system as TeX distributions (TeX Live
+or MikTeX) come bundled with LuaLaTeX.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From a272567810af1768266c1e3d84735af19b5b23ec Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:02:09 +0200
Subject: gnu: Add texlive-luavlna.

* gnu/packages/tex.scm (texlive-luavlna): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5181411310..6de62dab47 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16911,6 +16911,32 @@ There is no need to install lua on users system as TeX distributions (TeX Live
 or MikTeX) come bundled with LuaLaTeX.")
     (license license:lppl1.3c)))
 
+(define-public texlive-luavlna
+  (package
+    (name "texlive-luavlna")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/luavlna/" "tex/luatex/luavlna/")
+             (base32
+              "1daa8gdkava15vvvfgr63mrq85l2ni0ydh9l17i9hyhw40mgz4bb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luavlna")
+    (synopsis
+     "Prevent line breaks after single letter words, units, or academic titles")
+    (description
+     "In some languages, like Czech or Polish, there should be no single
+letter words at the end of a line, according to typographical norms.  This
+package handles such situations using LuaTeX's callback mechanism.  In doing
+this, the package can detect languages used in the text and insert spaces only
+in parts of the document where languages requiring this feature are used.
+Another feature of this package is the inclusion of non-breakable space after
+initials (like in personal names), after or before academic degrees, and
+between numbers and units.  The package supports both plain LuaTeX and
+LuaLaTeX.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 44d4e37d0dabe7d57d822aa85857c3fa9794a06b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:02:32 +0200
Subject: gnu: Add texlive-luaxml.

* gnu/packages/tex.scm (texlive-luaxml): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6de62dab47..e31916ec1e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16937,6 +16937,25 @@ between numbers and units.  The package supports both plain LuaTeX and
 LuaLaTeX.")
     (license license:lppl1.3+)))
 
+(define-public texlive-luaxml
+  (package
+    (name "texlive-luaxml")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/luaxml/" "tex/luatex/luaxml/")
+             (base32
+              "0j0d9n87rigawqq3xlxk0zi5ry31zqg3p19jmfablvnb9lan3nrc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luaxml")
+    (synopsis "Lua library for reading and serialising XML files")
+    (description
+     "LuaXML is a pure Lua library for reading and serializing XML files.  The
+current release is aimed mainly at support for the @code{odsfile} package.")
+    ;; It uses explicitly the same license as Lua.
+    (license license:x11)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From dba39aa3f87358cbcc0b87b5dce8d098711d09bf Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:02:49 +0200
Subject: gnu: Add texlive-lutabulartools.

* gnu/packages/tex.scm (texlive-lutabulartools): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e31916ec1e..d81a425069 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16956,6 +16956,27 @@ current release is aimed mainly at support for the @code{odsfile} package.")
     ;; It uses explicitly the same license as Lua.
     (license license:x11)))
 
+(define-public texlive-lutabulartools
+  (package
+    (name "texlive-lutabulartools")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/lutabulartools/"
+                   "tex/luatex/lutabulartools/")
+             (base32
+              "1p7b1gv86xa09g1big3s88w0c8jiyj2bk2r8wq4n3pqqqr7zm79z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lutabulartools")
+    (synopsis "Some useful LuaLaTeX-based tabular tools")
+    (description
+     "This package provides some useful commands for tabular matter.  It uses
+LuaLaTeX and offers the ability to combine the facilities of multirow and
+makecell with an easy to use syntax.  It also adds some enhanced rules for the
+@code{booktabs} package.")
+    (license license:expat)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 1529c8d7321b1fc7181b593210d5f19c7082d7f4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:04:01 +0200
Subject: gnu: Add texlive-minim.

* gnu/packages/tex.scm (texlive-minim): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d81a425069..2419043a83 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16977,6 +16977,29 @@ makecell with an easy to use syntax.  It also adds some enhanced rules for the
 @code{booktabs} package.")
     (license license:expat)))
 
+(define-public texlive-minim
+  (package
+    (name "texlive-minim")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/minim/" "tex/luatex/minim/")
+             (base32
+              "056jp5rx9rhwshhzif58kx832jv1f1xw7zj1gh17g7zbyqzbc003")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/minim")
+    (synopsis "Modern plain format for the LuaTeX engine")
+    (description
+     "This is a modern plain format for the LuaTeX engine, adding improved
+low-level support for many LuaTeX extensions and newer PDF features.  While it
+can be used as drop-in replacement for plain TeX, it probably is most useful
+as a basis for your own formats.  Most features included in the format are
+provided by separate packages that can be used on their own; this package
+contains only their shared lowest-level programming interface, along with
+their combined format.")
+    (license license:eupl1.2)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From aa2672a92d85cf1b3082684606c7c72a600a27e0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:04:22 +0200
Subject: gnu: Add texlive-minim-math.

* gnu/packages/tex.scm (texlive-minim-math): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2419043a83..6ea67fcdb5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17000,6 +17000,28 @@ contains only their shared lowest-level programming interface, along with
 their combined format.")
     (license license:eupl1.2)))
 
+(define-public texlive-minim-math
+  (package
+    (name "texlive-minim-math")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/minim-math/"
+                   "tex/luatex/minim-math/")
+             (base32
+              "0793np84dx47c6wsmqrh3vj2y9w6p0l55nc4xl9b21xvgzzb0b5j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/minim-math")
+    (synopsis "Extensive maths for LuaTeX")
+    (description
+     "This package provides a simple and highly configurable way to use
+Unicode and OpenType mathematics with simple LuaTeX, taking advantage of most
+of the engine's new capabilities in mathematical typesetting.  Also included
+are the proper settings and definitions for almost all Unicode mathematical
+characters.")
+    (license license:eupl1.2)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 60d0ee5a4fd630c3e4991d74c989b8d86e3fa41d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:04:42 +0200
Subject: gnu: Add texlive-minim-mp.

* gnu/packages/tex.scm (texlive-minim-mp): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6ea67fcdb5..5973502b2f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17022,6 +17022,28 @@ are the proper settings and definitions for almost all Unicode mathematical
 characters.")
     (license license:eupl1.2)))
 
+(define-public texlive-minim-mp
+  (package
+    (name "texlive-minim-mp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/minim-mp/" "metapost/minim-mp/"
+                   "tex/luatex/minim-mp/")
+             (base32
+              "084k1ywvaq1mbz00kmbxd5kzp1da7a397dy3y25pbf7chrlxwsrk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/minim-mp")
+    (synopsis "Low-level mplib integration for LuaTeX")
+    (description
+     "This package offers low-level mplib integration for plain LuaTeX and is
+designed with the purpose of being easy to extend.  The use of multiple
+simultaneous MetaPost instances is supported, as well as running TeX or lua
+code from within MetaPost.  With the included @code{minim-mp} format file, you
+can even use LuaTeX as a stand-alone MetaPost compiler.")
+    (license license:eupl1.2)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 8ebd428f58d42cd71a9e5f15a1694437494ec05c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:04:53 +0200
Subject: gnu: Add texlive-minim-pdf.

* gnu/packages/tex.scm (texlive-minim-pdf): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5973502b2f..cfd8776105 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17044,6 +17044,26 @@ code from within MetaPost.  With the included @code{minim-mp} format file, you
 can even use LuaTeX as a stand-alone MetaPost compiler.")
     (license license:eupl1.2)))
 
+(define-public texlive-minim-pdf
+  (package
+    (name "texlive-minim-pdf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/minim-pdf/"
+                   "tex/luatex/minim-pdf/")
+             (base32
+              "10ls1i1141lh2f69r63wmvk2dg7j6g9gl0d0qk1m73byrg4zvbcp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/minim-pdf")
+    (synopsis "Low-level PDF integration for LuaTeX")
+    (description
+     "This package adds low-level support to plain LuaTeX for marking up the
+structure of a PDF document.  The implementation is rather basic, but should
+allow you to make your PDFs fully PDF/A-compliant.")
+    (license license:eupl1.2)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From 21e09455fc0c255bd95cbeebc1e06ffe4e85dd0d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:05:04 +0200
Subject: gnu: Add texlive-minim-xmp.

* gnu/packages/tex.scm (texlive-minim-xmp): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cfd8776105..7efe04edac 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17064,6 +17064,26 @@ structure of a PDF document.  The implementation is rather basic, but should
 allow you to make your PDFs fully PDF/A-compliant.")
     (license license:eupl1.2)))
 
+(define-public texlive-minim-xmp
+  (package
+    (name "texlive-minim-xmp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/minim-xmp/"
+                   "tex/luatex/minim-xmp/")
+             (base32
+              "1g50pal1vxcyl0xvdkbrk26z70kn8s38sqy5c848jdbl0fx29vla")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/minim-xmp")
+    (synopsis "Embed XMP metadata in PDF with LuaTeX")
+    (description
+     "This package enables the inclusion of XMP (eXtensible Metadata Platform)
+data in the pdf output generated by (plain) LuaTeX.  The use of XMP is
+required by PDF standards such as PDF/A.")
+    (license license:eupl1.2)))
+
 (define-public texlive-babel-czech
   (package
     (name "texlive-babel-czech")
-- 
cgit 1.4.1


From d822f3aaace66e0a8c2088f013091fef345048c9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:05:53 +0200
Subject: gnu: Add texlive-newpax.

* gnu/packages/tex.scm (texlive-newpax): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7efe04edac..68a5d92199 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6357,6 +6357,28 @@ the LaTeX standard foating environments @code{figure} and @code{table}.")
 
 (define-deprecated-package texlive-latex-newfloat texlive-newfloat)
 
+(define-public texlive-newpax
+  (package
+    (name "texlive-newpax")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/newpax/" "source/latex/newpax/"
+                   "tex/latex/newpax/")
+             (base32
+              "1b8z1k9gn0g1q6qyixgwds61b2844kiqb0sfvhn9x38fnqgzy83j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/newpax")
+    (synopsis "Experimental package to extract and reinsert PDF annotations")
+    (description
+     "The package is based on the @code{pax} package from Heiko Oberdiek.  It
+offers a Lua-based alternative to the java based @file{pax.jar} to extract the
+annotations from a PDF.  The resulting file can then be used together with
+@file{pax.sty}.  It also offers an extended style which works with all three
+major engines.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-newunicodechar
   (package
     (name "texlive-newunicodechar")
-- 
cgit 1.4.1


From 159cc006690ad38e94c584c04904a0b85758811f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:06:36 +0200
Subject: gnu: Add texlive-nodetree.

* gnu/packages/tex.scm (texlive-nodetree): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 68a5d92199..b6ab8b161f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6449,6 +6449,27 @@ collect an argument verbatim to either typeset or write it into a file.  The
 used to write the verbatim text to a file.")
     (license license:lppl1.3+)))
 
+(define-public texlive-nodetree
+  (package
+    (name "texlive-nodetree")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/nodetree/"
+                   "source/luatex/nodetree/"
+                   "tex/luatex/nodetree/")
+             (base32
+              "00lj7wykgc2r5pgijm9lxjrghq8bsx6whanzvsxcwf639mzv3528")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nodetree")
+    (synopsis "Visualize node lists in a tree view")
+    (description
+     "@code{nodetree} is a development package that visualizes the structure
+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-noto
   (package
     (name "texlive-noto")
-- 
cgit 1.4.1


From 44b1d7a1c46784beaee23ae2db08b3ec1374f069 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:07:18 +0200
Subject: gnu: Add texlive-odsfile.

* gnu/packages/tex.scm (texlive-odsfile): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b6ab8b161f..669730c78f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6545,6 +6545,27 @@ The documentation discusses methods to organise and print out any text into
 signatures, which can then be gathered, folded and sewn into a book.")
     (license license:lppl)))
 
+(define-public texlive-odsfile
+  (package
+    (name "texlive-odsfile")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/odsfile/"
+                   "tex/lualatex/odsfile/")
+             (base32
+              "03zfzwjhrrsw8z9v8jsd730iiqbc44s38jra36b0il4xqgbknyqg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/odsfile")
+    (synopsis "Read OpenDocument Spreadsheet documents as LaTeX tables")
+    (description
+     "The distribution includes a package and a Lua library that can together
+read OpenDocument spreadsheet documents as LaTeX tables.  Cells in the tables
+may be processed by LaTeX macros, so that, for example, the package may be
+used for drawing some plots.  The package uses Lua's @code{zip} library.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-pdftexcmds
   (package
     (name "texlive-pdftexcmds")
-- 
cgit 1.4.1


From 2bd23d2e262c96f9d167d53c3067c9954d752b8b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:08:39 +0200
Subject: gnu: Add texlive-librarian.

* gnu/packages/tex.scm (texlive-librarian): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 669730c78f..ec328238b8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10244,6 +10244,30 @@ The @code{mweights} package is used to manage the selection of font weights.")
                    license:silofl1.1
                    license:lppl))))
 
+(define-public texlive-librarian
+  (package
+    (name "texlive-librarian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/librarian/"
+                   "tex/generic/librarian/")
+             (base32
+              "1a40ac9vg2niafg6dd2iv0c5nrxqxz8vhh2awdw756xsd0znb5n0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/librarian")
+    (synopsis "Tools to create bibliographies in TeX")
+    (description
+     "The package extracts information in @file{.bib} files, makes it
+available in the current document, and sorts lists of entries according to
+that information and the user's specifications.  Citation and bibliography
+styles can then be written directly in TeX, without any use of BibTeX.  The
+package works with all formats that use plain TeX's basic syntactic sugar; the
+distribution includes a third-party file for ConTeXt and a style file for
+LaTeX.")
+    (license license:lppl)))
+
 (define-public texlive-dejavu
   (package
     (name "texlive-dejavu")
-- 
cgit 1.4.1


From 1e87a0cf99ed5d7a63d1b2a26c492cecbeb0fe76 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:09:24 +0200
Subject: gnu: Add texlive-optex.

* gnu/packages/tex.scm (texlive-optex): New variable.
---
 gnu/packages/tex.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ec328238b8..d3c8e04fd2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11450,6 +11450,42 @@ and back-ends.  It also ensures compatibility with the @code{media9} and
 
 (define-deprecated-package texlive-latex-ocgx2 texlive-ocgx2)
 
+(define-public texlive-optex
+  (package
+    (name "texlive-optex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/optex.1"
+                   "doc/man/man1/optex.man1.pdf"
+                   "doc/optex/base/"
+                   "tex/optex/base/"
+                   "tex/optex/demo/"
+                   "tex/optex/pkg/")
+             (base32
+              "0bcrj9wrimcd2pxrcfk7x3vkhxzij4422l19a8j4h299lkq3pbx0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:create-formats #~(list "optex")))
+    (propagated-inputs
+     (list texlive-amsfonts
+           texlive-cm
+           texlive-ec
+           texlive-hyphen-base
+           texlive-librarian
+           texlive-lm
+           texlive-luaotfload
+           texlive-luatex
+           texlive-rsfs
+           texlive-unicode-data))
+    (home-page "https://ctan.org/pkg/optex")
+    (synopsis "LuaTeX format based on Plain TeX and OPmac")
+    (description
+     "OpTeX is a LuaTeX format based on Plain TeX macros with power from
+OPmac (fonts selection system, colors, external graphics, references,
+hyperlinks, ...) with Unicode fonts.")
+    (license license:public-domain)))
+
 (define-public texlive-ms
   (package
     (name "texlive-ms")
-- 
cgit 1.4.1


From 7898ba2b5d97d0302722738f3770aaeafc12c58c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:09:52 +0200
Subject: gnu: Add texlive-pdfarticle.

* gnu/packages/tex.scm (texlive-pdfarticle): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d3c8e04fd2..605acbb98f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11750,6 +11750,25 @@ it comes from a typewriter.  The package also offers double and wavy
 underlining, and striking out, and crossing out.")
     (license license:lppl1.3c+)))
 
+(define-public texlive-pdfarticle
+  (package
+    (name "texlive-pdfarticle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/pdfarticle/"
+                   "tex/lualatex/pdfarticle/")
+             (base32
+              "16cy8n3hws1gm3bsv3h4mwnpvaajiy5sj6hpchy0r9hq28liara4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pdfarticle")
+    (synopsis "Class for PDF publications")
+    (description
+     "pdfArticle is simple document class dedicated for creating PDF documents
+with LuaLaTeX.")
+    (license license:expat)))
+
 (define-public texlive-pgf
   (package
     (name "texlive-pgf")
-- 
cgit 1.4.1


From 59befed247b169905bc5f51430e082df39fa101c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:10:20 +0200
Subject: gnu: Add texlive-pdfextra.

* gnu/packages/tex.scm (texlive-pdfextra): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 605acbb98f..21ba24c319 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11769,6 +11769,29 @@ underlining, and striking out, and crossing out.")
 with LuaLaTeX.")
     (license license:expat)))
 
+(define-public texlive-pdfextra
+  (package
+    (name "texlive-pdfextra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/optex/pdfextra/" "tex/luatex/pdfextra/"
+                   "tex/optex/pdfextra/")
+             (base32
+              "0vv7vidcvi6c9bg9rdp00d324d3xfyazpwlc7l4vggz1w6n8l96y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pdfextra")
+    (synopsis "Extra PDF features for (Op)TeX")
+    (description
+     "This package provides extra PDF features for OpTeX (or in limited form
+for plain LuaTeX and LuaLaTeX).  As a minimalistic format, OpTeX does not
+support advanced features of the PDF file format in its base.  This third
+party package aims to provide them.  As such, it supports insertion of
+multimedia (audio, video, 3D), hyperlinks and other actions, triggering
+events, transitions, and attachments.")
+    (license license:bsd-0)))
+
 (define-public texlive-pgf
   (package
     (name "texlive-pgf")
-- 
cgit 1.4.1


From 428c0277aa9462193598fb11bb042f64d7e4f77f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:10:42 +0200
Subject: gnu: Add texlive-penlight.

* gnu/packages/tex.scm (texlive-penlight): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 21ba24c319..ee08697703 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11792,6 +11792,25 @@ multimedia (audio, video, 3D), hyperlinks and other actions, triggering
 events, transitions, and attachments.")
     (license license:bsd-0)))
 
+(define-public texlive-penlight
+  (package
+    (name "texlive-penlight")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/penlight/"
+                   "tex/luatex/penlight/")
+             (base32
+              "1jdq8x0rbknlvrlh2wc7q5gd463xhi845ajkkiirz65n23m7wyg6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/penlight")
+    (synopsis "Penlight Lua libraries made available to LuaLaTeX users")
+    (description
+     "This LuaLaTeX package provides a wrapper to use the penlight Lua
+libraries with LuaLaTeX, with some extra functionality added.")
+    (license license:expat)))
+
 (define-public texlive-pgf
   (package
     (name "texlive-pgf")
-- 
cgit 1.4.1


From 68fba23584dc0c42efa95b9541e26a6d8766f1bb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:11:04 +0200
Subject: gnu: Add texlive-piton.

* gnu/packages/tex.scm (texlive-piton): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ee08697703..54ecaae881 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11877,6 +11877,26 @@ output.")
 
 (define-deprecated-package texlive-latex-pgf texlive-pgf)
 
+(define-public texlive-piton
+  (package
+    (name "texlive-piton")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/piton/"
+                   "source/lualatex/piton/"
+                   "tex/lualatex/piton/")
+             (base32
+              "123ir1hnla5klkvb13qw1mkfnpbwk61lxli0851qf33g72c8qc4r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/piton")
+    (synopsis "Typeset Python listings with LPEG")
+    (description
+     "This package uses the Lua library LPEG to typeset and highlight Python
+listings.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-koma-script
   (package
     (name "texlive-koma-script")
-- 
cgit 1.4.1


From e764edcbd068eeb7ba223bbcb87f55efa0850f8f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:11:21 +0200
Subject: gnu: Add texlive-placeat.

* gnu/packages/tex.scm (texlive-placeat): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 54ecaae881..a3674f06a3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11897,6 +11897,29 @@ output.")
 listings.")
     (license license:lppl1.3+)))
 
+(define-public texlive-placeat
+  (package
+    (name "texlive-placeat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/placeat/" "scripts/placeat/"
+                   "source/lualatex/placeat/"
+                   "tex/lualatex/placeat/")
+             (base32
+              "0lwr71sxrs1idy2nqqn2xsi3pmgv0hyfkhhiyir53cix203n18aq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/placeat")
+    (synopsis "Absolute content positioning")
+    (description
+     "The package provides commands so that the user of LuaLaTeX may position
+arbitrary content at any position specified by absolute coordinates on the
+page.  The package draws a grid on each page of the document, to aid
+positioning (the grid may be disabled, for final copy using the command
+\\placeatsetup).")
+    (license license:lppl1.3+)))
+
 (define-public texlive-koma-script
   (package
     (name "texlive-koma-script")
-- 
cgit 1.4.1


From ca948a85ed5ac3c988d860c2220af9583e1ad150 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:11:58 +0200
Subject: gnu: Add texlive-plantuml.

* gnu/packages/tex.scm (texlive-plantuml): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a3674f06a3..6abf65eeb7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11920,6 +11920,28 @@ positioning (the grid may be disabled, for final copy using the command
 \\placeatsetup).")
     (license license:lppl1.3+)))
 
+(define-public texlive-plantuml
+  (package
+    (name "texlive-plantuml")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/plantuml/"
+                   "tex/lualatex/plantuml/")
+             (base32
+              "00ram4dm1n7v9xd50xhvp1jxih4y431sq05snqaxj292ib0yh5b8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/plantuml")
+    (synopsis
+     "Support for rendering UML diagrams using syntax and tool of PlantUML")
+    (description
+     "The package provides support for rendering UML diagrams using the syntax
+and tools of PlantUML.  The PlantUML syntax is very short and thus enables
+quickly specifying UML diagrams.  Using @command{dot}, PlantUML layouts the
+diagrams.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-koma-script
   (package
     (name "texlive-koma-script")
-- 
cgit 1.4.1


From 165a78e46871c1d75eedab27d5b3b0d8fb2124fa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:12:40 +0200
Subject: gnu: Add texlive-pyluatex.

* gnu/packages/tex.scm (texlive-pyluatex): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6abf65eeb7..88d9f66f99 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11942,6 +11942,31 @@ quickly specifying UML diagrams.  Using @command{dot}, PlantUML layouts the
 diagrams.")
     (license license:lppl1.3c)))
 
+(define-public texlive-pyluatex
+  (package
+    (name "texlive-pyluatex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/pyluatex/"
+                   "tex/lualatex/pyluatex/")
+             (base32
+              "0dwqi0m3qf6s41wpavngq1c4wn8yjfas798r4a53wr20y3ajhqnn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pyluatex")
+    (synopsis "Execute Python code on the fly in your LaTeX documents")
+    (description
+     "PyLuaTeX allows you to execute Python code and to include the resulting
+output in your LaTeX documents in a single compilation run.  LaTeX documents
+must be compiled with LuaLaTeX for this to work.  PyLuaTeX runs a Python
+InteractiveInterpreter (actually several if you use different sessions) in the
+background for on-the-fly code execution.  Python code from your LaTeX file is
+sent to the background interpreter through a TCP socket.  This approach allows
+your Python code to be executed and the output to be integrated in your LaTeX
+file in a single compilation run.")
+    (license (list license:expat license:lppl1.3c))))
+
 (define-public texlive-koma-script
   (package
     (name "texlive-koma-script")
-- 
cgit 1.4.1


From 660afab5fb17a7513b3e47d125ec3c4aad9844ac Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:13:31 +0200
Subject: gnu: Add texlive-scikgtex.

* gnu/packages/tex.scm (texlive-scikgtex): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 88d9f66f99..2cd40810e2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13794,6 +13794,29 @@ keys.")
 
 (define-deprecated-package texlive-latex-xkeyval texlive-xkeyval)
 
+(define-public texlive-scikgtex
+  (package
+    (name "texlive-scikgtex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/scikgtex/"
+                   "tex/lualatex/scikgtex/")
+             (base32
+              "0p7y7qd5kmlhr4v72x8krxihzjm80fkb65wh28rr2r54rw8ag3hc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/scikgtex")
+    (synopsis
+     "Mark research contributions in scientific documents and embed them in PDF metadata")
+    (description
+     "Scientific Knowledge Graph TeX (SciKgTeX) is a LuaLaTeX package which
+makes it possible to annotate specific research contributions in scientific
+documents.  SciKGTeX will enrich the document by adding the marked
+contributions to PDF metadata in a structured XMP format which can be picked
+up by search engines and knowledge graphs.")
+    (license license:expat)))
+
 (define-public texlive-standalone
   (package
     (name "texlive-standalone")
-- 
cgit 1.4.1


From 07eb98079ecc8d45cfb85bd4af922b5ccfbb0981 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:14:18 +0200
Subject: gnu: Add texlive-selnolig.

* gnu/packages/tex.scm (texlive-selnolig): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2cd40810e2..87ac4b0b6c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13817,6 +13817,26 @@ contributions to PDF metadata in a structured XMP format which can be picked
 up by search engines and knowledge graphs.")
     (license license:expat)))
 
+(define-public texlive-selnolig
+  (package
+    (name "texlive-selnolig")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/selnolig/"
+                   "tex/lualatex/selnolig/")
+             (base32
+              "0xx3agmd7ply84jjx1kcg4jpix7qg1y3wrd2kr7dv74jw5cffrfq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/selnolig")
+    (synopsis "Selectively disable typographic ligatures")
+    (description
+     "The package suppresses typographic ligatures selectively, i.e., based on
+predefined search patterns.  The search patterns focus on ligatures deemed
+inappropriate because they span morpheme boundaries.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-standalone
   (package
     (name "texlive-standalone")
-- 
cgit 1.4.1


From 86556e6bb9fca81d26036cc5652e482678bee875 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:14:40 +0200
Subject: gnu: Add texlive-showhyphenation.

* gnu/packages/tex.scm (texlive-showhyphenation): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 87ac4b0b6c..c831b3b9d1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13837,6 +13837,28 @@ predefined search patterns.  The search patterns focus on ligatures deemed
 inappropriate because they span morpheme boundaries.")
     (license license:lppl1.3+)))
 
+(define-public texlive-showhyphenation
+  (package
+    (name "texlive-showhyphenation")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/showhyphenation/"
+                   "tex/lualatex/showhyphenation/")
+             (base32
+              "0v8rjr828pzcn85zqbrw3fnrfyvn7cscqyg5mm08wyay990lkhny")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/showhyphenation")
+    (synopsis "Marking of hyphenation points")
+    (description
+     "The package shows the hyphenation points in the document by either
+inserting small triangles below the baseline or by typesetting explicit
+hyphens.  The markers are correctly placed even within ligatures and their
+size adjusts to the font size.  By option the markers can be placed behind or
+in front of the glyphs.  The package requires LuaLaTeX.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-standalone
   (package
     (name "texlive-standalone")
-- 
cgit 1.4.1


From 30b7a6393eec55eb9453f4cbe60b67c629a86339 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:14:58 +0200
Subject: gnu: Add texlive-showkerning.

* gnu/packages/tex.scm (texlive-showkerning): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c831b3b9d1..b044020353 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13859,6 +13859,28 @@ size adjusts to the font size.  By option the markers can be placed behind or
 in front of the glyphs.  The package requires LuaLaTeX.")
     (license license:lppl1.3c)))
 
+(define-public texlive-showkerning
+  (package
+    (name "texlive-showkerning")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/showkerning/"
+                   "tex/lualatex/showkerning/")
+             (base32
+              "0kd20scd9mv7zmsfz9wy321j07fwkll94cbfpqllzn0jk80qgxgm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/showkerning")
+    (synopsis "Showing kerns in a document")
+    (description
+     "The package displays all kerning values in the form of colored bars
+directly at the respective position in the document.  Positive values are
+displayed in green, negative values in red.  The width of the bars corresponds
+exactly to the respective kerning value.  By option the bars can be placed
+behind or in front of the glyphs.  The package requires LuaLaTeX.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-standalone
   (package
     (name "texlive-standalone")
-- 
cgit 1.4.1


From 4ea050858f9d059b8e0bcb47c9ddb2a40ccd1f55 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:15:16 +0200
Subject: gnu: Add texlive-spacekern.

* gnu/packages/tex.scm (texlive-spacekern): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b044020353..98481761b3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13881,6 +13881,26 @@ exactly to the respective kerning value.  By option the bars can be placed
 behind or in front of the glyphs.  The package requires LuaLaTeX.")
     (license license:lppl1.3c)))
 
+(define-public texlive-spacekern
+  (package
+    (name "texlive-spacekern")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/spacekern/"
+                   "tex/lualatex/spacekern/")
+             (base32
+              "0rmdg9daqp0fallznsqsr0475z7cw0djhxq6dwkyk5yg8ii9c6s9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/spacekern")
+    (synopsis "Kerning between words and against space")
+    (description
+     "This package provides two shorthands for typesetting breaking and
+non-breaking small spaces, where both hyphenation and kerning against space
+are correctly applied.  Additionally, interword kerning can be applied.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-standalone
   (package
     (name "texlive-standalone")
-- 
cgit 1.4.1


From dd53cac90eeea23df5829ff8260103941a9573d7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:15:44 +0200
Subject: gnu: Add texlive-spelling.

* gnu/packages/tex.scm (texlive-spelling): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 98481761b3..6554ee9e30 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13901,6 +13901,28 @@ non-breaking small spaces, where both hyphenation and kerning against space
 are correctly applied.  Additionally, interword kerning can be applied.")
     (license license:lppl1.3c)))
 
+(define-public texlive-spelling
+  (package
+    (name "texlive-spelling")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/spelling/" "scripts/spelling/"
+                   "tex/luatex/spelling/")
+             (base32
+              "1pg4jz1rxpjc9648b53zbnwrn59id9iv8b1jfwl6nqj58q285w7q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/spelling")
+    (synopsis "Support for spell-checking of LuaTeX documents")
+    (description
+     "The package aids spell-checking of TeX documents compiled with the
+LuaTeX engine.  It can give visual feedback in PDF output similar to WYSIWYG
+word processors.  The package relies on an external spell-checker application
+to check spelling of a text file and to output a list of bad spellings.  The
+package should work with most spell-checkers, even dumb, TeX-unaware ones.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-standalone
   (package
     (name "texlive-standalone")
-- 
cgit 1.4.1


From 7dcb4e9e15b6459e25bc25545371219491536255 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:17:29 +0200
Subject: gnu: Add texlive-stricttex.

* gnu/packages/tex.scm (texlive-stricttex): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6554ee9e30..756cbe02bd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13955,6 +13955,27 @@ By default the @code{preview} package is used to display the typeset code
 without margins.")
     (license license:lppl1.3+)))
 
+(define-public texlive-stricttex
+  (package
+    (name "texlive-stricttex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/stricttex/"
+                   "tex/lualatex/stricttex/")
+             (base32
+              "1ddlcwj1bnj6zrkljkz3jywgri34f4g9gshbwd0lzz4nz03v82rv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/stricttex")
+    (synopsis "Strictly balanced brackets and numbers in command names")
+    (description
+     "This is a small, LuaLaTeX-only package providing you with three,
+sometimes useful features.  It allows you to make brackets @samp{[...]}
+strict, meaning that each @samp{[} must be balanced by a @samp{]}.  It also
+allows you to use numbers and primes in command names.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-siunitx
   (package
     (name "texlive-siunitx")
-- 
cgit 1.4.1


From 71f2166aab4e2431d881c55a728878c8c3286673 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:17:56 +0200
Subject: gnu: Add texlive-truthtable.

* gnu/packages/tex.scm (texlive-truthtable): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 756cbe02bd..398c7004ac 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -14137,6 +14137,27 @@ automates most of the guidelines in the APA 7th edition style guide for
 citations and references.")
     (license license:lppl1.3c)))
 
+(define-public texlive-truthtable
+  (package
+    (name "texlive-truthtable")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/truthtable/"
+                   "tex/lualatex/truthtable/")
+             (base32
+              "193326nni5xnjkz9hhc1pjzkv0qrbz73irz6vixd8igpbavi2dzv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/truthtable")
+    (synopsis
+     "Automatically generate truth tables for given variables and statements")
+    (description
+     "This LuaLaTeX package permits to automatically generate truth tables
+given a table header.  It supports a number of logical operations which can be
+combined as needed.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-todonotes
   (package
     (name "texlive-todonotes")
-- 
cgit 1.4.1


From e331b8731748804faba177be493e37063682f48c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:18:23 +0200
Subject: gnu: Add texlive-tsvtemplate.

* gnu/packages/tex.scm (texlive-tsvtemplate): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 398c7004ac..4e75bcd2b9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -14181,6 +14181,26 @@ a simple and visually appealing way.  The package takes several options to
 enable customization and finetuning of the visual appearance.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tsvtemplate
+  (package
+    (name "texlive-tsvtemplate")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/tsvtemplate/"
+                   "tex/luatex/tsvtemplate/")
+             (base32
+              "05q1vfsy9w0pmc489dl995iqr9srdv107mj89nlc269m3wjnwn7a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tsvtemplate")
+    (synopsis "Apply a template to a TSV file")
+    (description
+     "This is a simple TSV (tab-separated values) reader for LuaLaTeX and
+plain LuaTeX.  It also supports (non-quoted) comma-separated values, or indeed
+values separated by any character.")
+    (license license:eupl1.2)))
+
 (define-public texlive-units
   (package
     (name "texlive-units")
-- 
cgit 1.4.1


From 4ee871537b899af7401db3f731254342619682ab Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:18:46 +0200
Subject: gnu: Add texlive-typewriter.

* gnu/packages/tex.scm (texlive-typewriter): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4e75bcd2b9..3c4a1e219d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -14201,6 +14201,26 @@ plain LuaTeX.  It also supports (non-quoted) comma-separated values, or indeed
 values separated by any character.")
     (license license:eupl1.2)))
 
+(define-public texlive-typewriter
+  (package
+    (name "texlive-typewriter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/typewriter/"
+                   "tex/lualatex/typewriter/")
+             (base32
+              "00c53vbm8fchjggi3h1w49y07ma4cmmliqx2bhkvis6qsqgddw5f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/typewriter")
+    (synopsis "Typeset with a randomly variable monospace font")
+    (description
+     "The typewriter package uses the OpenType Computer Modern Unicode
+Typewriter font, together with a LuaTeX virtual font setup that introduces
+random variability in grey level and angle of each character.")
+    (license license:lppl)))
+
 (define-public texlive-units
   (package
     (name "texlive-units")
-- 
cgit 1.4.1


From 40d46e6522020c85da8c19506d2a57bf26296f5c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:19:03 +0200
Subject: gnu: Add texlive-uninormalize.

* gnu/packages/tex.scm (texlive-uninormalize): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3c4a1e219d..08fe4ac441 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -14221,6 +14221,25 @@ Typewriter font, together with a LuaTeX virtual font setup that introduces
 random variability in grey level and angle of each character.")
     (license license:lppl)))
 
+(define-public texlive-uninormalize
+  (package
+    (name "texlive-uninormalize")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/uninormalize/"
+                   "tex/lualatex/uninormalize/")
+             (base32
+              "1c4pki1yw5599s9nyj1ir7j26mgbhf1iw7m44685d8la9vbzv8dm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uninormalize")
+    (synopsis "Unicode normalization support")
+    (description
+     "This package provides Unicode normalization (useful for composed
+characters) for LuaLaTeX.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-units
   (package
     (name "texlive-units")
-- 
cgit 1.4.1


From bbf868fcdb429ebc0da459c41fcd8e7adb110cf7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:19:23 +0200
Subject: gnu: Add texlive-yamlvars.

* gnu/packages/tex.scm (texlive-yamlvars): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 08fe4ac441..ed2625b7e5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13567,6 +13567,25 @@ standards-compliant PDF documents with pdfTeX, LuaTeX and XeTeX.")
 
 (define-deprecated-package texlive-latex-pdfx texlive-pdfx)
 
+(define-public texlive-yamlvars
+  (package
+    (name "texlive-yamlvars")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/yamlvars/"
+                   "tex/lualatex/yamlvars/")
+             (base32
+              "0r9xqjbag1kvyiz369nbz1w15ij5b3bw9msxrnz4864wn2b50cf0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/yamlvars")
+    (synopsis "YAML parser and tool for easy LaTeX definition creation")
+    (description
+     "This LuaLaTeX package provides a YAML parser and some functions to
+declare and define LaTeX definitions using YAML files.")
+    (license license:expat)))
+
 (define-public texlive-yax
   (package
     (name "texlive-yax")
-- 
cgit 1.4.1


From 81ccfeb928f796e8036859a003dac2a4b5eec566 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jun 2023 15:19:58 +0200
Subject: gnu: Add texlive-collection-luatex.

* gnu/packages/tex.scm (texlive-collection-luatex): New variable.
---
 gnu/packages/tex.scm | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ed2625b7e5..7038734bae 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -15524,6 +15524,118 @@ used and strongly recommended in practice.")
 LaTeX which have widespread use.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-collection-luatex
+  (package
+    (name "texlive-collection-luatex")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-addliga
+           texlive-auto-pst-pdf-lua
+           texlive-barracuda
+           texlive-bezierplot
+           texlive-blopentype
+           texlive-checkcites
+           texlive-chickenize
+           texlive-chinese-jfm
+           texlive-cloze
+           texlive-collection-basic
+           texlive-combofont
+           texlive-cstypo
+           texlive-ctablestack
+           texlive-ekdosis
+           texlive-emoji
+           texlive-emojicite
+           texlive-enigma
+           texlive-innerscript
+           texlive-interpreter
+           texlive-kanaparser
+           texlive-ligtype
+           texlive-linebreaker
+           texlive-lparse
+           texlive-lt3luabridge
+           texlive-lua-typo
+           texlive-lua-uca
+           texlive-lua-ul
+           texlive-lua-uni-algos
+           texlive-lua-visual-debug
+           texlive-lua-widow-control
+           texlive-luaaddplot
+           texlive-luacas
+           texlive-luacensor
+           texlive-luacode
+           texlive-luacolor
+           texlive-luacomplex
+           texlive-luagcd
+           texlive-luahyphenrules
+           texlive-luaimageembed
+           texlive-luaindex
+           texlive-luainputenc
+           texlive-luaintro
+           texlive-luakeys
+           texlive-lualatex-doc
+           texlive-lualatex-math
+           texlive-lualatex-truncate
+           texlive-lualibs
+           texlive-lualinalg
+           texlive-luamathalign
+           texlive-luamaths
+           texlive-luamodulartables
+           texlive-luamplib
+           texlive-luaoptions
+           texlive-luaotfload
+           texlive-luapackageloader
+           texlive-luaprogtable
+           texlive-luaquotes
+           texlive-luarandom
+           texlive-luaset
+           texlive-luatex85
+           texlive-luatexbase
+           texlive-luatexko
+           texlive-luatextra
+           texlive-luatruthtable
+           texlive-luavlna
+           texlive-luaxml
+           texlive-lutabulartools
+           texlive-minim
+           texlive-minim-math
+           texlive-minim-mp
+           texlive-minim-pdf
+           texlive-minim-xmp
+           texlive-newpax
+           texlive-nodetree
+           texlive-odsfile
+           texlive-optex
+           texlive-pdfarticle
+           texlive-pdfextra
+           texlive-penlight
+           texlive-piton
+           texlive-placeat
+           texlive-plantuml
+           texlive-pyluatex
+           texlive-scikgtex
+           texlive-selnolig
+           texlive-showhyphenation
+           texlive-showkerning
+           texlive-spacekern
+           texlive-spelling
+           texlive-stricttex
+           texlive-truthtable
+           texlive-tsvtemplate
+           texlive-typewriter
+           texlive-uninormalize
+           texlive-yamlvars))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "LuaTeX packages")
+    (description
+     "Packages for LuaTeX, a TeX engine using Lua as an embedded scripting and
+extension language, with native support for Unicode, OpenType/TrueType fonts,
+and both PDF and DVI output.  The LuaTeX engine itself, and plain formats, are
+in @code{collection-basic}.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-collection-metapost
   (package
     (name "texlive-collection-metapost")
-- 
cgit 1.4.1


From 350562e9f4da628312239c291ba399a2172bdadb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 27 Jun 2023 15:11:18 +0200
Subject: doc: Update TeX Live related documentation.

* doc/guix.texi (Invoking guix import): "texlive.tlpdb" is located in
TEXLIVE-SCRIPTS package.
(Using TeX and LaTeX): Mention collections and schemes as a starting point.
Illustrate it with an updated example.  Update tiny TODO list.  Fix call to
"tlmgr".
---
 doc/guix.texi | 57 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 2c460cbc08..1d8ebcd72f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14088,9 +14088,10 @@ TeX packages that are part of the @uref{https://www.tug.org/texlive/,
 TeX Live distribution}.
 
 Information about the package is obtained from the TeX Live package
-database, a plain text file that is included in the @code{texlive-bin}
-package.  The source code is downloaded from possibly multiple locations
-in the SVN repository of the Tex Live project.
+database, a plain text file that is included in the
+@code{texlive-scripts} package.  The source code is downloaded from
+possibly multiple locations in the SVN repository of the Tex Live
+project.
 
 The command command below imports metadata for the @code{fontspec}
 TeX package:
@@ -45406,14 +45407,19 @@ single @TeX{} Live package} (more than 7,000 of them), but it is huge
 (more than 4@tie{}GiB for a single package!).
 
 @item
-The ``modular'' @code{texlive-} packages: you install
-@code{texlive-base}, which provides core functionality and the main
+The ``modular'' @samp{texlive-} packages: you start off with
+a combination of @TeX{} Live @dfn{collections} and
+@dfn{schemes}---``meta-packages'' such as
+@code{texlive-collection-fontsrecommended}, or
+@code{texlive-collection-context}, that provide the set of packages
+needed in this particular domain, schemes being the name for collections
+of such collections.  This grants you core functionality and the main
 commands---@command{pdflatex}, @command{dvips}, @command{luatex},
-@command{mf}, etc.---together with individual packages that provide just
-the features you need---@code{texlive-listings} for the
-@code{listings} package, @code{texlive-hyperref} for @code{hyperref},
-@code{texlive-beamer} for Beamer, @code{texlive-pgf} for PGF/TikZ,
-and so on.
+@command{mf}, etc.  You can then complete your selection with additional
+collections or individual packages that provide just the features you
+need---@code{texlive-listings} for the @code{listings} package,
+@code{texlive-beamer} for Beamer, @code{texlive-pgf} for PGF/TikZ, and
+so on.
 @end itemize
 
 We recommend using the modular package set because it is much less
@@ -45421,29 +45427,29 @@ resource-hungry.  To build your documents, you would use commands such
 as:
 
 @example
-guix shell texlive-base texlive-wrapfig \
-  texlive-hyperref texlive-cm-super -- pdflatex doc.tex
+guix shell texlive-scheme-basic texlive-cm-super -- pdflatex doc.tex
 @end example
 
 You can quickly end up with unreasonably long command lines though.  The
-solution is to instead write a manifest, for example like this one:
+solution is to instead write a manifest, for example like this one,
+which would probably be a reasonable starting point for a French
+@LaTeX{} user:
 
 @lisp
 (specifications->manifest
  '("rubber"
 
-   "texlive-base"
-   "texlive-wrapfig"
+   "texlive-scheme-basic"
+   "texlive-collection-latexrecommended"
+   "texlive-collection-fontsrecommended"
 
-   "texlive-microtype"
-   "texlive-listings" "texlive-hyperref"
+   "texlive-babel-french"
 
    ;; PGF/TikZ
    "texlive-pgf"
 
-   ;; Additional fonts.
-   "texlive-cm-super" "texlive-amsfonts"
-   "texlive-times" "texlive-helvetic" "texlive-courier"))
+   ;; Additional font.
+   "texlive-kpfonts"))
 @end lisp
 
 You can then pass it to any command with the @option{-m} option:
@@ -45452,12 +45458,9 @@ You can then pass it to any command with the @option{-m} option:
 guix shell -m manifest.scm -- pdflatex doc.tex
 @end example
 
-@xref{Writing Manifests}, for more on
-manifests.  In the future, we plan to provide packages for @TeX{} Live
-@dfn{collections}---``meta-packages'' such as @code{fontsrecommended},
-@code{humanities}, or @code{langarabic} that provide the set of packages
-needed in this particular domain.  That will allow you to list fewer
-packages.
+@xref{Writing Manifests}, for more on manifests.  In the future, we plan
+to provide more collections and schemes.  That will allow you to list
+fewer packages.
 
 The main difficulty here is that using the modular package set forces
 you to select precisely the packages that you need.  You can use
@@ -45493,7 +45496,7 @@ you can search the @TeX{} Live package database using the @command{tlmgr}
 command:
 
 @example
-$ guix shell texlive-base -- tlmgr info phvr7t
+$ guix shell texlive-bin -- tlmgr info phvr7t
 tlmgr: cannot find package phvr7t, searching for other matches:
 
 Packages containing `phvr7t' in their title/description:
-- 
cgit 1.4.1


From d61cd4aebeff01343ea5562cf80f1365ed2dfa6a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 27 Jun 2023 15:34:12 +0200
Subject: gnu: tex: Comment about the Guix-specific packages in the module.

* gnu/packages/tex.scm: Comment about the Guix-specific packages in the module.
---
 gnu/packages/tex.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7038734bae..85eeddea3c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -104,6 +104,55 @@
   #:use-module (ice-9 match)
   #:use-module ((srfi srfi-1) #:hide (zip)))
 
+;;; Commentary:
+;;;
+;;; This module aims at being as faithful as possible to TeX Live
+;;; distribution.  Yet, some of the packages in this module are Guix specific.
+;;; The following paragraphs describe them.
+;;;
+;;; Guix provides two different TeX Live systems: one monolithic, the TEXLIVE
+;;; package, and the other modular.  Both are built from TEXLIVE-LIBKPATHSEA,
+;;; which is therefore the starting of any TeX Live update.  Both also rely on
+;;; TEXLIVE-SCRIPTS, which contains core scripts and related files---although
+;;; monolithic TeX Live only makes use of its source.  At that point, both
+;;; systems diverge.
+;;;
+;;; On the one hand, the monolithic TeX Live merges TEXLIVE-BIN-FULL and
+;;; TEXLIVE-TEXMF in order to create TEXLIVE.
+;;;
+;;; On the other hand, modular TeX Live relies on TEXLIVE-BIN, which is
+;;; provided as a mandatory native input in the texlive build system.  Unlike
+;;; TEXLIVE-BIN-FULL, it doesn't provide any script (but still include all the
+;;; binaries; this might change in the future).  Then the system builds its
+;;; way towards regular `texlive-latex-bin' package, which is a convenient
+;;; native input (that can be ignored) for most TeX Live packages.  Those
+;;; earlier in the build chain need the TEXLIVE-DOCSTRIP package to still be
+;;; able to generate their runfiles.
+;;;
+;;; Default font map files are updated in a profile hook (see
+;;; `texlive-font-maps' in "profiles.scm").  However, this option is not
+;;; available when building documentation for a package.  Consequently, this
+;;; module also provides TEXLIVE-UPDMAP.CFG function, which creates a TeX Live
+;;; tree with font map files updates.  It should be used exclusively for
+;;; package definitions, as a native input.  It is possible to augment that
+;;; tree, in particular with additional font packages.  TEXLIVE-TINY package
+;;; is a shortcut for TEXLIVE-UPDMAP.CFG called without any additional
+;;; package.
+;;;
+;;; Unlike font map files, TeX formats are not built from a profile hook, as
+;;; the process would be too time-consuming, e.g., when invoking "guix shell".
+;;; Instead, those are generated when the corresponding package is built.  It
+;;; is therefore not possible for the build system to take into consideration
+;;; hyphenation rules installed after a given format has been built.  To work
+;;; around this, all hyphenations rules are packed into
+;;; TEXLIVE-HYPHEN-COMPLETE, and all formats, being built with it, include all
+;;; rules right from the start.
+;;;
+;;; Any other "texlive-name" package matches the "name" TeX Live package, as
+;;; defined in the "texlive.tlpdb" file.
+;;;
+;;; Code:
+
 (define-syntax-rule (define-deprecated-package old-name name)
   "Define OLD-NAME as a deprecated package alias for NAME."
   (define-deprecated/public old-name name
-- 
cgit 1.4.1


From 0bdaff931323865536c96f10a2d6e83aab12378d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 28 Jun 2023 23:56:27 +0200
Subject: gnu: texlive-epstopdf: Add missing "repstopdf" symlink.

* gnu/packages/tex.scm (texlive-epstopdf)[arguments]<#:phases>: Add missing
"repstopdf" symlink.
---
 gnu/packages/tex.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 85eeddea3c..0c85940f90 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2958,7 +2958,11 @@ of nodes and the styles of edges, may be adjusted.")
             (lambda* (#:key inputs #:allow-other-keys)
               (let ((gs (search-input-file inputs "/bin/gs")))
                 (substitute* "scripts/epstopdf/epstopdf.pl"
-                  (("\"gs\"") (string-append "\"" gs "\"")))))))))
+                  (("\"gs\"") (string-append "\"" gs "\""))))))
+          (add-after 'link-scripts 'add-repstopdf
+            (lambda _
+              (with-directory-excursion (string-append #$output "/bin")
+                (symlink "epstopdf" "repstopdf")))))))
     (home-page "https://ctan.org/pkg/epstopdf")
     (synopsis "Convert EPS to PDF using Ghostscript")
     (inputs (list ghostscript perl))
-- 
cgit 1.4.1


From 169edc0503d241ce6673cc167e76315b77ac74ae Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 29 Jun 2023 00:38:48 +0200
Subject: gnu: Add propagated packages to texlive-updmap.cfg.

These packages belong to TeX Live's "basic" collection; they are often
expected when building a ".tex" file.  They were silently propagated in the
previous definition of the function.  Note : their definition has to be moved before
TEXLIVE-UPDMAP.CFG in the module.

* gnu/packages/tex.scm (texlive-updmap.cfg): Add TEXLIVE-CM, TEXLIVE-EC,
TEXLIVE-EPSTOPDF-PKG, TEXLIVE-ETEX, TEXLIVE-ETEX-PKG, TEXLIVE-IFPLATFORM,
TEXLIVE-IFTEX, TEXLIVE-TEX.
---
 gnu/packages/tex.scm | 183 ++++++++++++++++++++++++++-------------------------
 1 file changed, 95 insertions(+), 88 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0c85940f90..3aa09e78a8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2333,6 +2333,40 @@ also provides an easy way to handle different input and output encodings, and
 features generation of clean UTF-8 patterns.")
     (license license:lppl)))
 
+(define-public texlive-ec
+  (package
+    (name "texlive-ec")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ec/"
+                   "fonts/source/jknappen/ec/"
+                   "fonts/tfm/jknappen/ec/")
+             (base32
+              "1cyi0vv9dnp45s0ilsrbkyznj9ji62s5bhkqgh49461mv2f8qj6p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-cm texlive-metafont))
+    (home-page "https://ctan.org/pkg/ec")
+    (synopsis "Computer modern fonts in T1 and TS1 encodings")
+    (description
+     "The EC fonts are European Computer Modern Fonts, supporting the complete
+LaTeX T1 encoding defined at the 1990 TUG conference hold at Cork/Ireland.
+These fonts are intended to be stable with no changes being made to the tfm
+files.  The set also contains a Text Companion Symbol font, called @code{tc},
+featuring many useful characters needed in text typesetting, for example
+oldstyle digits, currency symbols (including the newly created Euro symbol),
+the permille sign, copyright, trade mark and servicemark as well as a copyleft
+sign, and many others.  The fonts are available in (traced) Adobe Type
+1 format, as part of the @code{cm-super} bundle.  The other Computer
+Modern-style T1-encoded Type 1 set, Latin Modern, is not actually a direct
+development of the EC set, and differs from the EC in a number of
+particulars.")
+    (license (license:fsf-free "https://www.tug.org/svn/texlive/tags/\
+texlive-2019.3/Master/texmf-dist/doc/fonts/ec/copyrite.txt"))))
+
+(define-deprecated-package texlive-fonts-ec texlive-ec)
+
 ;; This provides etex.src which is needed to build various formats, including
 ;; luatex.fmt and pdflatex.fmt
 (define-public texlive-etex
@@ -5022,19 +5056,80 @@ part of the LaTeX required set of packages.")
 
 (define-deprecated-package texlive-latex-psnfss texlive-psnfss)
 
+(define-public texlive-ifplatform
+  (package
+    (name "texlive-ifplatform")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ifplatform/"
+                   "source/latex/ifplatform/"
+                   "tex/latex/ifplatform/")
+             (base32
+              "1llas0xwq3y9nk7gblg40l99cgmkl9r7rbfazrhpnbaz5cshl8pl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ifplatform")
+    (synopsis "Conditionals to test which platform is being used")
+    (description
+     "This package uses the (La)TeX extension @samp{-shell-escape} to
+establish whether the document is being processed on a Windows or on
+a Unix-like system, or on Cygwin.
+
+Booleans provided are: @code{\\ifwindows}, @code{\\iflinux}, @code{\\ifmacosx}
+and @code{\\ifcygwin}.  The package also preserves the output of
+@command{uname} on a Unix-like system, which may be used to distinguish
+between various classes of Unix systems.")
+    (license license:lppl1.3c)))
+
+(define-deprecated-package texlive-latex-ifplatform texlive-ifplatform)
+
+(define-public texlive-iftex
+  (package
+    (name "texlive-iftex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/iftex/" "tex/generic/iftex/")
+             (base32
+              "05p8iw8c8vjs59zb8pgilwpvlzrlb8zxyf34fhyr67y6bwm8phnf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "http://www.ctan.org/pkg/iftex")
+    (synopsis "Determine the currently used TeX engine")
+    (description
+     "This package, which works both for Plain TeX and for LaTeX, defines the
+@code{\\ifPDFTeX}, @code{\\ifXeTeX}, and @code{\\ifLuaTeX} conditionals for
+testing which engine is being used for typesetting.  The package also provides
+the @code{\\RequirePDFTeX}, @code{\\RequireXeTeX}, and @code{\\RequireLuaTeX}
+commands which throw an error if pdfTeX, XeTeX or LuaTeX (respectively) is not
+the engine in use.")
+    (license license:lppl1.3+)))
+
+(define-deprecated-package texlive-generic-iftex texlive-iftex)
+(define-deprecated-package texlive-generic-ifxetex texlive-iftex)
+
 (define-public texlive-updmap.cfg
   (lambda* (#:optional (packages '()))
     "Return a 'texlive-updmap.cfg' package which contains the fonts map
 configuration of a base set of packages plus PACKAGES."
     (let ((default-packages
             (list texlive-bin
+                  texlive-cm
                   texlive-cm-super
                   texlive-dvips
+                  texlive-ec
+                  texlive-epstopdf-pkg
+                  texlive-etex
+                  texlive-etex-pkg
                   texlive-fontname
+                  texlive-ifplatform
+                  texlive-iftex
                   texlive-kpathsea
                   texlive-latex-bin
                   texlive-latex-fonts
                   texlive-metafont
+                  texlive-tex
                   ;; LaTeX packages from the "required" set.
                   texlive-amsmath
                   texlive-amscls
@@ -5902,34 +5997,6 @@ The package does not include the actual font files, which you can probably
 find in the software repository of your operating system.")
     (license license:eupl1.2)))
 
-(define-public texlive-ifplatform
-  (package
-    (name "texlive-ifplatform")
-    (version (number->string %texlive-revision))
-    (source (texlive-origin
-             name version
-             (list "doc/latex/ifplatform/"
-                   "source/latex/ifplatform/"
-                   "tex/latex/ifplatform/")
-             (base32
-              "1llas0xwq3y9nk7gblg40l99cgmkl9r7rbfazrhpnbaz5cshl8pl")))
-    (outputs '("out" "doc"))
-    (build-system texlive-build-system)
-    (home-page "https://ctan.org/pkg/ifplatform")
-    (synopsis "Conditionals to test which platform is being used")
-    (description
-     "This package uses the (La)TeX extension @samp{-shell-escape} to
-establish whether the document is being processed on a Windows or on
-a Unix-like system, or on Cygwin.
-
-Booleans provided are: @code{\\ifwindows}, @code{\\iflinux}, @code{\\ifmacosx}
-and @code{\\ifcygwin}.  The package also preserves the output of
-@command{uname} on a Unix-like system, which may be used to distinguish
-between various classes of Unix systems.")
-    (license license:lppl1.3c)))
-
-(define-deprecated-package texlive-latex-ifplatform texlive-ifplatform)
-
 (define-public texlive-interchar
   (package
     (name "texlive-interchar")
@@ -9079,40 +9146,6 @@ package options.")
 
 (define-deprecated-package texlive-latex-kvoptions texlive-kvoptions)
 
-(define-public texlive-ec
-  (package
-    (name "texlive-ec")
-    (version (number->string %texlive-revision))
-    (source (texlive-origin
-             name version
-             (list "doc/fonts/ec/"
-                   "fonts/source/jknappen/ec/"
-                   "fonts/tfm/jknappen/ec/")
-             (base32
-              "1cyi0vv9dnp45s0ilsrbkyznj9ji62s5bhkqgh49461mv2f8qj6p")))
-    (outputs '("out" "doc"))
-    (build-system texlive-build-system)
-    (native-inputs (list texlive-cm texlive-metafont))
-    (home-page "https://ctan.org/pkg/ec")
-    (synopsis "Computer modern fonts in T1 and TS1 encodings")
-    (description
-     "The EC fonts are European Computer Modern Fonts, supporting the complete
-LaTeX T1 encoding defined at the 1990 TUG conference hold at Cork/Ireland.
-These fonts are intended to be stable with no changes being made to the tfm
-files.  The set also contains a Text Companion Symbol font, called @code{tc},
-featuring many useful characters needed in text typesetting, for example
-oldstyle digits, currency symbols (including the newly created Euro symbol),
-the permille sign, copyright, trade mark and servicemark as well as a copyleft
-sign, and many others.  The fonts are available in (traced) Adobe Type
-1 format, as part of the @code{cm-super} bundle.  The other Computer
-Modern-style T1-encoded Type 1 set, Latin Modern, is not actually a direct
-development of the EC set, and differs from the EC in a number of
-particulars.")
-    (license (license:fsf-free "https://www.tug.org/svn/texlive/tags/\
-texlive-2019.3/Master/texmf-dist/doc/fonts/ec/copyrite.txt"))))
-
-(define-deprecated-package texlive-fonts-ec texlive-ec)
-
 (define-public texlive-ekdosis
   (package
     (name "texlive-ekdosis")
@@ -13762,32 +13795,6 @@ may be used instead of @code{\\marginpar} at almost every place where
 frames made with the @code{framed} package.")
     (license license:lppl1.3c+)))
 
-(define-public texlive-iftex
-  (package
-    (name "texlive-iftex")
-    (version (number->string %texlive-revision))
-    (source (texlive-origin
-             name version
-             (list "doc/generic/iftex/" "tex/generic/iftex/")
-             (base32
-              "05p8iw8c8vjs59zb8pgilwpvlzrlb8zxyf34fhyr67y6bwm8phnf")))
-    (outputs '("out" "doc"))
-    (build-system texlive-build-system)
-    (home-page "http://www.ctan.org/pkg/iftex")
-    (synopsis "Determine the currently used TeX engine")
-    (description
-     "This package, which works both for Plain TeX and for LaTeX, defines the
-@code{\\ifPDFTeX}, @code{\\ifXeTeX}, and @code{\\ifLuaTeX} conditionals for
-testing which engine is being used for typesetting.  The package also provides
-the @code{\\RequirePDFTeX}, @code{\\RequireXeTeX}, and @code{\\RequireLuaTeX}
-commands which throw an error if pdfTeX, XeTeX or LuaTeX (respectively) is not
-the engine in use.")
-    (license license:lppl1.3+)))
-
-(define-deprecated-package texlive-generic-iftex texlive-iftex)
-
-(define-deprecated-package texlive-generic-ifxetex texlive-iftex)
-
 (define-public texlive-tabu
   (package
     (name "texlive-tabu")
-- 
cgit 1.4.1


From fdf09bcd311b093bd10f0fb35fa4db80516fa7cc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 28 Jun 2023 23:57:20 +0200
Subject: gnu: yaehmop: Fix build due to missing TeX Live scripts.

* gnu/packages/chemistry.scm (yaehmop)[native-inputs]: Add missing "latexmk"
and "repstopdf" scripts.
---
 gnu/packages/chemistry.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 44107e825a..95c5905cf3 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -901,8 +901,10 @@ emphasis on quality rather than speed.")
      (list gfortran
            (texlive-updmap.cfg
             (list texlive-ec
+                  texlive-epstopdf
                   texlive-geometry
-                  texlive-graphics))))
+                  texlive-graphics
+                  texlive-latexmk))))
     (home-page "https://github.com/greglandrum/yaehmop")
     (synopsis "Perform extended Hückel calculations")
     (description "@acronym{YAeHMOP, Yet Another extended Hueckel Molecular
-- 
cgit 1.4.1


From 42500f1aad885b873a1b0e78cdedc0a75b641be6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 29 Jun 2023 00:20:57 +0200
Subject: gnu: velvet: Fix error when building documentation.

* gnu/packages/bioinformatics.scm (velvet)[native-inputs]: Add TEXLIVE-GRFEXT,
TEXLIVE-INFWARERR, TEXLIVE-KVOPTIONS and TEXLIVE-KPDFTEXCMDS.
---
 gnu/packages/bioinformatics.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 66e84d2925..81244f0daa 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -17089,9 +17089,14 @@ to an artifact/contaminant file.")
     (inputs
      (list openmpi zlib))
     (native-inputs
-     `(("texlive" ,(texlive-updmap.cfg (list texlive-graphics
-                                             texlive-ec
-                                             texlive-hyperref)))))
+     `(("texlive" ,(texlive-updmap.cfg
+                    (list texlive-ec
+                          texlive-graphics
+                          texlive-grfext
+                          texlive-hyperref
+                          texlive-infwarerr
+                          texlive-kvoptions
+                          texlive-pdftexcmds)))))
     (home-page "https://www.ebi.ac.uk/~zerbino/velvet/")
     (synopsis "Nucleic acid sequence assembler for very short reads")
     (description
-- 
cgit 1.4.1


From 1e92db8927864f2d9e3dc8a5127c45fa743e7e12 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 29 Jun 2023 00:37:38 +0200
Subject: gnu: velvet: Improve package style.

* gnu/packages/bioinformatics.scm (velvet)[arguments]: Use G-expressions.
[native-inputs]: Remove label.
---
 gnu/packages/bioinformatics.scm | 56 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 81244f0daa..d4bc5ac047 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -17066,37 +17066,37 @@ to an artifact/contaminant file.")
                   (delete-file-recursively "third-party")))))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags '("OPENMP=t")
-       #:test-target "test"
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (add-after 'unpack 'fix-zlib-include
-           (lambda _
-             (substitute* "src/binarySequences.c"
-               (("../third-party/zlib-1.2.3/zlib.h") "zlib.h"))))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin"))
-                    (doc (string-append out "/share/doc/velvet")))
-               (mkdir-p bin)
-               (mkdir-p doc)
-               (install-file "velveth" bin)
-               (install-file "velvetg" bin)
-               (install-file "Manual.pdf" doc)
-               (install-file "Columbus_manual.pdf" doc)))))))
+     (list
+      #:make-flags #~(list "OPENMP=t")
+      #:test-target "test"
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure)
+          (add-after 'unpack 'fix-zlib-include
+            (lambda _
+              (substitute* "src/binarySequences.c"
+                (("../third-party/zlib-1.2.3/zlib.h") "zlib.h"))))
+          (replace 'install
+            (lambda _
+              (let ((bin (string-append #$output "/bin"))
+                    (doc (string-append #$output "/share/doc/velvet")))
+                (mkdir-p bin)
+                (mkdir-p doc)
+                (install-file "velveth" bin)
+                (install-file "velvetg" bin)
+                (install-file "Manual.pdf" doc)
+                (install-file "Columbus_manual.pdf" doc)))))))
     (inputs
      (list openmpi zlib))
     (native-inputs
-     `(("texlive" ,(texlive-updmap.cfg
-                    (list texlive-ec
-                          texlive-graphics
-                          texlive-grfext
-                          texlive-hyperref
-                          texlive-infwarerr
-                          texlive-kvoptions
-                          texlive-pdftexcmds)))))
+     (list (texlive-updmap.cfg
+            (list texlive-ec
+                  texlive-graphics
+                  texlive-grfext
+                  texlive-hyperref
+                  texlive-infwarerr
+                  texlive-kvoptions
+                  texlive-pdftexcmds))))
     (home-page "https://www.ebi.ac.uk/~zerbino/velvet/")
     (synopsis "Nucleic acid sequence assembler for very short reads")
     (description
-- 
cgit 1.4.1


From e8f3b8bdc7d11ea3d5f613ea37c55a8076af5241 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 29 Jun 2023 00:50:59 +0200
Subject: gnu: hypre: Fix error when building documentation.

* gnu/packages/maths.scm (hypre)[native-inputs]: Add TEXLIVE-LATEXMK.
---
 gnu/packages/maths.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 79fccd7cc5..5083b5bb6b 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5800,6 +5800,7 @@ set.")
                                      texlive-helvetic
                                      texlive-hyperref
                                      texlive-jknapltx
+                                     texlive-latexmk
                                      texlive-listofitems
                                      texlive-multirow
                                      texlive-natbib
-- 
cgit 1.4.1


From 97a59bbef984da312c3565ab7d01ad4304950590 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 1 Jul 2023 19:08:10 +0200
Subject: gnu: ocaml-bibtex2html: Fix build.

* gnu/packages/ocaml.scm (ocaml-bibtex2html)[native-inputs]: Add
TEXLIVE-INFWARERR, TEXLIVE-KVOPTINOS, TEXLIVE-PDFTEXCMDS.
---
 gnu/packages/ocaml.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 9e399064c8..f5938d2f40 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -10255,8 +10255,12 @@ SHA384, SHA512, Blake2b, Blake2s and RIPEMD160.")
     (native-inputs
      `(("which" ,which)
        ("texlive" ,(texlive-updmap.cfg
-                    (list texlive-ec texlive-preprint
-                          texlive-hyperref texlive-bibtex)))))
+                    (list texlive-bibtex
+                          texlive-hyperref
+                          texlive-infwarerr
+                          texlive-kvoptions
+                          texlive-pdftexcmds
+                          texlive-preprint)))))
     (propagated-inputs
      (list hevea))
     (home-page "https://www.lri.fr/~filliatr/bibtex2html/")
-- 
cgit 1.4.1


From fc91998274bd747668d1497aa799c8c1ec523738 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 1 Jul 2023 19:11:30 +0200
Subject: gnu: ocaml-bibtex2html: Improve package style.

* gnu/packages/ocaml.scm (ocaml-bibtex2html)[origin]<uri>: Re-use version.
[arguments]: Use G-expressions.  Remove trailing #T from phases.
[native-inputs]: Remove labels.
---
 gnu/packages/ocaml.scm | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index f5938d2f40..e919c40973 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -10239,28 +10239,32 @@ SHA384, SHA512, Blake2b, Blake2s and RIPEMD160.")
     (name "ocaml-bibtex2html")
     (version "1.99")
     (source
-      (origin
-        (method url-fetch)
-        (uri "https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.99.tar.gz")
-        (sha256 (base32 "07gzrs4lfrkvbn48cgn2gn6c7cx3jsanakkrb2irj0gmjzfxl96j"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.lri.fr/~filliatr/ftp/bibtex2html/"
+                           "bibtex2html-"  version ".tar.gz"))
+       (sha256
+        (base32
+         "07gzrs4lfrkvbn48cgn2gn6c7cx3jsanakkrb2irj0gmjzfxl96j"))))
     (build-system ocaml-build-system)
     (arguments
-      `(#:phases
-        (modify-phases %standard-phases
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-/bin/sh
             (lambda _
               (substitute* "configure" (("/bin/sh") (which "bash")))
-              (setenv "HOME" (getcwd)) ;; mktexfmt needs writable home directory
-              #t)))))
+              ;; mktexfmt needs writable home directory.
+              (setenv "HOME" (getcwd)))))))
     (native-inputs
-     `(("which" ,which)
-       ("texlive" ,(texlive-updmap.cfg
-                    (list texlive-bibtex
-                          texlive-hyperref
-                          texlive-infwarerr
-                          texlive-kvoptions
-                          texlive-pdftexcmds
-                          texlive-preprint)))))
+     (list (texlive-updmap.cfg
+            (list texlive-bibtex
+                  texlive-hyperref
+                  texlive-infwarerr
+                  texlive-kvoptions
+                  texlive-pdftexcmds
+                  texlive-preprint))
+           which))
     (propagated-inputs
      (list hevea))
     (home-page "https://www.lri.fr/~filliatr/bibtex2html/")
-- 
cgit 1.4.1


From 944ace71947682e727dcf94faba425be66fbd703 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 1 Jul 2023 21:40:42 +0200
Subject: guix: Fix sub-directories in texlive importer locations.

* guix/import/texlive.scm (files->locations): When removing a sub-directory,
make sure to actually remove the sub-directory and not the parent.
---
 guix/import/texlive.scm | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 3b5c7192b1..8f90be0c7b 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -352,7 +352,8 @@ of those files are returned that are unexpectedly installed."
                          (map strip-directory-prefix existing) files))))
 
 (define (files->locations files)
-  (define name->parts (cut string-split <> #\/))
+  (define (trim-filename entry)
+    (string-join (drop-right (string-split entry #\/) 1) "/" 'suffix))
   ;; Generic locations are shared by multiple packages.  Provide the full file
   ;; name to make so as to extract only the files related to the package being
   ;; imported.
@@ -362,13 +363,10 @@ of those files are returned that are unexpectedly installed."
                                   texlive-generic-locations))
                            files)))
     (append generic
-            (map (cut string-join <> "/" 'suffix)
-                 (delete-duplicates (map (lambda (file)
-                                           (drop-right (name->parts file) 1))
-                                         (sort specific string<))
-                                    ;; Remove sub-directories, i.e. more
-                                    ;; specific entries with the same prefix.
-                                    (lambda (x y) (every equal? x y)))))))
+            ;; Remove sub-directories, i.e., more specific entries with the
+            ;; same prefix.
+            (delete-duplicates (sort (map trim-filename specific) string<)
+                               string-prefix?))))
 
 (define (tlpdb->package name version package-database)
   (and-let* ((data (assoc-ref package-database name))
-- 
cgit 1.4.1


From ca4e92e7945c63956370977b885203619fb14c1d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 1 Jul 2023 21:44:32 +0200
Subject: gnu: texlive-pgf: Add missing files.

* gnu/packages/tex.scm (texlive-pgf)[source]: Fix locations.  Previous ones
would not include "tikz.sty" file, among others.
---
 gnu/packages/tex.scm | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3aa09e78a8..c37b05abb8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11909,25 +11909,11 @@ libraries with LuaLaTeX, with some extra functionality added.")
                    "tex/context/third/pgf/math/"
                    "tex/context/third/pgf/systemlayer/"
                    "tex/context/third/pgf/utilities/"
-                   "tex/generic/pgf/basiclayer/"
-                   "tex/generic/pgf/frontendlayer/tikz/libraries/circuits/"
-                   "tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/"
-                   "tex/generic/pgf/frontendlayer/tikz/libraries/graphs/"
-                   "tex/generic/pgf/graphdrawing/lua/"
-                   "tex/generic/pgf/graphdrawing/tex/experimental/"
-                   "tex/generic/pgf/libraries/datavisualization/"
-                   "tex/generic/pgf/libraries/decorations/"
-                   "tex/generic/pgf/libraries/luamath/pgf/luamath/"
-                   "tex/generic/pgf/libraries/shapes/circuits/"
-                   "tex/generic/pgf/lua/pgf/"
-                   "tex/generic/pgf/math/"
-                   "tex/generic/pgf/modules/"
-                   "tex/generic/pgf/systemlayer/"
-                   "tex/generic/pgf/utilities/"
+                   "tex/generic/pgf/"
                    "tex/latex/pgf/basiclayer/"
                    "tex/latex/pgf/compatibility/"
                    "tex/latex/pgf/doc/"
-                   "tex/latex/pgf/frontendlayer/libraries/"
+                   "tex/latex/pgf/frontendlayer/"
                    "tex/latex/pgf/math/"
                    "tex/latex/pgf/systemlayer/"
                    "tex/latex/pgf/utilities/"
@@ -11937,7 +11923,7 @@ libraries with LuaLaTeX, with some extra functionality added.")
                    "tex/plain/pgf/systemlayer/"
                    "tex/plain/pgf/utilities/")
              (base32
-              "1rkrp839snkfmxn0ff3kcvgq4k59lj2c3xz05hmmnprzymsx1zvd")))
+              "16kdxcyk60i1c8y3i3d0v2076kapg2vs2pd4pbb434w3vjf8jfm5")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From df2e9dedba0b726de14559bc67752a0a380e8d92 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 1 Jul 2023 21:53:08 +0200
Subject: gnu: texlive-context: Add missing files.

* gnu/packages/tex.scm (texlive-context)[source]: Fix locations to include all
files, including man pages.
---
 gnu/packages/tex.scm | 114 ++++-----------------------------------------------
 1 file changed, 7 insertions(+), 107 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c37b05abb8..54a7966f05 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12628,106 +12628,21 @@ a counter to be reset when another is incremented) and
     (source (texlive-origin
              name version
              (list "bibtex/bst/context/mkii/"
-                   "context/data/scite/context/documents/"
-                   "context/data/scite/context/lexers/data/"
-                   "context/data/scite/context/lexers/themes/"
-                   "context/data/texworks/TUG/"
-                   "context/data/texworks/completion/"
-                   "context/data/texworks/configuration/"
-                   "context/data/vscode/extensions/context/keybindings/"
-                   "context/data/vscode/extensions/context/settings/"
-                   "context/data/vscode/extensions/context/syntaxes/"
-                   "context/data/vscode/extensions/context/tasks/"
-                   "context/data/vscode/extensions/context/themes/"
+                   "context/data/scite/context/"
+                   "context/data/texworks/"
+                   "context/data/vscode/"
                    "doc/context/documents/general/leaflets/"
                    "doc/context/documents/general/magazines/"
                    "doc/context/documents/general/manuals/"
                    "doc/context/documents/general/qrcs/"
                    "doc/context/examples/calculator/"
                    "doc/context/examples/clock/"
-                   "doc/context/presentations/bachotex/2005/"
-                   "doc/context/presentations/bachotex/2009/"
-                   "doc/context/presentations/bachotex/2010/"
-                   "doc/context/presentations/bachotex/2011/"
-                   "doc/context/presentations/bachotex/2012/"
-                   "doc/context/presentations/bachotex/2013/"
-                   "doc/context/presentations/bachotex/2014/"
-                   "doc/context/presentations/bachotex/2015/"
-                   "doc/context/presentations/bachotex/2016/"
-                   "doc/context/presentations/bachotex/2017/"
-                   "doc/context/presentations/bachotex/2018/"
-                   "doc/context/presentations/bachotex/2019/"
-                   "doc/context/presentations/context/2007/"
-                   "doc/context/presentations/context/2010/"
-                   "doc/context/presentations/context/2011/"
-                   "doc/context/presentations/context/2012/"
-                   "doc/context/presentations/context/2013/"
-                   "doc/context/presentations/context/2015/"
-                   "doc/context/presentations/context/2016/"
-                   "doc/context/presentations/context/2017/"
-                   "doc/context/presentations/context/2019/"
-                   "doc/context/presentations/context/2020/"
-                   "doc/context/presentations/context/2021/"
-                   "doc/context/presentations/examples/"
-                   "doc/context/presentations/tug/2001/"
-                   "doc/context/presentations/tug/2007/"
+                   "doc/context/presentations/"
                    "doc/context/scripts/mkii/"
                    "doc/context/scripts/mkiv/"
                    "doc/context/sources/general/leaflets/"
                    "doc/context/sources/general/magazines/"
-                   "doc/context/sources/general/manuals/about/"
-                   "doc/context/sources/general/manuals/bidi/"
-                   "doc/context/sources/general/manuals/canbedone/"
-                   "doc/context/sources/general/manuals/charts/"
-                   "doc/context/sources/general/manuals/cld/"
-                   "doc/context/sources/general/manuals/colors/"
-                   "doc/context/sources/general/manuals/columnsets/"
-                   "doc/context/sources/general/manuals/details/"
-                   "doc/context/sources/general/manuals/epub/"
-                   "doc/context/sources/general/manuals/evenmore/"
-                   "doc/context/sources/general/manuals/followingup/"
-                   "doc/context/sources/general/manuals/fonts/"
-                   "doc/context/sources/general/manuals/graphics/"
-                   "doc/context/sources/general/manuals/hybrid/"
-                   "doc/context/sources/general/manuals/interaction/"
-                   "doc/context/sources/general/manuals/languages/"
-                   "doc/context/sources/general/manuals/libraries/"
-                   "doc/context/sources/general/manuals/lowlevel/"
-                   "doc/context/sources/general/manuals/lua/"
-                   "doc/context/sources/general/manuals/luametafun/"
-                   "doc/context/sources/general/manuals/luametatex/"
-                   "doc/context/sources/general/manuals/luatex/"
-                   "doc/context/sources/general/manuals/math/"
-                   "doc/context/sources/general/manuals/mathml/"
-                   "doc/context/sources/general/manuals/metafun/"
-                   "doc/context/sources/general/manuals/mk/"
-                   "doc/context/sources/general/manuals/musings/"
-                   "doc/context/sources/general/manuals/nodes/"
-                   "doc/context/sources/general/manuals/notnow/"
-                   "doc/context/sources/general/manuals/onandon/"
-                   "doc/context/sources/general/manuals/ontarget/"
-                   "doc/context/sources/general/manuals/pagecolumns/"
-                   "doc/context/sources/general/manuals/primitives/"
-                   "doc/context/sources/general/manuals/publications/"
-                   "doc/context/sources/general/manuals/readme/"
-                   "doc/context/sources/general/manuals/rules/"
-                   "doc/context/sources/general/manuals/spacing/"
-                   "doc/context/sources/general/manuals/spreadsheets/"
-                   "doc/context/sources/general/manuals/sql/"
-                   "doc/context/sources/general/manuals/start/en/"
-                   "doc/context/sources/general/manuals/start/graphics/"
-                   "doc/context/sources/general/manuals/steps/"
-                   "doc/context/sources/general/manuals/still/"
-                   "doc/context/sources/general/manuals/svg/"
-                   "doc/context/sources/general/manuals/swiglib/"
-                   "doc/context/sources/general/manuals/templates/"
-                   "doc/context/sources/general/manuals/texit/"
-                   "doc/context/sources/general/manuals/tiptrick/"
-                   "doc/context/sources/general/manuals/tools/"
-                   "doc/context/sources/general/manuals/units/"
-                   "doc/context/sources/general/manuals/workflows/"
-                   "doc/context/sources/general/manuals/xml/"
-                   "doc/context/sources/general/manuals/xtables/"
+                   "doc/context/sources/general/manuals/"
                    "doc/man/man1/context.1"
                    "doc/man/man1/context.man1.pdf"
                    "doc/man/man1/luatools.1"
@@ -12820,26 +12735,11 @@ a counter to be reset when another is incremented) and
                    "metapost/context/fonts/mpiv/"
                    "scripts/context/lua/"
                    "scripts/context/perl/"
-                   "tex/context/base/"
-                   "tex/context/bib/common/"
-                   "tex/context/colors/icc/context/"
-                   "tex/context/colors/icc/profiles/"
-                   "tex/context/fonts/mkiv/"
-                   "tex/context/fonts/mkxl/"
-                   "tex/context/interface/mkiv/"
-                   "tex/context/modules/common/"
-                   "tex/context/modules/mkiv/"
-                   "tex/context/modules/mkxl/"
-                   "tex/context/patterns/common/"
-                   "tex/context/patterns/mkiv/"
-                   "tex/context/patterns/mkxl/"
-                   "tex/context/sample/common/"
-                   "tex/context/sample/third/"
-                   "tex/context/test/mkiv/"
+                   "tex/context/"
                    "tex/generic/context/luatex/"
                    "tex/latex/context/ppchtex/")
              (base32
-              "1mmdxi6hcznmj2fjx6dmf76q3zsyhq67irvyr8a125d9qcs1iiml")))
+              "05w9pc0xkralkqsh2zzrisrcyf1rkwmv5chyhmn8vlddckhknxkn")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments (list #:link-scripts #~(list "context.lua" "mtxrun.lua")))
-- 
cgit 1.4.1


From 9eb02049b8a85d4d1979cc253e24fc756e653128 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 1 Jul 2023 22:37:49 +0200
Subject: gnu: dot2tex: Fix failing tests.

TeX Live packages needed to build tests are moved to native inputs because
propagating them may not be a good thing.  Use might already be using
monolithic TeX Live, or would may have their TeX Live installation on another system.

* gnu/packages/graphviz.scm (dot2tex)[native-inputs]: Add TeX Live packages
necessary to build documents generated during tests.
[propagated-inputs]: Remove them.
---
 gnu/packages/graphviz.scm | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 61e4ec7a9f..08dd73b24f 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -379,21 +379,17 @@ graphs in Graphviz's DOT language, written in pure Python.")
                         ;; (see:
                         ;; https://github.com/kjellmf/dot2tex/issues/94).
                         "-k" "not test_semicolon")))))))
-    (native-inputs (list python-pytest))
+    (native-inputs
+     (list python-pytest
+           (texlive-updmap.cfg
+            (list texlive-geometry
+                  texlive-pgf
+                  texlive-preview
+                  texlive-pstricks
+                  texlive-xcolor
+                  texlive-xkeyval))))
     (inputs (list graphviz))
-    (propagated-inputs
-     (list python-pyparsing
-           ;; These TeX dependencies are propagated to make it easier to build
-           ;; the resulting generated TeX files, which \usepackage them.
-           texlive-amsmath
-           texlive-bin
-           texlive-geometry
-           texlive-latex-bin
-           texlive-pgf
-           texlive-pstricks
-           texlive-preview
-           texlive-xcolor
-           texlive-xkeyval))
+    (propagated-inputs (list python-pyparsing))
     (home-page "https://github.com/kjellmf/dot2tex")
     (synopsis "Graphviz to LaTeX converter")
     (description
-- 
cgit 1.4.1


From 88a3b237f50084c64cc95bdcb3381dd53498eea2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 1 Jul 2023 22:52:29 +0200
Subject: gnu: phyml: Fix build.

* gnu/packages/bioinformatics.scm (phyml)[native-inputs]: Add
TEXLIVE-INFWARERR, TEXLIVE-KVOPTIONS and TEXLIVE-PDFTEXCMDS.
---
 gnu/packages/bioinformatics.scm | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index d4bc5ac047..5021eea6c1 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -12103,16 +12103,20 @@ programs for inferring phylogenies (evolutionary trees).")
      (list automake
            autoconf
            openmpi
-           (texlive-updmap.cfg (list texlive-amsfonts
-                                     texlive-caption
-                                     texlive-cite
-                                     texlive-ec
-                                     texlive-fancyvrb
-                                     texlive-graphics
-                                     texlive-grfext
-                                     texlive-hyperref
-                                     texlive-psfrag
-                                     texlive-xcolor))))
+           (texlive-updmap.cfg
+            (list texlive-amsfonts
+                  texlive-caption
+                  texlive-cite
+                  texlive-ec
+                  texlive-fancyvrb
+                  texlive-graphics
+                  texlive-grfext
+                  texlive-hyperref
+                  texlive-infwarerr
+                  texlive-kvoptions
+                  texlive-pdftexcmds
+                  texlive-psfrag
+                  texlive-xcolor))))
     (home-page "https://github.com/stephaneguindon/phyml")
     (synopsis "Programs for working on SAM/BAM files")
     (description
-- 
cgit 1.4.1


From 2e189e8863450669c4e59ce941704fb3237b108f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 3 Jul 2023 09:23:44 +0200
Subject: guix: texlive importer: Do not pull all "scripts/context/" files.

* guix/import/texlive.scm (texlive-generic-locations): Add "scripts/context/"
since this location is split across multiple packages.
* guix/import/texlive.scm (files->locations): Only single out files from
generic locations, not their sub-directories.  E.g., generic location
"scripts/context/lua/" should not fetch "scripts/context/lua/third/" files.
---
 guix/import/texlive.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 8f90be0c7b..fe28b24715 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -52,10 +52,12 @@
 ;; Package definitions should single out files stored there, or all files in
 ;; the directory from all involved packages would be downloaded.
 (define texlive-generic-locations
-  (list "doc/generic/hyph-utf8/"
-        "doc/info/"
-        "doc/man/"
+  (list "doc/info/"
+        "doc/man/man1/"
+        "doc/man/man5/"
         "doc/web2c/"
+        "scripts/context/lua/"
+        "scripts/context/perl/"
         "scripts/texlive/"
         "scripts/texlive-extra/"
         "tex/generic/config/"
@@ -359,7 +361,9 @@ of those files are returned that are unexpectedly installed."
   ;; imported.
   (let-values (((generic specific)
                 (partition (lambda (f)
-                             (any (cut string-prefix? <> f)
+                             ;; Only grab files from generic locations, not
+                             ;; sub-directories.
+                             (any (cut string=? <> (trim-filename f))
                                   texlive-generic-locations))
                            files)))
     (append generic
-- 
cgit 1.4.1


From 7e30fd530eb2d803bebe57901e252bb3148b634e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 3 Jul 2023 09:24:51 +0200
Subject: gnu: texlive-mptopdf: Fix package.

* gnu/packages/tex.scm (texlive-mptopdf)[source]: Only grab specific
"mptopdf.pl" scripts, not all other scripts in the same directory.
[arguments]<#:phases>: Add a phase to use provided Perl.
[inputs]: Add PERL.
---
 gnu/packages/tex.scm | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 54a7966f05..fa7db3c180 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1532,21 +1532,28 @@ information in the TFM file.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             ;; The first location prevents from downloading all ConTeXt
-             ;; "doc/context/scripts/mkii" directory.
              (list "doc/context/scripts/mkii/mptopdf.man"
                    "doc/man/man1/mptopdf.1"
                    "doc/man/man1/mptopdf.man1.pdf"
-                   "scripts/context/perl/"
+                   "scripts/context/perl/mptopdf.pl"
                    "tex/context/base/mkii/"
                    "tex/generic/context/mptopdf/")
              (base32
-              "08z0hxq0645lf8jyl0wq3kwn1f7xsvj736sqgfin9ldd89zc2ch3")))
+              "19kpqbkmz8al9wxn83fmg89fyv2pl2iqgnh256wi6pz4q3p77f0d")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (arguments
-     (list #:link-scripts #~(list "mptopdf.pl")
-           #:create-formats #~(list "mptopdf")))
+     (list
+      #:link-scripts #~(list "mptopdf.pl")
+      #:create-formats #~(list "mptopdf")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-perl-header
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((perl (search-input-file inputs "/bin/perl")))
+                (substitute* "scripts/context/perl/mptopdf.pl"
+                  (("exec perl") (string-append "exec " perl)))))))))
+    (inputs (list perl))
     (propagated-inputs (list texlive-plain))
     (home-page "https://ctan.org/pkg/mptopdf")
     (synopsis "mpost to PDF, native MetaPost graphics inclusion")
-- 
cgit 1.4.1


From 32f9cb3e6bdd3b75218c247ee2176ef936b8189b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 3 Jul 2023 10:57:42 +0200
Subject: gnu: texlive-context: Fix package.

* gnu/packages/tex.scm (texlive-context)[source]: Do not fetch third-party Lua
scripts.
[arguments]<#:phases>: Create additional symlinks.
---
 gnu/packages/tex.scm | 71 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 67 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fa7db3c180..e32eb24fe7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -12740,16 +12740,79 @@ a counter to be reset when another is incremented) and
                    "metapost/context/base/mpiv/"
                    "metapost/context/base/mpxl/"
                    "metapost/context/fonts/mpiv/"
-                   "scripts/context/lua/"
-                   "scripts/context/perl/"
+                   "scripts/context/lua/context.lua"
+                   "scripts/context/lua/mtx-babel.lua"
+                   "scripts/context/lua/mtx-base.lua"
+                   "scripts/context/lua/mtx-bibtex.lua"
+                   "scripts/context/lua/mtx-cache.lua"
+                   "scripts/context/lua/mtx-chars.lua"
+                   "scripts/context/lua/mtx-check.lua"
+                   "scripts/context/lua/mtx-colors.lua"
+                   "scripts/context/lua/mtx-context.lua"
+                   "scripts/context/lua/mtx-context.xml"
+                   "scripts/context/lua/mtx-convert.lua"
+                   "scripts/context/lua/mtx-ctan.lua"
+                   "scripts/context/lua/mtx-dvi.lua"
+                   "scripts/context/lua/mtx-epub.lua"
+                   "scripts/context/lua/mtx-evohome.lua"
+                   "scripts/context/lua/mtx-fcd.lua"
+                   "scripts/context/lua/mtx-flac.lua"
+                   "scripts/context/lua/mtx-fonts.lua"
+                   "scripts/context/lua/mtx-grep.lua"
+                   "scripts/context/lua/mtx-install.lua"
+                   "scripts/context/lua/mtx-interface.lua"
+                   "scripts/context/lua/mtx-kpse.lua"
+                   "scripts/context/lua/mtx-metapost.lua"
+                   "scripts/context/lua/mtx-mk-help.lua"
+                   "scripts/context/lua/mtx-modules.lua"
+                   "scripts/context/lua/mtx-package.lua"
+                   "scripts/context/lua/mtx-patterns.lua"
+                   "scripts/context/lua/mtx-pdf.lua"
+                   "scripts/context/lua/mtx-plain.lua"
+                   "scripts/context/lua/mtx-profile.lua"
+                   "scripts/context/lua/mtx-rsync.lua"
+                   "scripts/context/lua/mtx-scite.lua"
+                   "scripts/context/lua/mtx-server-ctx-fonttest.lua"
+                   "scripts/context/lua/mtx-server-ctx-help.lua"
+                   "scripts/context/lua/mtx-server-ctx-startup.lua"
+                   "scripts/context/lua/mtx-server.lua"
+                   "scripts/context/lua/mtx-spell.lua"
+                   "scripts/context/lua/mtx-synctex.lua"
+                   "scripts/context/lua/mtx-texworks.lua"
+                   "scripts/context/lua/mtx-tools.lua"
+                   "scripts/context/lua/mtx-unicode.lua"
+                   "scripts/context/lua/mtx-unzip.lua"
+                   "scripts/context/lua/mtx-update.lua"
+                   "scripts/context/lua/mtx-vscode.lua"
+                   "scripts/context/lua/mtx-watch.lua"
+                   "scripts/context/lua/mtx-youless.lua"
+                   "scripts/context/lua/mtxlibs.lua"
+                   "scripts/context/lua/mtxrun.lua"
+                   "scripts/context/perl/makempy.pl"
+                   "scripts/context/perl/path_tre.pm"
+                   "scripts/context/perl/pdftrimwhite.pl"
+                   "scripts/context/perl/texfind.pl"
+                   "scripts/context/perl/texfont.pl"
                    "tex/context/"
                    "tex/generic/context/luatex/"
                    "tex/latex/context/ppchtex/")
              (base32
-              "05w9pc0xkralkqsh2zzrisrcyf1rkwmv5chyhmn8vlddckhknxkn")))
+              "0v452m4qi0963crr2fv211fi3a4c74l6b9p8brkcfg29fif7a846")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (arguments (list #:link-scripts #~(list "context.lua" "mtxrun.lua")))
+    (arguments
+     (list
+      #:link-scripts #~(list "context.lua" "mtxrun.lua")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'link-scripts 'add-symlinks
+            (lambda _
+              (with-directory-excursion (string-append #$output "/bin")
+                (symlink "../share/texmf-dist/scripts/context/lua/context.lua"
+                         "context.lua")
+                (symlink "../share/texmf-dist/scripts/context/lua/mtxrun.lua"
+                         "mtxrun.lua")
+                (symlink "mtxrun" "luametatex")))))))
     (propagated-inputs
      (list texlive-amsfonts
            texlive-lm
-- 
cgit 1.4.1


From d5abbf48a447813b526b6dd05816cf15c2f06938 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 3 Jul 2023 10:58:27 +0200
Subject: gnu: Add texlive-cweb.

* gnu/packages/tex.scm (texlive-cweb): New variable.
---
 gnu/packages/tex.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e32eb24fe7..20359fec68 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1891,6 +1891,40 @@ Adobe's basic set.")
     ;; No license version specified.
     (license license:gpl3+)))
 
+(define-public texlive-cweb
+  (package
+    (name "texlive-cweb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/ctangle.1"
+                   "doc/man/man1/ctangle.man1.pdf"
+                   "doc/man/man1/ctwill-refsort.1"
+                   "doc/man/man1/ctwill-refsort.man1.pdf"
+                   "doc/man/man1/ctwill-twinx.1"
+                   "doc/man/man1/ctwill-twinx.man1.pdf"
+                   "doc/man/man1/ctwill.1"
+                   "doc/man/man1/ctwill.man1.pdf"
+                   "doc/man/man1/cweave.1"
+                   "doc/man/man1/cweave.man1.pdf"
+                   "doc/man/man1/cweb.1"
+                   "doc/man/man1/cweb.man1.pdf"
+                   "doc/man/man1/twill.1"
+                   "doc/man/man1/twill.man1.pdf"
+                   "tex/plain/cweb/")
+             (base32
+              "1p6zj6zc6c3i5caj1217gkjjk0wyfks85x33i5p28znzc2fgvbdi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cwebbin")
+    (synopsis "CWEB for ANSI-C/C++ compilers")
+    (description
+     "This package provides a highly portable and extended version of
+Levy/Knuth CWEB 3.64c.  TeX macros, CWEB macros, and NLS catalogs are included
+for German, French (partially), and Italian program documentation on any
+machine.")
+    (license license:knuth)))
+
 (define-public texlive-tex-gyre
   (package
     (name "texlive-tex-gyre")
-- 
cgit 1.4.1


From f37146969a2f24530fcdf270b2d19602809cb4ae Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 3 Jul 2023 12:12:05 +0200
Subject: gnu: texlive-updmap.cfg: Provide basic scheme.

Packages have to be moved around in the module because they need to be defined
in a particular order : TEXLIVE-SCHEME-BASIC < TEXLIVE-UPDMAP.CFG < any
texlive package making use of TEXLIVE-UPDMAP.CFG.

* gnu/packages/tex.scm (texlive-updmap.cfg): Provide TEXLIVE-SCHEME-BASIC.
---
 gnu/packages/tex.scm | 406 ++++++++++++++++++++++++---------------------------
 1 file changed, 193 insertions(+), 213 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 20359fec68..47bbc243a6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -802,6 +802,199 @@ This package contains the binaries.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))
     (home-page "https://www.tug.org/texlive/")))
 
+;; This package must be located before `texlive-updmap.cfg' in the module.
+(define-public texlive-scheme-basic
+  (package
+    (name "texlive-scheme-basic")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs (list texlive-collection-basic texlive-collection-latex))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Basic scheme (plain and latex)")
+    (description
+     "This is the basic TeX Live scheme: it is a small set of files sufficient
+to typeset plain TeX or LaTeX documents in PostScript or PDF, using the
+Computer Modern fonts.  This scheme corresponds to @code{collection-basic} and
+@code{collection-latex}.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
+(define-deprecated-package texlive-base texlive-scheme-basic)
+
+(define-public texlive-scheme-bookpub
+  (package
+    (name "texlive-scheme-bookpub")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-barcodes
+           texlive-biber
+           texlive-biblatex
+           texlive-bookcover
+           texlive-caption
+           texlive-collection-basic
+           texlive-collection-latex
+           texlive-enumitem
+           texlive-fontspec
+           texlive-latexmk
+           texlive-lipsum
+           texlive-listings
+           texlive-markdown
+           texlive-memoir
+           texlive-microtype
+           texlive-minted
+           texlive-novel
+           texlive-octavo
+           texlive-pdfpages
+           texlive-pgf
+           texlive-qrcode
+           texlive-shapes
+           texlive-titlesec
+           texlive-tocloft
+           texlive-tufte-latex
+           texlive-willowtreebook))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Book publishing scheme (core LaTeX and add-ons)")
+    (description
+     "This is a book publishing scheme, containing core (Lua)LaTeX and
+selected additional packages likely to be useful for non-technical book
+publication.  It does not contain additional fonts (different books need
+different fonts, and the packages are large), nor does it contain additional
+mathematical or other technical packages.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
+(define-public texlive-scheme-context
+  (package
+    (name "texlive-scheme-context")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-antt
+           texlive-asana-math
+           texlive-ccicons
+           texlive-collection-context
+           texlive-collection-metapost
+           texlive-dejavu
+           texlive-eulervm
+           texlive-gentium-tug
+           texlive-iwona
+           texlive-kurier
+           texlive-ly1
+           texlive-manfnt-font
+           texlive-marvosym
+           texlive-mflogo-font
+           texlive-poltawski
+           texlive-pxfonts
+           texlive-tex-gyre
+           texlive-tex-gyre-math
+           texlive-txfonts
+           texlive-wasy
+           texlive-xits))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "ConTeXt scheme")
+    (description "This is the TeX Live scheme for installing ConTeXt.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
+(define-public texlive-scheme-minimal
+  (package
+    (name "texlive-scheme-minimal")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs (list texlive-collection-basic))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Minimal scheme (plain only)")
+    (description
+     "This is the minimal TeX Live scheme, with support for only plain
+TeX. (No LaTeX macros.) LuaTeX is included because Lua scripts are used in TeX
+Live infrastructure.  This scheme corresponds exactly to
+@code{collection-basic}.")
+    (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
+  (lambda* (#:optional (packages '()))
+    "Return a 'texlive-updmap.cfg' package which contains the fonts map
+configuration of a base set of packages plus PACKAGES."
+    (let ((default-packages (list texlive-scheme-basic)))
+      (package
+        (version (number->string %texlive-revision))
+        (source (package-source texlive-scripts))
+        (name "texlive-updmap.cfg")
+        (build-system copy-build-system)
+        (arguments
+         (list
+          #:modules '((guix build copy-build-system)
+                      (guix build utils)
+                      (ice-9 popen)
+                      (ice-9 textual-ports))
+          #:install-plan
+          #~'(("texmf-dist/web2c/updmap.cfg" "share/texmf-config/web2c/")
+              ("texmf-dist/web2c/map" "share/texmf-dist/fonts/map"))
+          #:phases
+          #~(modify-phases %standard-phases
+              (add-before 'install 'regenerate-updmap.cfg
+                (lambda _
+                  (with-directory-excursion "texmf-dist/web2c"
+                    (make-file-writable "updmap.cfg")
+
+                    ;; Disable unavailable map files.
+                    (let* ((port (open-pipe* OPEN_WRITE "updmap-sys"
+                                             "--syncwithtrees"
+                                             "--nohash"
+                                             "--cnffile" "updmap.cfg")))
+                      (display "Y\n" port)
+                      (when (not (zero? (status:exit-val (close-pipe port))))
+                        (error "failed to filter updmap.cfg")))
+
+                    ;; Set TEXMFSYSVAR to a sane and writable value; updmap fails
+                    ;; if it cannot create its log file there.
+                    (setenv "TEXMFSYSVAR" (getcwd))
+
+                    ;; Generate maps.
+                    (invoke "updmap-sys"
+                            "--cnffile"           "updmap.cfg"
+                            "--dvipdfmxoutputdir" "map/dvipdfmx/updmap/"
+                            "--dvipsoutputdir"    "map/dvips/updmap/"
+                            "--pdftexoutputdir"   "map/pdftex/updmap/")))))))
+        (native-inputs (list texlive-scripts))
+        (propagated-inputs (map (lambda (package)
+                                  (list (package-name package) package))
+                                (append default-packages packages)))
+        (home-page (package-home-page texlive-bin))
+        (synopsis "TeX Live fonts map configuration")
+        (description "This package contains the fonts map configuration file
+generated for the base TeX Live packages as well as, optionally, user-provided
+ones.")
+        (license (delete-duplicates
+                  (fold (lambda (package result)
+                          (match (package-license package)
+                            ((lst ...)
+                             (append lst result))
+                            ((? license:license? license)
+                             (cons license result))))
+                        '()
+                        (append default-packages packages))))))))
+
+(define-deprecated/alias texlive-union texlive-updmap.cfg)
+(export texlive-union)
+
+;; For use in package definitions only
+(define-public texlive-tiny
+  (package
+    (inherit (texlive-updmap.cfg))
+    (name "texlive-tiny")
+    (description "This is a very limited subset of the TeX Live distribution.
+It includes little more than the required set of LaTeX packages.")))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
@@ -5150,105 +5343,6 @@ the engine in use.")
 (define-deprecated-package texlive-generic-iftex texlive-iftex)
 (define-deprecated-package texlive-generic-ifxetex texlive-iftex)
 
-(define-public texlive-updmap.cfg
-  (lambda* (#:optional (packages '()))
-    "Return a 'texlive-updmap.cfg' package which contains the fonts map
-configuration of a base set of packages plus PACKAGES."
-    (let ((default-packages
-            (list texlive-bin
-                  texlive-cm
-                  texlive-cm-super
-                  texlive-dvips
-                  texlive-ec
-                  texlive-epstopdf-pkg
-                  texlive-etex
-                  texlive-etex-pkg
-                  texlive-fontname
-                  texlive-ifplatform
-                  texlive-iftex
-                  texlive-kpathsea
-                  texlive-latex-bin
-                  texlive-latex-fonts
-                  texlive-metafont
-                  texlive-tex
-                  ;; LaTeX packages from the "required" set.
-                  texlive-amsmath
-                  texlive-amscls
-                  texlive-babel
-                  texlive-babel-english
-                  texlive-cyrillic
-                  texlive-psnfss
-                  texlive-tools)))
-      (package
-        (version (number->string %texlive-revision))
-        (source (package-source texlive-scripts))
-        (name "texlive-updmap.cfg")
-        (build-system copy-build-system)
-        (arguments
-         (list
-          #:modules '((guix build copy-build-system)
-                      (guix build utils)
-                      (ice-9 popen)
-                      (ice-9 textual-ports))
-          #:install-plan
-          #~'(("texmf-dist/web2c/updmap.cfg" "share/texmf-config/web2c/")
-              ("texmf-dist/web2c/map" "share/texmf-dist/fonts/map"))
-          #:phases
-          #~(modify-phases %standard-phases
-              (add-before 'install 'regenerate-updmap.cfg
-                (lambda _
-                  (with-directory-excursion "texmf-dist/web2c"
-                    (make-file-writable "updmap.cfg")
-
-                    ;; Disable unavailable map files.
-                    (let* ((port (open-pipe* OPEN_WRITE "updmap-sys"
-                                             "--syncwithtrees"
-                                             "--nohash"
-                                             "--cnffile" "updmap.cfg")))
-                      (display "Y\n" port)
-                      (when (not (zero? (status:exit-val (close-pipe port))))
-                        (error "failed to filter updmap.cfg")))
-
-                    ;; Set TEXMFSYSVAR to a sane and writable value; updmap fails
-                    ;; if it cannot create its log file there.
-                    (setenv "TEXMFSYSVAR" (getcwd))
-
-                    ;; Generate maps.
-                    (invoke "updmap-sys"
-                            "--cnffile"           "updmap.cfg"
-                            "--dvipdfmxoutputdir" "map/dvipdfmx/updmap/"
-                            "--dvipsoutputdir"    "map/dvips/updmap/"
-                            "--pdftexoutputdir"   "map/pdftex/updmap/")))))))
-        (native-inputs (list texlive-scripts))
-        (propagated-inputs (map (lambda (package)
-                                  (list (package-name package) package))
-                                (append default-packages packages)))
-        (home-page (package-home-page texlive-bin))
-        (synopsis "TeX Live fonts map configuration")
-        (description "This package contains the fonts map configuration file
-generated for the base TeX Live packages as well as, optionally, user-provided
-ones.")
-        (license (delete-duplicates
-                  (fold (lambda (package result)
-                          (match (package-license package)
-                            ((lst ...)
-                             (append lst result))
-                            ((? license:license? license)
-                             (cons license result))))
-                        '()
-                        (append default-packages packages))))))))
-
-(define-deprecated/alias texlive-union texlive-updmap.cfg)
-(export texlive-union)
-
-;; For use in package definitions only
-(define-public texlive-tiny
-  (package
-    (inherit (texlive-updmap.cfg))
-    (name "texlive-tiny")
-    (description "This is a very limited subset of the TeX Live distribution.
-It includes little more than the required set of LaTeX packages.")))
-
 (define-public texlive-tipa
   (package
     (name "texlive-tipa")
@@ -18870,120 +18964,6 @@ break statement, except that the loop does not terminate until the end of the
 current iteration.")
     (license license:lppl)))
 
-(define-public texlive-scheme-basic
-  (package
-    (name "texlive-scheme-basic")
-    (version (number->string %texlive-revision))
-    (source #f)
-    (build-system trivial-build-system)
-    (arguments (list #:builder #~(mkdir #$output)))
-    (propagated-inputs (list texlive-collection-basic texlive-collection-latex))
-    (home-page "https://www.tug.org/texlive/")
-    (synopsis "Basic scheme (plain and latex)")
-    (description
-     "This is the basic TeX Live scheme: it is a small set of files sufficient
-to typeset plain TeX or LaTeX documents in PostScript or PDF, using the
-Computer Modern fonts.  This scheme corresponds to @code{collection-basic} and
-@code{collection-latex}.")
-    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
-
-(define-deprecated-package texlive-base texlive-scheme-basic)
-
-(define-public texlive-scheme-bookpub
-  (package
-    (name "texlive-scheme-bookpub")
-    (version (number->string %texlive-revision))
-    (source #f)
-    (build-system trivial-build-system)
-    (arguments (list #:builder #~(mkdir #$output)))
-    (propagated-inputs
-     (list texlive-barcodes
-           texlive-biber
-           texlive-biblatex
-           texlive-bookcover
-           texlive-caption
-           texlive-collection-basic
-           texlive-collection-latex
-           texlive-enumitem
-           texlive-fontspec
-           texlive-latexmk
-           texlive-lipsum
-           texlive-listings
-           texlive-markdown
-           texlive-memoir
-           texlive-microtype
-           texlive-minted
-           texlive-novel
-           texlive-octavo
-           texlive-pdfpages
-           texlive-pgf
-           texlive-qrcode
-           texlive-shapes
-           texlive-titlesec
-           texlive-tocloft
-           texlive-tufte-latex
-           texlive-willowtreebook))
-    (home-page "https://www.tug.org/texlive/")
-    (synopsis "Book publishing scheme (core LaTeX and add-ons)")
-    (description
-     "This is a book publishing scheme, containing core (Lua)LaTeX and
-selected additional packages likely to be useful for non-technical book
-publication.  It does not contain additional fonts (different books need
-different fonts, and the packages are large), nor does it contain additional
-mathematical or other technical packages.")
-    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
-
-(define-public texlive-scheme-context
-  (package
-    (name "texlive-scheme-context")
-    (version (number->string %texlive-revision))
-    (source #f)
-    (build-system trivial-build-system)
-    (arguments (list #:builder #~(mkdir #$output)))
-    (propagated-inputs
-     (list texlive-antt
-           texlive-asana-math
-           texlive-ccicons
-           texlive-collection-context
-           texlive-collection-metapost
-           texlive-dejavu
-           texlive-eulervm
-           texlive-gentium-tug
-           texlive-iwona
-           texlive-kurier
-           texlive-ly1
-           texlive-manfnt-font
-           texlive-marvosym
-           texlive-mflogo-font
-           texlive-poltawski
-           texlive-pxfonts
-           texlive-tex-gyre
-           texlive-tex-gyre-math
-           texlive-txfonts
-           texlive-wasy
-           texlive-xits))
-    (home-page "https://www.tug.org/texlive/")
-    (synopsis "ConTeXt scheme")
-    (description "This is the TeX Live scheme for installing ConTeXt.")
-    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
-
-(define-public texlive-scheme-minimal
-  (package
-    (name "texlive-scheme-minimal")
-    (version (number->string %texlive-revision))
-    (source #f)
-    (build-system trivial-build-system)
-    (arguments (list #:builder #~(mkdir #$output)))
-    (propagated-inputs (list texlive-collection-basic))
-    (home-page "https://www.tug.org/texlive/")
-    (synopsis "Minimal scheme (plain only)")
-    (description
-     "This is the minimal TeX Live scheme, with support for only plain
-TeX. (No LaTeX macros.) LuaTeX is included because Lua scripts are used in TeX
-Live infrastructure.  This scheme corresponds exactly to
-@code{collection-basic}.")
-    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
-
 ;;;
 ;;; 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
-- 
cgit 1.4.1


From 7a18bd9e74b56a04ec7e4e120789e91d78830444 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 3 Jul 2023 12:51:49 +0200
Subject: gnu: Rationalize texlive-updmap.cfg and texlive-tiny inputs.

TEXLIVE-UPDMAP.CFG and TEXLIVE-TINY should only be used as native inputs.
Also remove texlive packages already provided by them.

* doc/build.scm (pdf-manual):
* gnu/packages/algebra.scm (pari-gp):
* gnu/packages/bioinformatics.scm (discrover):
(phyml):
(velvet):
* gnu/packages/chemistry.scm (yaehmop):
* gnu/packages/chez.scm (stex-bootstrap):
(chez-web):
(chez-sockets):
* gnu/packages/cran.scm (r-prereg):
* gnu/packages/docbook.scm (dblatex):
* gnu/packages/emacs-xyz.scm (emacs-auctex):
* gnu/packages/engineering.scm (fastcap):
* gnu/packages/fsf.scm (book-faif):
* gnu/packages/graphviz.scm (dot2tex):
* gnu/packages/maths.scm (hypre):
* gnu/packages/ocaml.scm (unison):
(ocaml-bibtex2html):
* gnu/packages/plotutils.scm (asymptote):
* gnu/packages/python-xyz.scm (python-nbconvert):
(python-pypandoc):
* gnu/packages/radio.scm (gnuradio):
(libosmo-dsp):
* gnu/packages/statistics.scm (r-with-tests):
* gnu/packages/tex.scm (texlive-makecmds):
(texlive-innerscript):
(teximpatient):
(texlive-xkeyval): Remove texlive packages already provided by
TEXLIVE-UPDMAP.CFG.  Don't add TEXLIVE-TINY or TEXLIVE-UPDMAP.CFG as inputs.
---
 doc/build.scm                   |  4 +-
 gnu/packages/algebra.scm        |  3 +-
 gnu/packages/bioinformatics.scm | 20 ++--------
 gnu/packages/chemistry.scm      |  5 +--
 gnu/packages/chez.scm           | 20 ++--------
 gnu/packages/cran.scm           |  2 +-
 gnu/packages/docbook.scm        | 18 +++------
 gnu/packages/emacs-xyz.scm      |  3 +-
 gnu/packages/engineering.scm    |  2 +-
 gnu/packages/fsf.scm            |  3 --
 gnu/packages/graphviz.scm       |  3 +-
 gnu/packages/maths.scm          | 82 +++++++++++++++++++----------------------
 gnu/packages/ocaml.scm          | 10 ++---
 gnu/packages/plotutils.scm      |  8 +---
 gnu/packages/python-xyz.scm     | 28 +++++---------
 gnu/packages/radio.scm          | 11 ++----
 gnu/packages/statistics.scm     | 10 +----
 gnu/packages/tex.scm            | 34 +++++------------
 18 files changed, 85 insertions(+), 181 deletions(-)

diff --git a/doc/build.scm b/doc/build.scm
index 577f900e20..2cd57b4a92 100644
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -913,9 +913,7 @@ makeinfo OPTIONS."
                      tar
                      texinfo
                      (texlive-updmap.cfg
-                      (list texlive-ec
-                            texlive-epsf
-                            texlive-texinfo)))))))
+                      (list texlive-epsf texlive-texinfo)))))))
 
   (define build
     (with-imported-modules '((guix build utils))
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index c755bc7060..896cf1bb9a 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -236,8 +236,7 @@ the real span of the lattice.")
                (base32
                 "03swii601kxnphl6v7wv0rh2xn4rz6xbljzvfw5v9py6w3z5nm63"))))
     (build-system gnu-build-system)
-    (native-inputs (list (texlive-updmap.cfg
-                          (list texlive-amsfonts))))
+    (native-inputs (list texlive-tiny))
     (inputs (list gmp libx11 perl readline))
     (arguments
      '(#:make-flags '("all")
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 5021eea6c1..aff5a552e7 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4765,15 +4765,10 @@ data and settings.")
      (list boost cairo rmath-standalone))
     (native-inputs
      (list (texlive-updmap.cfg
-            (list texlive-cm
-                  texlive-amsfonts
-                  texlive-doi
-                  texlive-ec
+            (list texlive-doi
                   texlive-examplep
-                  texlive-hyperref
                   texlive-ms
                   texlive-natbib
-                  texlive-bibtex        ;style files used by natbib
                   texlive-pgf           ;tikz
                   texlive-verbatimbox))
            imagemagick))
@@ -12104,14 +12099,9 @@ programs for inferring phylogenies (evolutionary trees).")
            autoconf
            openmpi
            (texlive-updmap.cfg
-            (list texlive-amsfonts
-                  texlive-caption
+            (list texlive-caption
                   texlive-cite
-                  texlive-ec
                   texlive-fancyvrb
-                  texlive-graphics
-                  texlive-grfext
-                  texlive-hyperref
                   texlive-infwarerr
                   texlive-kvoptions
                   texlive-pdftexcmds
@@ -17094,11 +17084,7 @@ to an artifact/contaminant file.")
      (list openmpi zlib))
     (native-inputs
      (list (texlive-updmap.cfg
-            (list texlive-ec
-                  texlive-graphics
-                  texlive-grfext
-                  texlive-hyperref
-                  texlive-infwarerr
+            (list texlive-infwarerr
                   texlive-kvoptions
                   texlive-pdftexcmds))))
     (home-page "https://www.ebi.ac.uk/~zerbino/velvet/")
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 95c5905cf3..bee540bc16 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -900,10 +900,7 @@ emphasis on quality rather than speed.")
     (native-inputs
      (list gfortran
            (texlive-updmap.cfg
-            (list texlive-ec
-                  texlive-epstopdf
-                  texlive-geometry
-                  texlive-graphics
+            (list texlive-epstopdf
                   texlive-latexmk))))
     (home-page "https://github.com/greglandrum/yaehmop")
     (synopsis "Perform extended Hückel calculations")
diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index 86dd47d2ec..99c8dcac3a 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -759,13 +759,7 @@ Chez Scheme.")))
        ;; though it would probably be easy to add.
        (propagated-inputs
         (list xorg-rgb
-              (texlive-updmap.cfg
-               (list texlive-bibtex
-                     texlive-ec
-                     texlive-epsf
-                     texlive-hyperref
-                     texlive-l3backend
-                     texlive-oberdiek))
+              (texlive-updmap.cfg (list texlive-epsf))
               ghostscript
               netpbm))
        ;; Debian uses a versionless path for STEXLIB,
@@ -1018,14 +1012,8 @@ create compilers, making them easier to understand and maintain.")
              ;;     mktexpk: don't know how to create bitmap font for bchr8r
              ;; Replacing the following with `texlive` fixes it.
              ;; What is missing?
-             (texlive-updmap.cfg (list texlive-oberdiek
-                                       texlive-epsf
-                                       texlive-metapost
-                                       texlive-charter
-                                       texlive-pdftex
-                                       texlive-context
-                                       texlive-cm
-                                       texlive-plain))))
+             (texlive-updmap.cfg
+              (list texlive-context texlive-epsf texlive-metapost))))
       (arguments
        (list
         #:make-flags
@@ -1079,7 +1067,7 @@ programming in Scheme.")
       (native-inputs
        (list (chez-scheme-for-system)
              chez-web
-             (texlive-updmap.cfg (list texlive-pdftex))))
+             texlive-tiny))
       (arguments
        (list
         #:tests? #f ; no tests
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index c4276ea147..bc2f7acb7f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -36207,7 +36207,7 @@ package online.")
            texlive-tools
            texlive-ulem
            texlive-upquote
-           (texlive-updmap.cfg (list texlive-amsfonts texlive-lm))))
+           (texlive-updmap.cfg (list texlive-lm))))
     (home-page "https://github.com/crsh/prereg")
     (synopsis
      "R Markdown Templates to preregister Scientific Studies")
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index f16c8130e4..ff6d32b168 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -534,38 +534,30 @@ the in DocBook SGML DTDs.")
     (build-system python-build-system)
     ;; TODO: Add xfig/transfig for fig2dev utility
     (inputs
-     `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
-                                             texlive-anysize
+     `(("texlive" ,(texlive-updmap.cfg (list texlive-anysize
                                              texlive-appendix
-                                             texlive-bookmark
                                              texlive-changebar
-                                             texlive-colortbl
                                              texlive-fancybox
-                                             texlive-fancyhdr
                                              texlive-fancyvrb
                                              texlive-float
                                              texlive-footmisc
-                                             texlive-hyperref
                                              texlive-jknapltx
                                              texlive-listings
                                              texlive-multirow
                                              texlive-overpic
                                              texlive-pdfpages
                                              texlive-refcount
-                                             texlive-subfigure
-                                             texlive-titlesec
-                                             texlive-wasysym
-
                                              texlive-rsfs
                                              texlive-stmaryrd
-
-                                             texlive-iftex)))
+                                             texlive-subfigure
+                                             texlive-titlesec
+                                             texlive-wasysym)))
        ("imagemagick" ,imagemagick)     ;for convert
        ("inkscape" ,inkscape/stable)    ;for svg conversion
        ("docbook" ,docbook-xml)
        ("libxslt" ,libxslt)))           ;for xsltproc
     (arguments
-     `(;; Using setuptools causes an invalid "package_base" path in
+     `( ;; Using setuptools causes an invalid "package_base" path in
        ;; out/bin/.dblatex-real due to a missing leading '/'.  This is caused
        ;; by dblatex's setup.py stripping the root path when creating the
        ;; script.  (dblatex's setup.py still uses distutils and thus has to
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 748add0cae..39c539afe7 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3985,8 +3985,7 @@ as a library for other Emacs packages.")
     (native-inputs
      (list perl))
     (inputs
-     (list ghostscript
-           (texlive-updmap.cfg (list texlive-amsfonts))))
+     (list ghostscript))
     (home-page "https://www.gnu.org/software/auctex/")
     (synopsis "Integrated environment for TeX")
     (description
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 4499d9e07c..8ee8e99b34 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -578,7 +578,7 @@ featuring various improvements and bug fixes.")))
      ;; FIXME: with texlive-tiny citation references are rendered as question
      ;; marks.  During the build warnings like these are printed:
      ;; LaTeX Warning: Citation `nabors91' on page 2 undefined on input line 3.
-     `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts)))
+     `(("texlive" ,texlive-tiny)
        ("ghostscript" ,ghostscript)))
     (arguments
      `(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all")
diff --git a/gnu/packages/fsf.scm b/gnu/packages/fsf.scm
index b07ad14164..e952978bbf 100644
--- a/gnu/packages/fsf.scm
+++ b/gnu/packages/fsf.scm
@@ -39,12 +39,9 @@
     (native-inputs
      (list (texlive-updmap.cfg
             (list texlive-caption
-                  texlive-ec
                   texlive-endnotes
                   texlive-fncychap
-                  texlive-geometry
                   texlive-helvetic
-                  texlive-hyperref
                   texlive-times
                   texlive-ucs))))
     (arguments
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 08dd73b24f..b91c365e3c 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -382,8 +382,7 @@ graphs in Graphviz's DOT language, written in pure Python.")
     (native-inputs
      (list python-pytest
            (texlive-updmap.cfg
-            (list texlive-geometry
-                  texlive-pgf
+            (list texlive-pgf
                   texlive-preview
                   texlive-pstricks
                   texlive-xcolor
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 5083b5bb6b..27ded198d0 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5777,50 +5777,44 @@ set.")
            python
            python-breathe
            python-sphinx
-           (texlive-updmap.cfg (list texlive-adjustbox
-                                     texlive-alphalph
-                                     texlive-amsfonts
-                                     texlive-bibtex
-                                     texlive-capt-of
-                                     texlive-caption
-                                     texlive-cm
-                                     texlive-cmap
-                                     texlive-colortbl
-                                     texlive-courier
-                                     texlive-enumitem
-                                     texlive-etoc
-                                     texlive-etoolbox
-                                     texlive-fancyhdr
-                                     texlive-fancyvrb
-                                     texlive-float
-                                     texlive-fncychap
-                                     texlive-framed
-                                     texlive-geometry
-                                     texlive-hanging
-                                     texlive-helvetic
-                                     texlive-hyperref
-                                     texlive-jknapltx
-                                     texlive-latexmk
-                                     texlive-listofitems
-                                     texlive-multirow
-                                     texlive-natbib
-                                     texlive-needspace
-                                     texlive-newunicodechar
-                                     texlive-parskip
-                                     texlive-sectsty
-                                     texlive-stackengine
-                                     texlive-tabulary
-                                     texlive-tex-gyre
-                                     texlive-titlesec
-                                     texlive-tocloft
-                                     texlive-ulem
-                                     texlive-upquote
-                                     texlive-varwidth
-                                     texlive-wasy
-                                     texlive-wasysym
-                                     texlive-wrapfig
-                                     texlive-xcolor
-                                     texlive-xypic))))
+           (texlive-updmap.cfg
+            (list texlive-adjustbox
+                  texlive-alphalph
+                  texlive-capt-of
+                  texlive-caption
+                  texlive-cmap
+                  texlive-courier
+                  texlive-enumitem
+                  texlive-etoc
+                  texlive-etoolbox
+                  texlive-fancyvrb
+                  texlive-float
+                  texlive-fncychap
+                  texlive-framed
+                  texlive-hanging
+                  texlive-helvetic
+                  texlive-jknapltx
+                  texlive-latexmk
+                  texlive-listofitems
+                  texlive-multirow
+                  texlive-natbib
+                  texlive-needspace
+                  texlive-newunicodechar
+                  texlive-parskip
+                  texlive-sectsty
+                  texlive-stackengine
+                  texlive-tabulary
+                  texlive-tex-gyre
+                  texlive-titlesec
+                  texlive-tocloft
+                  texlive-ulem
+                  texlive-upquote
+                  texlive-varwidth
+                  texlive-wasy
+                  texlive-wasysym
+                  texlive-wrapfig
+                  texlive-xcolor
+                  texlive-xypic))))
     (inputs
      (list openblas lapack))
     (arguments
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index e919c40973..bc09b111ab 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1377,8 +1377,7 @@ libpanel, librsvg and quartz.")
      `(("ocaml" ,ocaml-4.09)
        ;; For documentation
        ("ghostscript" ,ghostscript)
-       ("texlive" ,(texlive-updmap.cfg
-                    (list texlive-ec texlive-l3backend)))
+       ("texlive" ,texlive-tiny)
        ("hevea" ,hevea)
        ("lynx" ,lynx)
        ("which" ,which)))
@@ -10258,12 +10257,9 @@ SHA384, SHA512, Blake2b, Blake2s and RIPEMD160.")
               (setenv "HOME" (getcwd)))))))
     (native-inputs
      (list (texlive-updmap.cfg
-            (list texlive-bibtex
-                  texlive-hyperref
-                  texlive-infwarerr
+            (list texlive-infwarerr
                   texlive-kvoptions
-                  texlive-pdftexcmds
-                  texlive-preprint))
+                  texlive-pdftexcmds))
            which))
     (propagated-inputs
      (list hevea))
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 00ddd34355..06ffa95532 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -307,18 +307,12 @@ colors, styles, options and details.")
            rapidjson
            texinfo                      ;for generating documentation
            (texlive-updmap.cfg
-            (list texlive-amsfonts
-                  texlive-ec
-                  texlive-epsf
+            (list texlive-epsf
                   texlive-etoolbox
-                  texlive-geometry
-                  texlive-grfext
-                  texlive-hyperref
                   texlive-infwarerr
                   texlive-kvdefinekeys
                   texlive-kvoptions
                   texlive-media9
-                  texlive-oberdiek      ;for ifluatex
                   texlive-ocgx2
                   texlive-parskip
                   texlive-pdftexcmds
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ac560bfcfd..2d8a942309 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15200,17 +15200,15 @@ time.")
            texlive-ulem
            texlive-unicode-math
            texlive-xcolor
-           (texlive-updmap.cfg (list texlive-amsfonts
-                                     texlive-amsmath
-                                     texlive-eurosym
-                                     texlive-jknapltx
-                                     texlive-lm
-                                     texlive-lm-math
-                                     texlive-mathpazo
-                                     texlive-oberdiek
-                                     texlive-rsfs
-                                     texlive-ucs
-                                     texlive-zapfding))))
+           (texlive-updmap.cfg
+            (list texlive-eurosym
+                  texlive-jknapltx
+                  texlive-lm
+                  texlive-lm-math
+                  texlive-mathpazo
+                  texlive-rsfs
+                  texlive-ucs
+                  texlive-zapfding))))
     (home-page "https://jupyter.org")
     (synopsis "Converting Jupyter Notebooks")
     (description "The @code{nbconvert} tool, @code{jupyter nbconvert}, converts
@@ -29190,13 +29188,7 @@ By default it uses the open Python vulnerability database Safety DB.")
     (propagated-inputs
      `(("wheel" ,python-wheel)))
     (native-inputs
-     `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
-                                        texlive-ec
-                                        texlive-iftex
-                                        texlive-hyperref
-                                        texlive-lm
-                                        texlive-oberdiek
-                                        texlive-xcolor)))))
+     `(("texlive" ,(texlive-updmap.cfg (list texlive-lm texlive-xcolor)))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 0ef9896de9..43c9f22c66 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -709,10 +709,8 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
            python-pyzmq
            python-scipy
            python-sphinx
-           (texlive-updmap.cfg (list texlive-amsfonts
-                                     texlive-amsmath
-                                     ;; TODO: Add newunicodechar.
-                                     texlive-graphics))
+           texlive-tiny
+           (texlive-updmap.cfg (list texlive-newunicodechar))
            xorg-server-for-tests))
     (inputs
      (list alsa-lib
@@ -919,10 +917,7 @@ to access different radio hardware.")
        ("doxygen" ,doxygen)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
-       ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
-                                        texlive-amsmath
-                                        ;; TODO: Add newunicodechar.
-                                        texlive-graphics)))))
+       ("texlive" ,(texlive-updmap.cfg (list texlive-newunicodechar)))))
     (inputs
      (list fftwf))
     (arguments
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 1cea3afda5..51c41bb0b8 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -389,17 +389,9 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
            pkg-config
            texinfo                      ; for building HTML manuals
            (texlive-updmap.cfg
-            (list texlive-ae
-                  texlive-amsfonts
-                  texlive-ec
-                  texlive-fancyvrb
-                  texlive-grfext
-                  texlive-hyperref
+            (list texlive-fancyvrb
                   texlive-inconsolata
-                  texlive-oberdiek
-                  texlive-tools
                   texlive-upquote
-                  texlive-url
                   texlive-xkeyval))
            tzdata-for-tests
            xz))
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 47bbc243a6..39695080a4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8243,10 +8243,7 @@ diagrams.")
               "05y5n265in7mrbpgjxqg339l8r8dmp6lvl4k528pr3rkb8z94qaf")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (native-inputs
-     (list (texlive-updmap.cfg
-            (list texlive-amsfonts
-                  texlive-cm))))
+    (native-inputs (list texlive-tiny))
     (home-page "https://www.ctan.org/pkg/makecmds")
     (synopsis "TeX macro to define or redefine a command")
     (description "The package provides a @code{\\makecommand} command, which
@@ -9487,13 +9484,9 @@ TeX, and LaTeX font definition and other relevant files.")
                 (("\\DocInput\\{innerscript.dtx\\}") "")))))))
     (native-inputs
      (list (texlive-updmap.cfg
-            (list texlive-amsfonts
-                  texlive-booktabs
-                  texlive-epstopdf-pkg
+            (list texlive-booktabs
                   texlive-etoolbox
-                  texlive-geometry
                   texlive-hypdoc
-                  texlive-hyperref
                   texlive-infwarerr
                   texlive-kvoptions
                   texlive-microtype
@@ -11531,13 +11524,13 @@ and PostScript specials.  A working TeX installation is needed.")
                           (("timestamp.*%")
                            (string-append "timestamp{"
                                           ,version "}"))))))))
-      (native-inputs (list autoconf automake
-                           (texlive-updmap.cfg (list texlive-amsfonts
-                                                     texlive-palatino
-                                                     texlive-zapfding
-                                                     texlive-knuth-lib
-                                                     texlive-mflogo-font
-                                                     texlive-pdftex))))
+      (native-inputs
+       (list autoconf
+             automake
+             (texlive-updmap.cfg
+              (list texlive-mflogo-font
+                    texlive-palatino
+                    texlive-zapfding))))
       (home-page "https://www.gnu.org/software/teximpatient/")
       (synopsis "Book on TeX, plain TeX and Eplain")
       (description
@@ -11603,8 +11596,6 @@ and Karl Berry.")
            qtbase-5
            qtsvg-5
            zlib))
-    (propagated-inputs
-     (list (texlive-updmap.cfg (list texlive-ec))))
     (native-inputs
      (list python pkg-config))
     (home-page "https://www.lyx.org/")
@@ -13928,13 +13919,9 @@ facilities of @code{tabu} in a modified @code{longtable} environment.")
                  "usepackage[dvips]{xcolor}")))))))
     (native-inputs
      (list (texlive-updmap.cfg
-            (list texlive-ec
-                  texlive-footmisc
+            (list texlive-footmisc
                   texlive-fourier
-                  texlive-graphics-def
                   texlive-hypdoc
-                  texlive-hyperref
-                  texlive-iftex
                   texlive-infwarerr
                   texlive-kvoptions
                   texlive-listings
@@ -13942,7 +13929,6 @@ facilities of @code{tabu} in a modified @code{longtable} environment.")
                   texlive-pgf
                   texlive-pst-text
                   texlive-pstricks
-                  texlive-url
                   texlive-xcolor))))
     (home-page "https://ctan.org/pkg/xkeyval")
     (synopsis "Extension of the @code{keyval} package")
-- 
cgit 1.4.1


From 213cde14e3c99c60380803f4a907ffb99cb3d164 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 3 Jul 2023 12:57:03 +0200
Subject: guix: Add linter warning about texlive-updmap.cfg and texlive-tiny.

* guix/lint.scm (check-inputs-should-be-native): Warn when TEXLIVE-UPDMAP.CFG
and TEXLIVE-TINY are not native inputs.
---
 guix/lint.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/guix/lint.scm b/guix/lint.scm
index 72b3f4e7b1..502e695011 100644
--- a/guix/lint.scm
+++ b/guix/lint.scm
@@ -518,6 +518,8 @@ of a package, and INPUT-NAMES, a list of package specifications such as
             "qmake"
             "qttools-5"
             "texinfo"
+            "texlive-tiny"
+            "texlive-updmap.cfg"
             "xorg-server-for-tests"
             "yelp-tools")))
     (map (lambda (input)
-- 
cgit 1.4.1


From 8734aa7b0a550b503d1cd52744653c621da213a3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 3 Jul 2023 13:30:27 +0200
Subject: gnu: Add texlive-forloop.

* gnu/packages/tex.scm (texlive-forloop): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 39695080a4..1cb96f0bfb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1818,6 +1818,26 @@ font filenames.  This makes at most eight-character names from (almost)
 arbitrarily complex font names, thus helping portability of TeX documents.")
     (license license:gpl3+)))
 
+(define-public texlive-forloop
+  (package
+    (name "texlive-forloop")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/forloop/" "source/latex/forloop/"
+                   "tex/latex/forloop/")
+             (base32
+              "14sx6zgilmbs5afp1k5gccix6ijhj0m8jg91blxn66995i6md4f5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/forloop")
+    (synopsis "Iteration in LaTeX")
+    (description
+     "The package provides a command @code{\\forloop} for doing iteration in
+LaTeX macro programming.")
+    ;; No version for the LGPL is specified.  Assuming the broader one.
+    (license license:lgpl2.0+)))
+
 (define-public texlive-cbfonts          ;71 MiB of greek fonts
   (package
     (name "texlive-cbfonts")
-- 
cgit 1.4.1


From e6fc11ae07274582031283f2f63285d1374b583f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 3 Jul 2023 13:42:05 +0200
Subject: gnu: discrover: Fix build.

* gnu/packages/bioinformatics.scm (discrover)[native-inputs]: Add
TEXLIVE-FORLOOP, TEXLIVE-LISTOFITEMS, TEXLIVE-READARRAY.
---
 gnu/packages/bioinformatics.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index aff5a552e7..7f8240b8f9 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4767,9 +4767,12 @@ data and settings.")
      (list (texlive-updmap.cfg
             (list texlive-doi
                   texlive-examplep
+                  texlive-forloop
+                  texlive-listofitems
                   texlive-ms
                   texlive-natbib
                   texlive-pgf           ;tikz
+                  texlive-readarray
                   texlive-verbatimbox))
            imagemagick))
     (home-page "https://dorina.mdc-berlin.de/public/rajewsky/discrover/")
-- 
cgit 1.4.1


From c9efffe3d0bfe9208dc119d9a8a0e87f8ee3b838 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 3 Jul 2023 15:41:35 +0200
Subject: gnu: chez-web: Fix build.

* gnu/packages/chez.scm (chez-web)[native-inputs]: Add TEXLIVE-CHARTER,
TEXLIVE-CWEB, remove TEXLIVE-EPSF.
[arguments]<#:phases>: Add phases to fix ".tex" issues.
---
 gnu/packages/chez.scm | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index 99c8dcac3a..3467783dd3 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -1008,12 +1008,11 @@ create compilers, making them easier to understand and maintain.")
       (native-inputs
        (list (chez-scheme-for-system)
              ghostscript
-             ;; FIXME: This package fails to build with the error:
-             ;;     mktexpk: don't know how to create bitmap font for bchr8r
-             ;; Replacing the following with `texlive` fixes it.
-             ;; What is missing?
              (texlive-updmap.cfg
-              (list texlive-context texlive-epsf texlive-metapost))))
+              (list texlive-charter
+                    texlive-context
+                    texlive-cweb
+                    texlive-metapost))))
       (arguments
        (list
         #:make-flags
@@ -1023,9 +1022,18 @@ create compilers, making them easier to understand and maintain.")
                 ;; lib/chez-scheme/chezweb ???
                 (string-append "LIBDIR=" #$output "/lib/chezweb")
                 (string-append "TEXDIR=" #$output "/share/texmf-local"))
-        #:tests? #f ; no tests
+        #:tests? #f                     ; no tests
         #:phases
         #~(modify-phases %standard-phases
+            (add-after 'unpack 'fix-tex-input
+              (lambda _
+                ;; Fix "I can't find file `supp-pdf'." error.
+                (substitute* "chezweb.w"
+                  (("supp-pdf") "supp-pdf.mkii"))
+                ;; Recent cweb packages do not include "\acrofalse".  Remove
+                ;; it.
+                (substitute* "doc/cwebman.tex"
+                  (("\\acrofalse.*") ""))))
             ;; This package has a custom "bootstrap" script that
             ;; is meant to be run from the Makefile.
             (delete 'bootstrap)
-- 
cgit 1.4.1


From 582ec648c9986a0e267a07da59c9f9712805610d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 3 Jul 2023 19:11:24 +0200
Subject: gnu: asymptote: Fix build.

* gnu/packages/plotutils.scm (asymptote)[native-inputs]: Add TEXLIVE-HYPDOC.
---
 gnu/packages/plotutils.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 06ffa95532..fde3e5bd5c 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -309,6 +309,7 @@ colors, styles, options and details.")
            (texlive-updmap.cfg
             (list texlive-epsf
                   texlive-etoolbox
+                  texlive-hypdoc
                   texlive-infwarerr
                   texlive-kvdefinekeys
                   texlive-kvoptions
-- 
cgit 1.4.1


From 29cc6b1cd6a20f7b077eaf9557db585af019c5f6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 3 Jul 2023 22:04:36 +0200
Subject: gnu: Deprecate `texlive-tiny'.

At this point, there are three equivalent TeX Live sub-systems:
texlive-scheme-basic, texlive-tiny, and (texlive-updmap.cfg).  It is confusing
to keep so many around.

* doc/contributing.texi (Submitting Patches): Remove reference to
TEXLIVE-TINY.
* gnu/packages/algebra.scm (pari-gp)[native-inputs]:
(giac)[native-inputs]:
* gnu/packages/chez.scm (chez-sockets)[native-inputs]:
* gnu/packages/engineering.scm (fastcap)[native-inputs]:
* gnu/packages/gettext.scm (po4a)[native-inputs]:
* gnu/packages/maths.scm (cddlib)[native-inputs]:
(gnuplot)[native-inputs]:
(itpp)[native-inputs]:
* gnu/packages/ocaml.scm (unison)[native-inputs]:
* gnu/packages/pdf.scm (extractpdfmark)[native-inputs]:
* gnu/packages/photo.scm (enblend-enfuse): Replace TEXLIVE-TINY with a call to TEXLIVE-UPDMAP.CFG.
* gnu/packages/radio.scm (gnuradio)[native-inputs]: Remove unnecessary
TEXLIVE-TINY.
* gnu/packages/tex.scm (texlive-tiny): Deprecate it in favor of TEXLIVE-SCHEME-BASIC.
(texlive-makecmds)[native-inputs]:  Replace TEXLIVE-TINY with a call to TEXLIVE-UPDMAP.CFG.
* guix/lint.scm (check-inputs-should-be-native): Check only for
"texlive-updmap.cfg" input name.
---
 doc/contributing.texi        |  6 +++---
 gnu/packages/algebra.scm     |  4 ++--
 gnu/packages/chez.scm        |  4 ++--
 gnu/packages/engineering.scm |  9 +++++----
 gnu/packages/gettext.scm     |  2 +-
 gnu/packages/graphics.scm    |  2 +-
 gnu/packages/maths.scm       | 41 +++++++++++++++++++++--------------------
 gnu/packages/ocaml.scm       |  2 +-
 gnu/packages/pdf.scm         |  2 +-
 gnu/packages/photo.scm       |  2 +-
 gnu/packages/radio.scm       |  1 -
 gnu/packages/tex.scm         | 15 +++------------
 guix/lint.scm                |  1 -
 13 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index 3a402c13a9..86fae497f1 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -1252,9 +1252,9 @@ Take a look at the profile reported by @command{guix size}
 (@pxref{Invoking guix size}).  This will allow you to notice references
 to other packages unwillingly retained.  It may also help determine
 whether to split the package (@pxref{Packages with Multiple Outputs}),
-and which optional dependencies should be used.  In particular, avoid adding
-@code{texlive} as a dependency: because of its extreme size, use
-the @code{texlive-tiny} package or @code{texlive-union} procedure instead.
+and which optional dependencies should be used.  In particular, avoid
+adding @code{texlive} as a dependency: because of its extreme size, use
+@code{texlive-updmap.cfg} procedure instead.
 
 @item
 Check that dependent packages (if applicable) are not affected by the
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 896cf1bb9a..83eb63e206 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -236,7 +236,7 @@ the real span of the lattice.")
                (base32
                 "03swii601kxnphl6v7wv0rh2xn4rz6xbljzvfw5v9py6w3z5nm63"))))
     (build-system gnu-build-system)
-    (native-inputs (list texlive-tiny))
+    (native-inputs (list (texlive-updmap.cfg)))
     (inputs (list gmp libx11 perl readline))
     (arguments
      '(#:make-flags '("all")
@@ -405,7 +405,7 @@ precision.")
            hevea
            python-wrapper
            readline
-           texlive-tiny))
+           (texlive-updmap.cfg)))
     (home-page "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html")
     (synopsis "Computer algebra system")
     (description
diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index 3467783dd3..a5cb5a2e06 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -1075,10 +1075,10 @@ programming in Scheme.")
       (native-inputs
        (list (chez-scheme-for-system)
              chez-web
-             texlive-tiny))
+             (texlive-updmap.cfg)))
       (arguments
        (list
-        #:tests? #f ; no tests
+        #:tests? #f                     ; no tests
         #:phases
         #~(modify-phases %standard-phases
             (replace 'configure
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 8ee8e99b34..c2846f0bda 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -575,10 +575,11 @@ featuring various improvements and bug fixes.")))
                                        "fastcap-mulGlobal.patch"))))
     (build-system gnu-build-system)
     (native-inputs
-     ;; FIXME: with texlive-tiny citation references are rendered as question
-     ;; marks.  During the build warnings like these are printed:
-     ;; LaTeX Warning: Citation `nabors91' on page 2 undefined on input line 3.
-     `(("texlive" ,texlive-tiny)
+     ;; FIXME: with (texlive-updmap.cfg) citation references are rendered as
+     ;; question marks.  During the build warnings like these are printed:
+     ;; LaTeX Warning: Citation `nabors91' on page 2 undefined on input line
+     ;; 3.
+     `(("texlive" ,(texlive-updmap.cfg))
        ("ghostscript" ,ghostscript)))
     (arguments
      `(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all")
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 114d8cf7af..21ef05b811 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -292,7 +292,7 @@ from Markdown files.")
            ;; For tests.
            docbook-xml-4.1.2
            perl-test-pod
-           texlive-tiny))
+           (texlive-updmap.cfg)))
     (inputs
      (list bash-minimal
            perl-gettext
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 02b73d5197..da49f23f1f 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -2472,7 +2472,7 @@ generated discrete signed distance field using the cubic spline kernel.
      (list doxygen graphviz
            ;; TODO: Fix failing LaTeX invocation (which results in equations
            ;; being inserted literally into PNGs rather than being typeset).
-           ;;texlive-tiny
+           ;; (texlive-updmap.cfg)
 
            perl))                            ;used to generate Fortran headers
     (inputs
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 27ded198d0..40c1433284 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -829,29 +829,30 @@ integer programming problems and computes Markov bases for statistics.")
     (version "0.94m")
     (source
      (origin
-      (method git-fetch)
-      (uri (git-reference
-            (url "https://github.com/cddlib/cddlib")
-            (commit version)))
-      (file-name (git-file-name name version))
-      (sha256
-       (base32
-        "09s8323h5w9j6mpl1yc6lm770dkskfxd2ayyafkcjllmnncxzfa0"))))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/cddlib/cddlib")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "09s8323h5w9j6mpl1yc6lm770dkskfxd2ayyafkcjllmnncxzfa0"))))
     (build-system gnu-build-system)
     (inputs
      (list gmp))
-    (native-inputs (list autoconf
-                         automake
-                         libtool
-                         texlive-amsfonts
-                         texlive-l3backend
-                         texlive-graphics
-                         texlive-l3backend
-                         texlive-tiny))
+    (native-inputs
+     (list autoconf
+           automake
+           libtool
+           (texlive-updmap.cfg
+            (list texlive-amsfonts
+                  texlive-graphics
+                  texlive-l3backend
+                  texlive-l3backend))))
     (arguments
      (list #:configure-flags
-             #~(list (string-append "--docdir=" #$output
-                                    "/share/doc/" #$name "-" #$version))))
+           #~(list (string-append "--docdir=" #$output
+                                  "/share/doc/" #$name "-" #$version))))
     (home-page "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html")
     (synopsis "Library for convex hulls and extreme rays of polyhedra")
     (description
@@ -1237,7 +1238,7 @@ in the terminal or with an external viewer.")
         (base32 "1kzmj4yyxvlxqzqbrw6sx6dnvhj1zzqnciyb8ryzy6mdrb3pj4lk"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list pkg-config texlive-tiny))
+     (list pkg-config (texlive-updmap.cfg)))
     (inputs
      (list cairo gd lua pango readline))
     (arguments
@@ -1947,7 +1948,7 @@ the resulting text.")
     ;; FIXME: Even though the fonts are available dvips complains:
     ;; "Font cmmi10 not found; characters will be left blank."
     (native-inputs
-     `(("texlive" ,texlive-tiny)
+     `(("texlive" ,(texlive-updmap.cfg))
        ("ghostscript" ,ghostscript)
        ("doxygen" ,doxygen)))
     (home-page "https://itpp.sourceforge.net")
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index bc09b111ab..7a9045921b 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1377,7 +1377,7 @@ libpanel, librsvg and quartz.")
      `(("ocaml" ,ocaml-4.09)
        ;; For documentation
        ("ghostscript" ,ghostscript)
-       ("texlive" ,texlive-tiny)
+       ("texlive" ,(texlive-updmap.cfg))
        ("hevea" ,hevea)
        ("lynx" ,lynx)
        ("which" ,which)))
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 767cf0c5db..0309434339 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -220,7 +220,7 @@ comparison modes: words, characters, and appearance.")
            gettext-minimal
            ghostscript
            pkg-config
-           texlive-tiny))
+           (texlive-updmap.cfg)))
     (inputs
      (list poppler))
     (home-page "https://github.com/trueroad/extractpdfmark")
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 1e78c8e9fe..309601092b 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -381,7 +381,7 @@ overlapping images, as well as some command line tools.")
            help2man
            imagemagick
            libxml2
-           texlive-tiny
+           (texlive-updmap.cfg)
            tidy-html
            transfig))
     (inputs
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 43c9f22c66..235b648a52 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -709,7 +709,6 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
            python-pyzmq
            python-scipy
            python-sphinx
-           texlive-tiny
            (texlive-updmap.cfg (list texlive-newunicodechar))
            xorg-server-for-tests))
     (inputs
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1cb96f0bfb..888c572a86 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -135,9 +135,7 @@
 ;;; module also provides TEXLIVE-UPDMAP.CFG function, which creates a TeX Live
 ;;; tree with font map files updates.  It should be used exclusively for
 ;;; package definitions, as a native input.  It is possible to augment that
-;;; tree, in particular with additional font packages.  TEXLIVE-TINY package
-;;; is a shortcut for TEXLIVE-UPDMAP.CFG called without any additional
-;;; package.
+;;; tree, in particular with additional font packages.
 ;;;
 ;;; Unlike font map files, TeX formats are not built from a profile hook, as
 ;;; the process would be too time-consuming, e.g., when invoking "guix shell".
@@ -984,17 +982,10 @@ ones.")
                         '()
                         (append default-packages packages))))))))
 
+(define-deprecated-package texlive-tiny texlive-scheme-basic)
 (define-deprecated/alias texlive-union texlive-updmap.cfg)
 (export texlive-union)
 
-;; For use in package definitions only
-(define-public texlive-tiny
-  (package
-    (inherit (texlive-updmap.cfg))
-    (name "texlive-tiny")
-    (description "This is a very limited subset of the TeX Live distribution.
-It includes little more than the required set of LaTeX packages.")))
-
 (define-public texlive-tex
   (package
     (name "texlive-tex")
@@ -8263,7 +8254,7 @@ diagrams.")
               "05y5n265in7mrbpgjxqg339l8r8dmp6lvl4k528pr3rkb8z94qaf")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (native-inputs (list texlive-tiny))
+    (native-inputs (list (texlive-updmap.cfg)))
     (home-page "https://www.ctan.org/pkg/makecmds")
     (synopsis "TeX macro to define or redefine a command")
     (description "The package provides a @code{\\makecommand} command, which
diff --git a/guix/lint.scm b/guix/lint.scm
index 502e695011..d173563e51 100644
--- a/guix/lint.scm
+++ b/guix/lint.scm
@@ -518,7 +518,6 @@ of a package, and INPUT-NAMES, a list of package specifications such as
             "qmake"
             "qttools-5"
             "texinfo"
-            "texlive-tiny"
             "texlive-updmap.cfg"
             "xorg-server-for-tests"
             "yelp-tools")))
-- 
cgit 1.4.1


From 074abeb4f4c03d787e801b3c9ffaf88e2ce8e561 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 6 Jul 2023 18:54:51 +0200
Subject: gnu: ocaml-bibtex2html: Fix build.

* gnu/packages/ocaml.scm (ocaml-bibtex2html)[native-inputs]: Add TEXLIVE-PREPRINT.
---
 gnu/packages/ocaml.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 7a9045921b..8ff755aea9 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -10259,7 +10259,8 @@ SHA384, SHA512, Blake2b, Blake2s and RIPEMD160.")
      (list (texlive-updmap.cfg
             (list texlive-infwarerr
                   texlive-kvoptions
-                  texlive-pdftexcmds))
+                  texlive-pdftexcmds
+                  texlive-preprint))
            which))
     (propagated-inputs
      (list hevea))
-- 
cgit 1.4.1


From e7b08e13fa4a5976a65e3e6d96bda570b98989ed Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 7 Jul 2023 00:05:50 +0200
Subject: gnu: texlive-media9: Add missing files.

* gnu/packages/tex.scm (texlive-media9)[source]: Fix locations to include all files.
---
 gnu/packages/tex.scm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 888c572a86..5c11d1141f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11624,13 +11624,10 @@ required: automatic sectioning and pagination, spell checking and so forth.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/latex/media9/"
-                   "source/latex/media9/files/"
-                   "source/latex/media9/players/"
-                   "tex/latex/media9/javascript/"
-                   "tex/latex/media9/players/")
+             (list "doc/latex/media9/" "source/latex/media9/"
+                   "tex/latex/media9/")
              (base32
-              "03m59icz29sdp50wpl831pl67q9m6kzpq5fzx4jix50z7cmqvfrm")))
+              "1hzwan5y199a6za32h7bn653f2pzd91z9idrq8xdz6fjhns3fcdr")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/media9")
-- 
cgit 1.4.1


From 3729c3adf7f63f9b54e75dab8ec6f56fb7eabc82 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 7 Jul 2023 23:32:56 +0200
Subject: gnu: emacs-auctex: Fix build.

* gnu/packages/emacs-xyz.scm (emacs-auctex)[arguments]<#phases>: Use "dvipng"
and "dvips" from cache.  Fix destination for refcard.
[native-inputs]: Add TEXLIVE-UPDMAP.CFG.
---
 gnu/packages/emacs-xyz.scm | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 39c539afe7..06ba293365 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3962,28 +3962,23 @@ as a library for other Emacs packages.")
              (emacs-substitute-variables "preview.el"
                ("preview-gs-command"
                 (search-input-file inputs "/bin/gs")))
+             ;; Leave "dvipng" and "dvips" executables as-is.  Otherwise, this
+             ;; would require to add a TeX Live system to inputs, which is
+             ;; much for an Emacs package.
              (substitute* "preview.el"
-               (("\"dvipng ")
-                (let ((dvipng (search-input-file inputs "/bin/dvipng")))
-                  (string-append "\"" dvipng " ")))
-               (("\"dvips ")
-                (let ((dvips (search-input-file inputs "/bin/dvips")))
-                  (string-append "\"" dvips " ")))
                (("\"pdf2dsc ")
                 (let ((pdf2dsc (search-input-file inputs "/bin/pdf2dsc")))
                   (string-append "\"" pdf2dsc " "))))))
          (add-after 'install 'install-doc
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
-                    (etc-dir (string-append out "/share/" ,name "/"
-                                            ,version "/etc")))
+                    (doc-dir (string-append out "/share/doc/" ,name "-" ,version)))
                (with-directory-excursion "doc"
                  (setenv "HOME" (getenv  "TMPDIR")) ; for mktextfm
                  (invoke "pdftex" "tex-ref")
-                 (install-file "tex-ref.pdf"
-                               (string-append etc-dir "/refcards")))))))))
+                 (install-file "tex-ref.pdf" doc-dir))))))))
     (native-inputs
-     (list perl))
+     (list perl (texlive-updmap.cfg)))
     (inputs
      (list ghostscript))
     (home-page "https://www.gnu.org/software/auctex/")
-- 
cgit 1.4.1


From f34a65420635d7c776157e56fc65e1b408b1c9e4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 7 Jul 2023 23:38:26 +0200
Subject: gnu: emacs-auctex: Improve package style.

* gnu/packages/emacs-xyz.scm (emacs-auctex)[arguments]: Use G-expressions.
<#:include>: Use %DEFAULT-INCLUDE.
<#:exclude>: Use %DEFAULT-EXCLUDE.
---
 gnu/packages/emacs-xyz.scm | 51 +++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 06ba293365..550e5d2a65 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3952,31 +3952,32 @@ as a library for other Emacs packages.")
     ;; We use 'emacs' because AUCTeX requires dbus at compile time
     ;; ('emacs-minimal' does not provide dbus).
     (arguments
-     `(#:emacs ,emacs
-       #:include '("\\.el$" "^images/" "^latex/" "\\.info$")
-       #:exclude '("^tests/" "^latex/README")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'configure
-           (lambda* (#:key inputs #:allow-other-keys)
-             (emacs-substitute-variables "preview.el"
-               ("preview-gs-command"
-                (search-input-file inputs "/bin/gs")))
-             ;; Leave "dvipng" and "dvips" executables as-is.  Otherwise, this
-             ;; would require to add a TeX Live system to inputs, which is
-             ;; much for an Emacs package.
-             (substitute* "preview.el"
-               (("\"pdf2dsc ")
-                (let ((pdf2dsc (search-input-file inputs "/bin/pdf2dsc")))
-                  (string-append "\"" pdf2dsc " "))))))
-         (add-after 'install 'install-doc
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (doc-dir (string-append out "/share/doc/" ,name "-" ,version)))
-               (with-directory-excursion "doc"
-                 (setenv "HOME" (getenv  "TMPDIR")) ; for mktextfm
-                 (invoke "pdftex" "tex-ref")
-                 (install-file "tex-ref.pdf" doc-dir))))))))
+     (list
+      #:emacs emacs
+      #:include #~(cons* "^images/" "^latex/" %default-include)
+      #:exclude #~(cons "^latex/README" %default-exclude)
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'configure
+            (lambda* (#:key inputs #:allow-other-keys)
+              (emacs-substitute-variables "preview.el"
+                ("preview-gs-command"
+                 (search-input-file inputs "/bin/gs")))
+              ;; Leave "dvipng" and "dvips" executables as-is.  Otherwise, this
+              ;; would require to add a TeX Live system to inputs, which is
+              ;; much for an Emacs package.
+              (substitute* "preview.el"
+                (("\"pdf2dsc ")
+                 (let ((pdf2dsc (search-input-file inputs "/bin/pdf2dsc")))
+                   (string-append "\"" pdf2dsc " "))))))
+          (add-after 'install 'install-doc
+            (lambda _
+              (let ((doc-dir (string-append #$output "/share/doc/"
+                                            #$name "-" #$version)))
+                (with-directory-excursion "doc"
+                  (setenv "HOME" (getenv  "TMPDIR")) ; for mktextfm
+                  (invoke "pdftex" "tex-ref")
+                  (install-file "tex-ref.pdf" doc-dir))))))))
     (native-inputs
      (list perl (texlive-updmap.cfg)))
     (inputs
-- 
cgit 1.4.1


From 0d8b95dea3ddc5270c2d1ead9b7073b281ae0a04 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 8 Jul 2023 00:42:53 +0200
Subject: gnu: texlive-biblatex: Add missing files.

* gnu/packages/tex.scm (texlive-biblatex)[source]: Fix locations to include all files.
---
 gnu/packages/tex.scm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5c11d1141f..7cb91b2b05 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -14244,13 +14244,10 @@ and write them to an external XML file at the end of the document.")
     (source (texlive-origin
              name version
              (list "bibtex/bib/biblatex/biblatex/"
-                   "bibtex/bst/biblatex/"
-                   "doc/latex/biblatex/"
-                   "tex/latex/biblatex/bbx/"
-                   "tex/latex/biblatex/cbx/"
-                   "tex/latex/biblatex/lbx/")
+                   "bibtex/bst/biblatex/" "doc/latex/biblatex/"
+                   "tex/latex/biblatex/")
              (base32
-              "0s4i9ck77cldf37j01pgjm6qznfwkmy0vmrcdichq8bvzx8w89zg")))
+              "08wvsdwcixj50kklv4zwjs9rpjmhwzxxd242hvyi6lzkd7r0fnq4")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (propagated-inputs
-- 
cgit 1.4.1


From 6870b0a326665bcfe970571aac5f411f82b21f66 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 8 Jul 2023 00:48:13 +0200
Subject: gnu: texlive-luacas: Add missing files.

* gnu/packages/tex.scm (texlive-luacas)[source]: Fix locations to include all files.
---
 gnu/packages/tex.scm | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7cb91b2b05..6e5e9de767 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17081,17 +17081,9 @@ pre-process data files generated by measuring devices with external scripts.")
     (version (number->string %texlive-revision))
     (source (texlive-origin
              name version
-             (list "doc/lualatex/luacas/"
-                   "tex/lualatex/luacas/_lib/"
-                   "tex/lualatex/luacas/algebra/"
-                   "tex/lualatex/luacas/calculus/"
-                   "tex/lualatex/luacas/core/binaryoperation/"
-                   "tex/lualatex/luacas/test/calculus/"
-                   "tex/lualatex/luacas/test/expressions/"
-                   "tex/lualatex/luacas/test/polynomials/"
-                   "tex/lualatex/luacas/test/rings/")
-             (base32
-              "03z33kphj85y5w0sdgrgsh1pajbxwjiiir0s972cjn3f8ns6xw9x")))
+             (list "doc/lualatex/luacas/" "tex/lualatex/luacas/")
+             (base32
+              "0zwfvrlxl5r2180w622h3dbsdskiyr2hxri3qf9v9b7nn7m33r26")))
     (outputs '("out" "doc"))
     (build-system texlive-build-system)
     (home-page "https://ctan.org/pkg/luacas")
-- 
cgit 1.4.1


From 7ceb23113de3ab76507b4e268668116a9cabe2e2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 8 Jul 2023 11:29:25 +0200
Subject: gnu: python-ipython-documentation: Fix build.

* gnu/packages/python-xyz.scm (python-ipython-documentation)[native-inputs]:
Use TEXLIVE-UPDMAP.CFG.  Add TEXLIVE-LATEXMK and TEXLIVE-XETEX.
---
 gnu/packages/python-xyz.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2d8a942309..ca9c62a72b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10847,9 +10847,11 @@ computing.")
            python-sphinx
            python-sphinx-rtd-theme
            texinfo
-           texlive-bin
-           texlive-polyglossia
-           texlive-xindy))))
+           (texlive-updmap.cfg
+            (list texlive-latexmk
+                  texlive-polyglossia
+                  texlive-xetex
+                  texlive-xindy))))))
 
 (define-public python-urwid
   (package
-- 
cgit 1.4.1


From d742dc8e3357f558dcfbfaf48848cf8cf026c3b8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 8 Jul 2023 11:47:12 +0200
Subject: gnu: python-numpy-documentation: Fix build.

* gnu/packages/python-xyz.scm (python-numpy-documentation)[native-inputs]:
Use TEXLIVE-UPDMAP.CFG.  Add TEXLIVE-LATEXMK and TEXLIVE-XETEX.
---
 gnu/packages/python-xyz.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ca9c62a72b..6a29701219 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7247,13 +7247,15 @@ capabilities.")
            python-sphinx-4
            python-sphinx-panels
            texinfo
-           texlive-bin
-           texlive-cbfonts
-           texlive-cm-super
-           texlive-expdlist
-           texlive-greek-fontenc
-           texlive-polyglossia
-           texlive-xindy))
+           (texlive-updmap.cfg
+            (list texlive-cbfonts
+                  texlive-cm-super
+                  texlive-expdlist
+                  texlive-greek-fontenc
+                  texlive-latexmk
+                  texlive-polyglossia
+                  texlive-xetex
+                  texlive-xindy))))
     (inputs '())
     (propagated-inputs '())
     (synopsis "Documentation for the @code{python-numpy} package")
-- 
cgit 1.4.1


From 07c2b5bcfe7bf8207fac439d6e3bf52067178bfd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 8 Jul 2023 12:07:25 +0200
Subject: gnu: xournalpp: Remove texlive-bin as an input.

* gnu/packages/pdf.scm (xournalpp)[inputs]: Remove TEXLIVE-BIN.
---
 gnu/packages/pdf.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 0309434339..1ab19b4ee2 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -1046,8 +1046,7 @@ using a stylus.")
            libzip
            lua
            poppler
-           portaudio
-           texlive-bin))
+           portaudio))
     (home-page "https://github.com/xournalpp/xournalpp")
     (synopsis "Handwriting notetaking software with PDF annotation support")
     (description "Xournal++ is a hand note taking software written in
-- 
cgit 1.4.1


From 22c752fde110ac75d87051d680d6383cd0f95c4e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 8 Jul 2023 12:11:10 +0200
Subject: gnu: yubico-piv-tool: Use texlive-updmap.cfg in native inputs.

* gnu/packages/security-token.scm (yubico-piv-tool)[native-inputs]: Replace
TEXLIVE-BIN with TEXLIVE-UPDMAP.CFG.  Re-order inputs alphabetically.
---
 gnu/packages/security-token.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 2513f6dce0..6d7f5c9ab2 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -406,12 +406,12 @@ authentication, encryption and digital signatures.  OpenSC implements the PKCS
     (inputs
      (list gengetopt perl pcsc-lite openssl))
     (native-inputs
-     (list doxygen
+     (list check
+           doxygen
            graphviz
            help2man
-           check
-           texlive-bin
-           pkg-config))
+           pkg-config
+           (texlive-updmap.cfg)))
     (home-page "https://developers.yubico.com/yubico-piv-tool/")
     (synopsis "Interact with the PIV application on a YubiKey")
     (description
-- 
cgit 1.4.1


From 026ed35ddb896829c733f9cc032a7203abe5334c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 10 Jul 2023 10:03:46 +0200
Subject: guix: import: Handle texlua and TCL scripts.

* guix/import/texlive.scm (linked-scripts): Also generate scripts from files
with ".tlu" and ".tcl" extensions.
(tlpdb->package): Add appropriate inputs when providing a TCL script.
---
 guix/import/texlive.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index fe28b24715..cb9651419b 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -292,7 +292,8 @@ 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\" extensions, and files without extension."
+\".lua\", \".pl\", \".py\", \".sh\", \".tcl\", \".tlu\" extensions, and files
+without extension."
   (and-let* ((data (assoc-ref package-database name))
              ;; Check if binaries are associated to the package.
              (depend (assoc-ref data 'depend))
@@ -310,7 +311,7 @@ package NAME according to PACKAGE-DATABASE.  Consider as scripts files with
     (filter-map (lambda (script)
                   (and (any (lambda (ext)
                               (member (basename script ext) binaries))
-                            '(".lua" ".pl" ".py" ".sh"))
+                            '(".lua" ".pl" ".py" ".sh" ".tcl" ".tlu"))
                        (basename script)))
                 ;; Get the right (alphabetic) order.
                 (reverse scripts))))
@@ -466,13 +467,14 @@ of those files are returned that are unexpectedly installed."
                   '((native-inputs (list texlive-metafont))))
                 '())
           ;; Inputs.
-          ,@(match (filter-map (lambda (s)
-                                 (cond ((string-suffix? ".pl" s) 'perl)
-                                       ((string-suffix? ".py" s) 'python)
-                                       (else #f)))
+          ,@(match (append-map (lambda (s)
+                                 (cond ((string-suffix? ".pl" s) '(perl))
+                                       ((string-suffix? ".py" s) '(python))
+                                       ((string-suffix? ".tcl" s) '(tcl tk))
+                                       (else '())))
                                (or scripts '()))
               (() '())
-              (inputs `((inputs (list ,@inputs)))))
+              (inputs `((inputs (list ,@(delete-duplicates inputs eq?))))))
           ;; Propagated inputs.
           ,@(match (translate-depends depends)
               (() '())
-- 
cgit 1.4.1


From 129f033b07790a73f940d498239320cc777ffaea Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 10 Jul 2023 10:05:04 +0200
Subject: gnu: Add texlive-epspdf.

* gnu/packages/tex.scm (texlive-epspdf): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6e5e9de767..bd9b3cd838 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -93,6 +93,7 @@
   #:use-module (gnu packages qt)
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages shells)
+  #:use-module (gnu packages tcl)
   #:use-module (gnu packages base)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages web)
@@ -3212,6 +3213,30 @@ of nodes and the styles of edges, may be adjusted.")
 
 (define-deprecated-package texlive-latex-auxhook texlive-auxhook)
 
+(define-public texlive-epspdf
+  (package
+    (name "texlive-epspdf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/info/epspdf.info" "doc/support/epspdf/"
+                   "scripts/epspdf/")
+             (base32
+              "0sxn3dff0nxiw68h1kr86rmnc72xkc62fk94j590a4di1lh2firl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts #~(list "epspdf.tlu" "epspdftk.tcl")))
+    (inputs (list tcl tk))
+    (home-page "https://ctan.org/pkg/epspdf")
+    (synopsis "Converter for PostScript, EPS and PDF")
+    (description
+     "Epspdftk.tcl is a GUI PS/EPS/PDF converter.  Epspdf.tlu, its
+command-line backend, can be used by itself.  Options include grayscaling,
+cropping margins and single-page selection.  Some conversion options are made
+possible by converting in multiple steps.")
+    (license license:gpl2)))
+
 (define-public texlive-epstopdf
   (package
     (name "texlive-epstopdf")
-- 
cgit 1.4.1


From a8d937d1bb1f588db1a4e204d015248fe39f63cb Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Mon, 10 Jul 2023 10:18:46 +0100
Subject: svn-download: Use download-nar.

This should help if there are issues fetching from the source repository.

* guix/svn-download.scm (svn-fetch): Use download-nar and adjust accordingly.
---
 guix/svn-download.scm | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/guix/svn-download.scm b/guix/svn-download.scm
index 769571b5f6..6a53d5d2eb 100644
--- a/guix/svn-download.scm
+++ b/guix/svn-download.scm
@@ -23,6 +23,7 @@
   #:use-module (guix gexp)
   #:use-module (guix store)
   #:use-module (guix monads)
+  #:use-module (guix modules)
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module ((guix build svn) #:prefix build:)
@@ -79,22 +80,38 @@
   "Return a fixed-output derivation that fetches REF, a <svn-reference>
 object.  The output is expected to have recursive hash HASH of type
 HASH-ALGO (a symbol).  Use NAME as the file name, or a generic name if #f."
+
+  (define guile-json
+    (module-ref (resolve-interface '(gnu packages guile)) 'guile-json-4))
+
+  (define guile-lzlib
+    (module-ref (resolve-interface '(gnu packages guile)) 'guile-lzlib))
+
+  (define guile-gnutls
+    (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls))
+
   (define build
-    (with-imported-modules '((guix build svn)
-                             (guix build utils))
-      #~(begin
-          (use-modules (guix build svn)
-                       (ice-9 match))
+    (with-imported-modules
+        (source-module-closure '((guix build svn)
+                                 (guix build download-nar)
+                                 (guix build utils)))
+      (with-extensions (list guile-json guile-gnutls   ;for (guix swh)
+                             guile-lzlib)
+        #~(begin
+            (use-modules (guix build svn)
+                         (guix build download-nar)
+                         (ice-9 match))
 
-          (svn-fetch (getenv "svn url")
-                     (string->number (getenv "svn revision"))
-                     #$output
-                     #:svn-command #+(file-append svn "/bin/svn")
-                     #:recursive? (match (getenv "svn recursive?")
-                                    ("yes" #t)
-                                    (_ #f))
-                     #:user-name (getenv "svn user name")
-                     #:password (getenv "svn password")))))
+            (or (svn-fetch (getenv "svn url")
+                           (string->number (getenv "svn revision"))
+                           #$output
+                           #:svn-command #+(file-append svn "/bin/svn")
+                           #:recursive? (match (getenv "svn recursive?")
+                                          ("yes" #t)
+                                          (_ #f))
+                           #:user-name (getenv "svn user name")
+                           #:password (getenv "svn password"))
+                (download-nar #$output))))))
 
   (mlet %store-monad ((guile (package->derivation guile system)))
     (gexp->derivation (or name "svn-checkout") build
-- 
cgit 1.4.1


From 32e48b8b43c7450f5d05f786d13fe62a71fcb068 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Tue, 11 Jul 2023 15:23:34 +0100
Subject: svn-download: Use download-nar in svn-multi-fetch.

This should help if there are issues fetching from the source repository.

* guix/svn-download.scm (svn-multi-fetch): Use download-nar and adjust
accordingly.
---
 guix/svn-download.scm | 67 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/guix/svn-download.scm b/guix/svn-download.scm
index 6a53d5d2eb..78b13f62a4 100644
--- a/guix/svn-download.scm
+++ b/guix/svn-download.scm
@@ -160,33 +160,50 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a generic name if #f."
   "Return a fixed-output derivation that fetches REF, a <svn-multi-reference>
 object.  The output is expected to have recursive hash HASH of type
 HASH-ALGO (a symbol).  Use NAME as the file name, or a generic name if #f."
+
+  (define guile-json
+    (module-ref (resolve-interface '(gnu packages guile)) 'guile-json-4))
+
+  (define guile-lzlib
+    (module-ref (resolve-interface '(gnu packages guile)) 'guile-lzlib))
+
+  (define guile-gnutls
+    (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls))
+
   (define build
-    (with-imported-modules '((guix build svn)
-                             (guix build utils))
-      #~(begin
-          (use-modules (guix build svn)
-                       (guix build utils)
-                       (srfi srfi-1)
-                       (ice-9 match))
+    (with-imported-modules
+        (source-module-closure '((guix build svn)
+                                 (guix build download-nar)
+                                 (guix build utils)))
+      (with-extensions (list guile-json guile-gnutls   ;for (guix swh)
+                             guile-lzlib)
+        #~(begin
+            (use-modules (guix build svn)
+                         (guix build utils)
+                         (guix build download-nar)
+                         (srfi srfi-1)
+                         (ice-9 match))
 
-          (for-each (lambda (location)
-                      ;; The directory must exist if we are to fetch only a
-                      ;; single file.
-                      (unless (string-suffix? "/" location)
-                        (mkdir-p (string-append #$output "/" (dirname location))))
-                      (svn-fetch (string-append (getenv "svn url") "/" location)
-                                 (string->number (getenv "svn revision"))
-                                 (if (string-suffix? "/" location)
-                                     (string-append #$output "/" location)
-                                     (string-append #$output "/" (dirname location)))
-                                 #:svn-command #+(file-append svn "/bin/svn")
-                                 #:recursive? (match (getenv "svn recursive?")
-                                                ("yes" #t)
-                                                (_ #f))
-                                 #:user-name (getenv "svn user name")
-                                 #:password (getenv "svn password")))
-                    (call-with-input-string (getenv "svn locations")
-                      read)))))
+            (or (every
+                 (lambda (location)
+                   ;; The directory must exist if we are to fetch only a
+                   ;; single file.
+                   (unless (string-suffix? "/" location)
+                     (mkdir-p (string-append #$output "/" (dirname location))))
+                   (svn-fetch (string-append (getenv "svn url") "/" location)
+                              (string->number (getenv "svn revision"))
+                              (if (string-suffix? "/" location)
+                                  (string-append #$output "/" location)
+                                  (string-append #$output "/" (dirname location)))
+                              #:svn-command #+(file-append svn "/bin/svn")
+                              #:recursive? (match (getenv "svn recursive?")
+                                             ("yes" #t)
+                                             (_ #f))
+                              #:user-name (getenv "svn user name")
+                              #:password (getenv "svn password")))
+                 (call-with-input-string (getenv "svn locations")
+                   read))
+                (download-nar #$output))))))
 
   (mlet %store-monad ((guile (package->derivation guile system)))
     (gexp->derivation (or name "svn-checkout") build
-- 
cgit 1.4.1


From c1f7156d55bdc83f93f00f6f9b8e9d81916e4a54 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Tue, 11 Jul 2023 16:00:20 +0100
Subject: svn-download: Handle the single file case when downloading a nar.

Delete the output so that download-nar doesn't error when trying to restore.

* guix/svn-download.scm (svn-multi-fetch): Delete the output if it exists
prior to calling download-nar.
---
 guix/svn-download.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/guix/svn-download.scm b/guix/svn-download.scm
index 78b13f62a4..c6688908de 100644
--- a/guix/svn-download.scm
+++ b/guix/svn-download.scm
@@ -203,7 +203,10 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a generic name if #f."
                               #:password (getenv "svn password")))
                  (call-with-input-string (getenv "svn locations")
                    read))
-                (download-nar #$output))))))
+                (begin
+                  (when (file-exists? #$output)
+                    (delete-file-recursively #$output))
+                  (download-nar #$output)))))))
 
   (mlet %store-monad ((guile (package->derivation guile system)))
     (gexp->derivation (or name "svn-checkout") build
-- 
cgit 1.4.1


From 765c92c27ace9ebb198830a78f9ed6b9aeb3da2d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 09:19:42 +0200
Subject: gnu: texlive-trimspaces: Fix build.

* gnu/packages/tex.scm (texlive-trimspaces)[native-inputs]: Add TEXLIVE-FILCONTENTS.
---
 gnu/packages/tex.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bd9b3cd838..153e89161f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7533,6 +7533,7 @@ create new @samp{List of ...}.  The ToC @code{\\parskip} may be changed.")
               ;; The "ins" file refers to the wrong source file.
               (substitute* "source/latex/trimspaces/trimspaces.ins"
                 (("pstool\\.tex") "trimspaces.tex")))))))
+    (native-inputs (list texlive-filecontents))
     (home-page "https://ctan.org/pkg/trimspaces")
     (synopsis "Trim spaces around an argument or within a macro")
     (description
-- 
cgit 1.4.1


From 75677daa8341946b906a2712188c2d349f6174aa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 12:16:39 +0200
Subject: guix: import: texlive importer handles more licenses.

* guix/import/texlive.scm (string->license): Handle CC0 and ISC licenses.
---
 guix/import/texlive.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index cb9651419b..de08981d46 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -93,6 +93,7 @@
     ("lppl1.3a" 'lppl1.3a)
     ("lppl1.3b" 'lppl1.3b)
     ("lppl1.3c" 'lppl1.3c)
+    ("cc0" 'cc0)
     ("cc-by-2" 'cc-by2.0)
     ("cc-by-3" 'cc-by3.0)
     ("cc-by-4" 'cc-by4.0)
@@ -106,6 +107,7 @@
     ;; <https://www.gust.org.pl/projects/e-foundry/licenses>).  It has de
     ;; facto become GUST Font License 1.0.
     ((or "gfl" "gfsl") 'gfl1.0)
+    ("isc" 'isc)
 
     ;; These are known non-free licenses
     ("noinfo" 'unknown)
-- 
cgit 1.4.1


From 71ca1465dc12dbb8f885ea9a5228b4a34ffdf7d1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:50:33 +0200
Subject: gnu: Add texlive-adigraph.

* gnu/packages/tex.scm (texlive-adigraph): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 153e89161f..b9477b7ff7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -15955,6 +15955,25 @@ ligatures (ff, fi, ffi, fl, ffl) in legacy TrueType fonts (those
 lacking a liga table) accessed via @code{fontspec}.")
     (license license:public-domain)))
 
+(define-public texlive-adigraph
+  (package
+    (name "texlive-adigraph")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/adigraph/" "tex/latex/adigraph/")
+             (base32
+              "0qzljcd1g0a9mwj0nrqc2xbka9si27a5d9hg3y7kk73n50zsxv5x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/adigraph")
+    (synopsis "Augmenting directed graphs")
+    (description
+     "This LaTeX package provides the means to easily draw augmenting oriented
+graphs, as well as cuts on them, to demonstrate steps of algorithms for
+solving max-flow min-cut problems.")
+    (license license:expat)))
+
 (define-public texlive-adjustbox
   (package
     (name "texlive-adjustbox")
-- 
cgit 1.4.1


From 2f204eba197a268a940794a6b649cb9baa3413fd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:50:59 +0200
Subject: gnu: Add texlive-aobs-tikz.

* gnu/packages/tex.scm (texlive-aobs-tikz): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b9477b7ff7..3d4192983f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16003,6 +16003,26 @@ provided box macros are @code{\\lapbox}, @code{\\marginbox},
 @code{\\minsizebox}, @code{\\maxsizebox} and @code{\\phantombox}.")
     (license license:lppl1.3+)))
 
+(define-public texlive-aobs-tikz
+  (package
+    (name "texlive-aobs-tikz")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/aobs-tikz/"
+                   "source/latex/aobs-tikz/"
+                   "tex/latex/aobs-tikz/")
+             (base32
+              "04p3ghywqb3nr91vh6l39f8z9gbb3r6ca6yvq3nrcsqarxypfqny")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/aobs-tikz")
+    (synopsis "TikZ styles for creating overlaid pictures in beamer")
+    (description
+     "The package defines auxiliary TikZ styles useful for overlaying pictures
+elements in Beamer.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-auto-pst-pdf-lua
   (package
     (name "texlive-auto-pst-pdf-lua")
-- 
cgit 1.4.1


From bbbd0229dd8186fb737dc0bd365fdfa057112bb9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:51:14 +0200
Subject: gnu: Add texlive-askmaps.

* gnu/packages/tex.scm (texlive-askmaps): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3d4192983f..46756f9706 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16023,6 +16023,26 @@ provided box macros are @code{\\lapbox}, @code{\\marginbox},
 elements in Beamer.")
     (license license:lppl1.3+)))
 
+(define-public texlive-askmaps
+  (package
+    (name "texlive-askmaps")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/askmaps/" "tex/latex/askmaps/")
+             (base32
+              "0l61gq2i1di9zn6s2nf5sn0pdp3z78rij17sgjywy0xka43znhlk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/askmaps")
+    (synopsis "Typeset American style Karnaugh maps")
+    (description
+     "The package provides 1, 2, 3, 4 and 5 variable Karnaugh maps, in the
+style used in numerous American textbooks on digital design.  The package
+draws K-maps where the most significant input variables are placed on top of
+the columns and the least significant variables are placed left of the rows.")
+    (license license:lppl)))
+
 (define-public texlive-auto-pst-pdf-lua
   (package
     (name "texlive-auto-pst-pdf-lua")
-- 
cgit 1.4.1


From 43f405a6c5fba468af192193065316e2f044dee9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:51:30 +0200
Subject: gnu: Add texlive-asyfig.

* gnu/packages/tex.scm (texlive-asyfig): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 46756f9706..74b169a619 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16043,6 +16043,31 @@ draws K-maps where the most significant input variables are placed on top of
 the columns and the least significant variables are placed left of the rows.")
     (license license:lppl)))
 
+(define-public texlive-asyfig
+  (package
+    (name "texlive-asyfig")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/asyfig/" "source/latex/asyfig/"
+                   "tex/latex/asyfig/")
+             (base32
+              "0116a920z8hq3v50gmgh3f8diq7307wx0zsh2pmznw7gkvn6rn4k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (native-inputs (list texlive-filecontents))
+    (home-page "https://ctan.org/pkg/asyfig")
+    (synopsis "Commands for using Asymptote figures")
+    (description
+     "The package provides a means of reading Asymptote figures from separate
+files, rather than within the document, as is standard in the @code{asymptote}
+package, which is provided as part of the Asymptote bundle.  The Asymptote way
+can prove cumbersome in a large document; the present package allows the user
+to process one picture at a time, in simple test documents, and then to
+migrate (with no fuss) to their use in the target document.")
+    (license license:lppl)))
+
 (define-public texlive-auto-pst-pdf-lua
   (package
     (name "texlive-auto-pst-pdf-lua")
-- 
cgit 1.4.1


From fb1c04d05e7c8be9d068ee6af197da6cce5c4b54 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:51:48 +0200
Subject: gnu: Add texlive-asypictureb.

* gnu/packages/tex.scm (texlive-asypictureb): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 74b169a619..e454ae7d70 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16068,6 +16068,31 @@ to process one picture at a time, in simple test documents, and then to
 migrate (with no fuss) to their use in the target document.")
     (license license:lppl)))
 
+(define-public texlive-asypictureb
+  (package
+    (name "texlive-asypictureb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/asypictureb/"
+                   "source/latex/asypictureb/"
+                   "tex/latex/asypictureb/")
+             (base32
+              "1djlphr3iz0l0x2pf8abd251q78rml6435f6ng7fa553anwgwya9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/asypictureb")
+    (synopsis "User-friendly integration of Asymptote into LaTeX")
+    (description
+     "The package is an unofficial alternative to the package provided with
+the Asymptote distribution, for including pictures within a LaTeX source file.
+While it does not duplicate all the features of the official package, this
+package is more user-friendly in several ways.  Most notably, Asymptote errors
+are repackaged as LaTeX errors, making debugging less of a pain.  It also has
+a more robust mechanism for identifying unchanged pictures that need not be
+recompiled.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-auto-pst-pdf-lua
   (package
     (name "texlive-auto-pst-pdf-lua")
-- 
cgit 1.4.1


From 2ee9d5f0d76fcc237ab0a54f719275e63baf68a6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:52:03 +0200
Subject: gnu: Add texlive-autoarea.

* gnu/packages/tex.scm (texlive-autoarea): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e454ae7d70..574776bb0d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16115,6 +16115,26 @@ Niepraschk.  The package allows the use of LuaLaTeX together with PostScript
 related code, e.g., PSTricks.")
     (license license:lppl1.3c)))
 
+(define-public texlive-autoarea
+  (package
+    (name "texlive-autoarea")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/autoarea/" "tex/latex/autoarea/")
+             (base32
+              "09a9wiihb397ljasnkxrqygsi34bd9a5spq8h3njf6awra2x2m6c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pictex-autoarea")
+    (synopsis "Automatic computation of bounding boxes with PiCTeX")
+    (description
+     "This package makes PiCTeX recognize lines and arcs in determining the
+bounding box of a picture.  The bounding box is essential for proper placement
+of a picture between running text and margins and for keeping the running text
+away.")
+    (license license:lppl)))
+
 (define-public texlive-barracuda
   (package
     (name "texlive-barracuda")
-- 
cgit 1.4.1


From ff3f52335255b05c6de3351b298137150534ca99 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:52:22 +0200
Subject: gnu: Add texlive-bardiag.

* gnu/packages/tex.scm (texlive-bardiag): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 574776bb0d..d481417baf 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16135,6 +16135,25 @@ of a picture between running text and margins and for keeping the running text
 away.")
     (license license:lppl)))
 
+(define-public texlive-bardiag
+  (package
+    (name "texlive-bardiag")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bardiag/" "tex/latex/bardiag/")
+             (base32
+              "1iy0cr24ki93jlnmzr1fgqa7jqg0zhxds422cz322zwr19936zz9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bardiag")
+    (synopsis "LaTeX package for drawing bar diagrams")
+    (description
+     "The main purpose of the package is to make the drawing of bar diagrams
+possible and easy in LaTeX.  The BarDiag package is inspired by and based on
+PSTricks.")
+    (license license:lppl)))
+
 (define-public texlive-barracuda
   (package
     (name "texlive-barracuda")
-- 
cgit 1.4.1


From a9a1d313400a9b143d559528c8b644ec43bb21e8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:52:46 +0200
Subject: gnu: Add texlive-beamerswitch.

* gnu/packages/tex.scm (texlive-beamerswitch): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d481417baf..5e90b34c70 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16175,6 +16175,31 @@ is also possible to use Barracuda with a standalone Lua interpreter to draw
 barcodes in different graphic formats like SVG.")
     (license license:gpl2)))
 
+(define-public texlive-beamerswitch
+  (package
+    (name "texlive-beamerswitch")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/beamerswitch/"
+                   "source/latex/beamerswitch/"
+                   "tex/latex/beamerswitch/")
+             (base32
+              "1kz257kv9fdy9fvphd8sx1k0swsynrl6kxqidnh8lp70k8f24ggj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/beamerswitch")
+    (synopsis "Convenient mode selection in Beamer documents")
+    (description
+     "This class is a wrapper around the beamer class to make it easier to use
+the same document to generate the different forms of the presentation: the
+slides themselves, an abbreviated slide set for transparencies or online
+reference, an n-up handout version (various layouts are provided), and
+a transcript or set of notes using the article class.  The class provides
+a variety of handout layouts, and allows the mode to be chosen from the
+command line (without changing the document itself).")
+    (license license:lppl1.3c)))
+
 (define-public texlive-bezierplot
   (package
     (name "texlive-bezierplot")
-- 
cgit 1.4.1


From 6e583b00b572409dd26af7948099c679bd35ffb4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:53:01 +0200
Subject: gnu: Add texlive-binarytree.

* gnu/packages/tex.scm (texlive-binarytree): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5e90b34c70..d5b1f82a32 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16224,6 +16224,30 @@ numeric precision).  @code{bezierplot} also finds special points such as
 extreme points and inflection points and reduces the number of used points.")
     (license license:lppl1.3c)))
 
+(define-public texlive-binarytree
+  (package
+    (name "texlive-binarytree")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/binarytree/"
+                   "source/latex/binarytree/"
+                   "tex/latex/binarytree/")
+             (base32
+              "1lip6npfggc6p14hhpwn1g52xmyyb5rp34znb437frks4n1bk66s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/binarytree")
+    (synopsis "Drawing binary trees using TikZ")
+    (description
+     "This package provides an easy but flexible way to draw binary trees
+using TikZ.  A path specification and the setting of various options determine
+the style for each edge of the tree.  There is support for the external
+library of TikZ which does not affect externalization of the rest of the TikZ
+figures in the document.  There is an option to use automatic file naming:
+useful if the trees are often moved around.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From a566b1dc4da4943b7872cf9f9d5240a537f0801f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:53:14 +0200
Subject: gnu: Add texlive-blochsphere.

* gnu/packages/tex.scm (texlive-blochsphere): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d5b1f82a32..4c4097f64d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16248,6 +16248,29 @@ figures in the document.  There is an option to use automatic file naming:
 useful if the trees are often moved around.")
     (license license:lppl1.3+)))
 
+(define-public texlive-blochsphere
+  (package
+    (name "texlive-blochsphere")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/blochsphere/"
+                   "source/latex/blochsphere/"
+                   "tex/latex/blochsphere/")
+             (base32
+              "03gl19r0cc1ajychh6f31bdjqpmmlk0cxg1akxg3h47yrf2np245")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/blochsphere")
+    (synopsis "Draw pseudo-3D diagrams of Bloch spheres")
+    (description
+     "This package is used to draw pseudo-3D Blochsphere diagrams.  It
+supports various annotations, such as great and small circles, axes, rotation
+markings and state vectors.  It can be used in a standalone fashion, or nested
+within a @code{tikzpicture} environment by setting the environment option
+@code{nested} to @code{true}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 290b7ee1d57d89359bb7facc890c6d30e61aada2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:53:34 +0200
Subject: gnu: Add texlive-bloques.

* gnu/packages/tex.scm (texlive-bloques): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4c4097f64d..9023025209 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16271,6 +16271,24 @@ within a @code{tikzpicture} environment by setting the environment option
 @code{nested} to @code{true}.")
     (license license:lppl1.3+)))
 
+(define-public texlive-bloques
+  (package
+    (name "texlive-bloques")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bloques/" "tex/latex/bloques/")
+             (base32
+              "10mxqjfljcphg4nifg8xy3s6k49vxvxhs5s805640npc8jgmbf64")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bloques")
+    (synopsis "Generate control diagrams")
+    (description
+     "The package uses TikZ to provide commands for generating control
+diagrams (specially in power electronics).")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 8e9133cc680d08d8aef3a0d5f48e06a1a6039d61 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:53:46 +0200
Subject: gnu: Add texlive-blox.

* gnu/packages/tex.scm (texlive-blox): New variable.
---
 gnu/packages/tex.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9023025209..33bc3c25e7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16289,6 +16289,36 @@ within a @code{tikzpicture} environment by setting the environment option
 diagrams (specially in power electronics).")
     (license license:lppl1.3+)))
 
+(define-public texlive-blox
+  (package
+    (name "texlive-blox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/blox/" "source/latex/blox/"
+                   "tex/latex/blox/")
+             (base32
+              "0xkv6rvkbchkwgfam5kiymng0xnc4vja5xb3b5d89rngdr041xwk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-fancyvrb
+                  texlive-hypdoc
+                  texlive-hyperref
+                  texlive-infwarerr
+                  texlive-kvoptions
+                  texlive-pgf
+                  texlive-tools))))
+    (home-page "https://ctan.org/pkg/blox")
+    (synopsis "Draw block diagrams, using TikZ")
+    (description
+     "This package, along with TikZ, will typeset block diagrams for use with
+programming and control theory.  It is an English translation of the
+@code{schemabloc} package.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 0c82699c6a72d5fa0a765088f225fc0b7c093f37 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:54:00 +0200
Subject: gnu: Add texlive-bodegraph.

* gnu/packages/tex.scm (texlive-bodegraph): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 33bc3c25e7..84f400cc93 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16319,6 +16319,26 @@ programming and control theory.  It is an English translation of the
 @code{schemabloc} package.")
     (license license:lppl1.3+)))
 
+(define-public texlive-bodegraph
+  (package
+    (name "texlive-bodegraph")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bodegraph/"
+                   "tex/latex/bodegraph/")
+             (base32
+              "0r89cnn42yyxpvbxfasalwfdmcq0aksdm3cmqy9wfv4qnc48wmcd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bodegraph")
+    (synopsis "Draw Bode, Nyquist and Black plots with gnuplot and TikZ")
+    (description
+     "The package provides facilities to draw Bode, Nyquist and Black plots
+using Gnuplot and Tikz.  Elementary Transfer Functions and basic correctors
+are preprogrammed for use.")
+    (license license:lppl)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 61ee3ac0b5b700736225ac46bf9239e05e2e9509 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:54:13 +0200
Subject: gnu: Add texlive-bondgraph.

* gnu/packages/tex.scm (texlive-bondgraph): New variable.
---
 gnu/packages/tex.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 84f400cc93..d923b0366b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16339,6 +16339,23 @@ using Gnuplot and Tikz.  Elementary Transfer Functions and basic correctors
 are preprogrammed for use.")
     (license license:lppl)))
 
+(define-public texlive-bondgraph
+  (package
+    (name "texlive-bondgraph")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bondgraph/"
+                   "tex/latex/bondgraph/")
+             (base32
+              "165fgkcybazd2jqgcfqc8hh8askl1hdv86d8bz5b1s4aff95hv24")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bondgraph")
+    (synopsis "Create bond graph figures in LaTeX documents")
+    (description "The package draws bond graphs using PGF and TikZ.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 36d3ab9e1b126c421ec4f912415198b5a856e4d5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:54:34 +0200
Subject: gnu: Add texlive-bondgraphs.

* gnu/packages/tex.scm (texlive-bondgraphs): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d923b0366b..a2e9875871 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16356,6 +16356,28 @@ are preprogrammed for use.")
     (description "The package draws bond graphs using PGF and TikZ.")
     (license license:lppl1.3+)))
 
+(define-public texlive-bondgraphs
+  (package
+    (name "texlive-bondgraphs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bondgraphs/"
+                   "source/latex/bondgraphs/"
+                   "tex/latex/bondgraphs/")
+             (base32
+              "1gisr9f2n3mwf2qaqdj9sjmxscrpa9zrb9jm7v5l96ba8kqqw6hx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bondgraphs")
+    (synopsis "Draws bond graphs in LaTeX, using PGF/TikZ")
+    (description
+     "The package is used to draw bond graphs in LaTeX.  Compared to the
+@code{bondgraph} package this package relies more on TikZ styles and less on
+macros, to generate the drawings.  As such it can be more flexible than his,
+but requires more TikZ knowledge of the user.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 3d760665ff8b95f12c689960753109736af4b8b6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:55:06 +0200
Subject: gnu: Add texlive-braids.

* gnu/packages/tex.scm (texlive-braids): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a2e9875871..bd5add6ce4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16378,6 +16378,27 @@ macros, to generate the drawings.  As such it can be more flexible than his,
 but requires more TikZ knowledge of the user.")
     (license license:lppl1.3+)))
 
+(define-public texlive-braids
+  (package
+    (name "texlive-braids")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/braids/" "source/latex/braids/"
+                   "tex/latex/braids/")
+             (base32
+              "1ld7kzr96bh7gdjllxn888j92p7j1l4b1krlp8dmhy6fq3a2qn22")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/braids")
+    (synopsis "Draw Braid diagrams with PGF/TikZ")
+    (description
+     "The package enables drawing of Braid diagrams with PGF/TikZ using
+a simple syntax.  The Braid itself is specified by giving a word in the Braid
+group, and there are many options for styling the strands and for drawing
+floors.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 067da83bcd878628d395d1df0bd0888cc06fc75b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:55:22 +0200
Subject: gnu: Add texlive-bxeepic.

* gnu/packages/tex.scm (texlive-bxeepic): New variable.
---
 gnu/packages/tex.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bd5add6ce4..d8343aa295 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16399,6 +16399,23 @@ group, and there are many options for styling the strands and for drawing
 floors.")
     (license license:lppl1.3c)))
 
+(define-public texlive-bxeepic
+  (package
+    (name "texlive-bxeepic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bxeepic/" "tex/latex/bxeepic/")
+             (base32
+              "1zxmysbnv4s47qx0yajr9h62x8azjh660811yd4qcv0ih9mcdyy7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bxeepic")
+    (synopsis "Eepic facilities using @code{pict2e}")
+    (description
+     "The package provides an Eepic driver to use @code{pict2e} facilities.")
+    (license license:expat)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 5f08f4191fbce0e3842bc2a9103f3a56154a48cb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:55:40 +0200
Subject: gnu: Add texlive-byo-twemojis.

* gnu/packages/tex.scm (texlive-byo-twemojis): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d8343aa295..14149cd005 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16416,6 +16416,28 @@ floors.")
      "The package provides an Eepic driver to use @code{pict2e} facilities.")
     (license license:expat)))
 
+(define-public texlive-byo-twemojis
+  (package
+    (name "texlive-byo-twemojis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/byo-twemojis/"
+                   "source/latex/byo-twemojis/"
+                   "tex/latex/byo-twemojis/")
+             (base32
+              "0wnl6jcwrkxvzfsq04kabxanraa8zi08fjg4a1b7cqpawiphf8jp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/byo-twemojis")
+    (synopsis "Build Your Own Twemojis with TikZ")
+    (description
+     "This package provides the means to create your own emojis (the simple,
+round, and mostly yellow ones) from elements of existing emojis.  The provided
+command creates a TikZ picture from the stated elements with multiple
+possibilities to modify the result in color and position.")
+    (license (list license:cc-by4.0 license:lppl1.3+))))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 2a56b23623175076f64431dc6cd0abc01f195bb3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:56:07 +0200
Subject: gnu: Add texlive-byrne.

* gnu/packages/tex.scm (texlive-byrne): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 14149cd005..4738959fad 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16438,6 +16438,30 @@ command creates a TikZ picture from the stated elements with multiple
 possibilities to modify the result in color and position.")
     (license (list license:cc-by4.0 license:lppl1.3+))))
 
+(define-public texlive-byrne
+  (package
+    (name "texlive-byrne")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/byrne/" "metapost/byrne/"
+                   "tex/latex/byrne/")
+             (base32
+              "1h4543pimjsv30phinbhs8070ymqaf43vd2wx1yhjmwsqj4fcjmc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/byrne")
+    (synopsis
+     "Typeset geometric proofs in the style of Euclid's @emph{Elements}")
+    (description
+     "This package is a LaTeX adaptation of a set of tools developed for
+ConTeXt reproduction of Oliver Byrne's 1847 edition of the first six books of
+Euclid's @emph{Elements}; see
+@url{https://github.com/jemmybutton/byrne-euclid}.  It consists of a MetaPost
+library, responsible for all the drawing and a set of LaTeX macros to
+conveniently use them.")
+    (license license:gpl3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 3cf7468dfef153ef2fb17c84898fe0f2d0209a68 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 21:56:23 +0200
Subject: gnu: Add texlive-cachepic.

* gnu/packages/tex.scm (texlive-cachepic): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4738959fad..bb4cfd820d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16462,6 +16462,28 @@ library, responsible for all the drawing and a set of LaTeX macros to
 conveniently use them.")
     (license license:gpl3+)))
 
+(define-public texlive-cachepic
+  (package
+    (name "texlive-cachepic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cachepic/" "scripts/cachepic/"
+                   "tex/latex/cachepic/")
+             (base32
+              "0kc713pig67igi0h294k692lmm12mx611z3v73awsf5xv14ms3yx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "cachepic.tlu")))
+    (home-page "https://ctan.org/pkg/cachepic")
+    (synopsis "Convert document fragments into graphics")
+    (description
+     "The bundle simplifies and automates conversion of document fragments
+into external EPS or PDF files.  The bundle consists of two parts: a LaTeX
+package that implements a document level interface, and a command line tool
+that generates the external graphics.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 7fe034159148c1798219f89373e36afc2ffbccb7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:11:04 +0200
Subject: gnu: Add texlive-callouts.

* gnu/packages/tex.scm (texlive-callouts): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bb4cfd820d..c1813f8357 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16484,6 +16484,25 @@ package that implements a document level interface, and a command line tool
 that generates the external graphics.")
     (license license:lppl1.3+)))
 
+(define-public texlive-callouts
+  (package
+    (name "texlive-callouts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/callouts/" "tex/latex/callouts/")
+             (base32
+              "1yb2vc1wiffap0dbq0jw40ax9kmk6np269ayij67vcmg0iqnmb11")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/callouts")
+    (synopsis "Put simple annotations and notes inside a picture")
+    (description
+     "The package defines the @code{annotation} environment in which callouts,
+notes, arrows, and the like can be placed to describe certain parts of
+a picture.")
+    (license license:lppl)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From e6a6c66da981a4e61d4e487aba21652997c5a1a4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:11:23 +0200
Subject: gnu: Add texlive-celtic.

* gnu/packages/tex.scm (texlive-celtic): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c1813f8357..5452fbc020 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16503,6 +16503,24 @@ notes, arrows, and the like can be placed to describe certain parts of
 a picture.")
     (license license:lppl)))
 
+(define-public texlive-celtic
+  (package
+    (name "texlive-celtic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/celtic/" "source/latex/celtic/"
+                   "tex/latex/celtic/")
+             (base32
+              "0zqz87y0wx5v50qnzvz6gqsz1z81ikcj4ma8mwgclrfyazpll9d0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/celtic")
+    (synopsis "TikZ library for drawing celtic knots")
+    (description
+     "The package provides a TikZ library for drawing celtic knots.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 90ea731a1edf6b0bb8f361bba1e34a7be265eead Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:11:40 +0200
Subject: gnu: Add texlive-chemfig.

* gnu/packages/tex.scm (texlive-chemfig): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5452fbc020..521713f12e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16521,6 +16521,27 @@ a picture.")
      "The package provides a TikZ library for drawing celtic knots.")
     (license license:lppl1.3+)))
 
+(define-public texlive-chemfig
+  (package
+    (name "texlive-chemfig")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/chemfig/"
+                   "tex/generic/chemfig/")
+             (base32
+              "01mai7drwm3y4i3yj4fkwqjyzwlr4dvq467lwdzsbj3dl5fxwgpg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chemfig")
+    (synopsis "Draw molecules with easy syntax")
+    (description
+     "The package provides the command @code{\\chemfig}, which draws molecules
+using the TikZ package.  While the diagrams produced are essentially
+2-dimensional, the package supports many of the conventional notations for
+illustrating the 3-dimensional layout of a molecule.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 31aa4d236c31232de1284688cd9e30bcaebd6d22 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:12:11 +0200
Subject: gnu: Add texlive-circuit-macros.

* gnu/packages/tex.scm (texlive-circuit-macros): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 521713f12e..7437f095fb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16542,6 +16542,34 @@ using the TikZ package.  While the diagrams produced are essentially
 illustrating the 3-dimensional layout of a molecule.")
     (license license:lppl1.3c)))
 
+(define-public texlive-circuit-macros
+  (package
+    (name "texlive-circuit-macros")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/circuit-macros/"
+                   "tex/latex/circuit-macros/")
+             (base32
+              "0f1k951bm18m0y2b6hjmz5x8gsl7sdqa2ky4sdnv4fkwwmh1icw5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/circuit-macros")
+    (synopsis "M4 macros for electric circuit diagrams")
+    (description
+     "This package provides a set of m4 macros for drawing high-quality
+electric circuits containing fundamental elements, amplifiers, transistors,
+and basic logic gates to include in TeX, LaTeX, or similar documents.  Some
+tools and examples for other types of diagrams are also included.  The macros
+can be evaluated to drawing commands in the @code{pic} language, which
+contains elements of a simple programming language, and is well-suited to line
+drawings requiring parametric or conditional components, fine tuning,
+significant geometric calculations or repetition, or that are naturally block
+structured or tree structured.  Alternative output macros can create TeX
+output to be read by PSTricks, TikZ commands for use by the PGF bundle, or
+SVG.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 753e1ec082e8edf8b6d62770c1565eaa6d273cbc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:12:29 +0200
Subject: gnu: Add texlive-circuitikz.

* gnu/packages/tex.scm (texlive-circuitikz): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7437f095fb..1cb62c5fcc 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16570,6 +16570,31 @@ output to be read by PSTricks, TikZ commands for use by the PGF bundle, or
 SVG.")
     (license license:lppl1.3c)))
 
+(define-public texlive-circuitikz
+  (package
+    (name "texlive-circuitikz")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/circuitikz/"
+                   "doc/generic/circuitikz/"
+                   "doc/latex/circuitikz/"
+                   "tex/context/third/circuitikz/"
+                   "tex/generic/circuitikz/"
+                   "tex/latex/circuitikz/")
+             (base32
+              "1vgsrr94wqab264vkqwdm29k1a18x03rb30jff0p7zgm3gn54z17")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/circuitikz")
+    (synopsis "Draw electrical networks with TikZ")
+    (description
+     "The package provides a set of macros for naturally typesetting
+electrical and electronic networks.  It is designed as a tool that is native
+to LaTeX, and directly supporting PDF output format.  It has therefore been
+based on the PGF/TikZ package.")
+    (license (list license:lppl license:gpl3+))))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 47a32dd3e9dad20a2cdff3e2d4dac5afbdc55cc2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:12:42 +0200
Subject: gnu: Add texlive-coffeestains.

* gnu/packages/tex.scm (texlive-coffeestains): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1cb62c5fcc..16be1cd669 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16595,6 +16595,27 @@ to LaTeX, and directly supporting PDF output format.  It has therefore been
 based on the PGF/TikZ package.")
     (license (list license:lppl license:gpl3+))))
 
+(define-public texlive-coffeestains
+  (package
+    (name "texlive-coffeestains")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/coffeestains/"
+                   "tex/latex/coffeestains/")
+             (base32
+              "0nc2nmxg378gg16q6gxj68w94fl3nd5lcgk2fq9hp17mg6q27gsc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/coffeestains")
+    (synopsis "Add coffee stains to documents")
+    (description
+     "This package provides an essential feature that LaTeX has been missing
+for too long: It adds coffee stains to your documents.  A lot of time can be
+saved by printing stains directly on the page rather than adding them
+manually.")
+    (license license:public-domain)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From dfee2a969ef21b676aaf2561060b7ed193fa407f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:12:58 +0200
Subject: gnu: Add texlive-combinedgraphics.

* gnu/packages/tex.scm (texlive-combinedgraphics): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 16be1cd669..edf3311833 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16616,6 +16616,32 @@ saved by printing stains directly on the page rather than adding them
 manually.")
     (license license:public-domain)))
 
+(define-public texlive-combinedgraphics
+  (package
+    (name "texlive-combinedgraphics")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/combinedgraphics/"
+                   "source/latex/combinedgraphics/"
+                   "tex/latex/combinedgraphics/")
+             (base32
+              "1jb0bc5s8kn5aplgmry94laj92c2h16xv77km6fz0pcd4wvpng6i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/combinedgraphics")
+    (synopsis "Include graphic (EPS or PDF)/LaTeX combinations")
+    (description
+     "This package provides the @code{\\includecombinedgraphics} macro for the
+inclusion of combined EPS/LaTeX and PDF/LaTeX graphics.  Instead of including
+the graphics with a simple @code{\\input}, the
+@code{\\includecombinedgraphics} macro has some comforts: changing the font
+and color of the text of the LaTeX part; rescaling the graphics without
+affecting the font of the LaTeX part; automatic inclusion of the vector
+graphics part, as far as LaTeX part does not do it; and rescaling and rotating
+of complete graphics.")
+    (license license:gpl3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From c6b1480151a675e265f669d686cd3a8eb3280d1e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:14:28 +0200
Subject: gnu: Add texlive-curve.

* gnu/packages/tex.scm (texlive-curve): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index edf3311833..1e22fe34e6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16642,6 +16642,33 @@ graphics part, as far as LaTeX part does not do it; and rescaling and rotating
 of complete graphics.")
     (license license:gpl3+)))
 
+(define-public texlive-curve
+  (package
+    (name "texlive-curve")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/curve/" "source/latex/curve/"
+                   "tex/latex/curve/")
+             (base32
+              "0780i6zr24v30ixn6zcalqr2pdp5jkxk8ksfw090aaq03wpxmggg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (home-page "https://ctan.org/pkg/curve")
+    (synopsis "Class for making curriculum vitae")
+    (description
+     "CurVe is a class for writing a CV, with configuration for the language
+in which you write.  The class provides a set of commands to create rubrics,
+entries in these rubrics etc.  CurVe then format the CV (possibly splitting it
+onto multiple pages, repeating the titles etc), which is usually the most
+painful part of CV writing.  Another nice feature of CurVe is its ability to
+manage different CV flavours simultaneously.  It is often the case that you
+want to maintain slightly divergent versions of your CV at the same time, in
+order to emphasize on different aspects of your background.  CurVe also comes
+with support for use with AUC-TeX.")
+    (license license:lppl)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From e5cd7028d71cea924c2884ed50453f463e19fe43 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:14:43 +0200
Subject: gnu: Add texlive-curve2e.

* gnu/packages/tex.scm (texlive-curve2e): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1e22fe34e6..5b98d3e167 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16669,6 +16669,29 @@ order to emphasize on different aspects of your background.  CurVe also comes
 with support for use with AUC-TeX.")
     (license license:lppl)))
 
+(define-public texlive-curve2e
+  (package
+    (name "texlive-curve2e")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/curve2e/" "source/latex/curve2e/"
+                   "tex/latex/curve2e/")
+             (base32
+              "0fa2xp3yh1bv8ivxf48ywiwi9wjgq0bnvnyc2rcy73wczwilsyk4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/curve2e")
+    (synopsis "Extensions for package @code{pict2e}")
+    (description
+     "The package extends the drawing capacities of the @code{pict2e} package
+that serves as a LaTeX2e replacement for @code{picture} mode.  In particular,
+@code{curve2e} introduces new macros for lines and vectors, new specifications
+for line terminations and joins, arcs with any angular aperture, arcs with
+arrows at one or both ends, generic curves specified with their nodes and the
+tangent direction at these nodes.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 5dfaeef184fccbabb44053e2c204a6b6e00fc413 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:14:56 +0200
Subject: gnu: Add texlive-curves.

* gnu/packages/tex.scm (texlive-curves): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5b98d3e167..c5ad3042bc 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16692,6 +16692,28 @@ arrows at one or both ends, generic curves specified with their nodes and the
 tangent direction at these nodes.")
     (license license:lppl1.3c)))
 
+(define-public texlive-curves
+  (package
+    (name "texlive-curves")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/curves/" "source/latex/curves/"
+                   "tex/latex/curves/")
+             (base32
+              "1diwxq6maizcnmwr6shnl044cvhnd7c2f55avgsyap6ds5wv86wn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/curves")
+    (synopsis "Curves for LaTeX picture environment")
+    (description
+     "This package draws curves in the standard LaTeX picture environment
+using parabolas between data points with continuous slope at joins; for
+circles and arcs, it uses up to 16 parabolas.  The package can also draw
+symbols or dash patterns along curves.  It provides facilities equivalent to
+technical pens with compasses and French curves.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 7bf1f50af7b3d5f9e199c27a13a825cc2075496a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:15:23 +0200
Subject: gnu: Add texlive-dcpic.

* gnu/packages/tex.scm (texlive-dcpic): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c5ad3042bc..d92e5de771 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16714,6 +16714,27 @@ symbols or dash patterns along curves.  It provides facilities equivalent to
 technical pens with compasses and French curves.")
     (license license:lppl1.3+)))
 
+(define-public texlive-dcpic
+  (package
+    (name "texlive-dcpic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/dcpic/" "tex/generic/dcpic/")
+             (base32
+              "1s4292g12r2vrnsdj4qsa9jgj9ndgdg7h27n2ig3mf305h5h5hfr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dcpic")
+    (synopsis "Commutative diagrams in a LaTeX and TeX documents")
+    (description
+     "DCpic is a package for typesetting commutative diagrams within a LaTeX
+and TeX documents.  Its distinguishing features are: a powerful graphical
+engine, the PiCTeX package; an easy specification syntax in which
+a commutative diagram is described in terms of its objects and its
+arrows (morphism), positioned in a Cartesian coordinate system.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From aff44b98e33da7f8e784077370bae176d08ffa9f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:15:40 +0200
Subject: gnu: Add texlive-diagmac2.

* gnu/packages/tex.scm (texlive-diagmac2): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d92e5de771..f8913b5f91 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16735,6 +16735,24 @@ a commutative diagram is described in terms of its objects and its
 arrows (morphism), positioned in a Cartesian coordinate system.")
     (license license:lppl1.3+)))
 
+(define-public texlive-diagmac2
+  (package
+    (name "texlive-diagmac2")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/diagmac2/" "tex/latex/diagmac2/")
+             (base32
+              "002p9qmrbbkqc72iippnjhxmb7yybx06xr6bs76hg04pzvh5a49f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/diagmac2")
+    (synopsis "Diagram macros, using @code{pict2e}")
+    (description
+     "This is a development of the long-established @code{diagmac} package,
+using @code{pict2e} so that the restrictions on line direction are removed.")
+    (license license:lppl)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 8d585145ea5a4a217f3a3f2e82feba1a3e2f2a25 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:15:57 +0200
Subject: gnu: Add texlive-ditaa.

* gnu/packages/tex.scm (texlive-ditaa): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f8913b5f91..1e39c1e1a9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16753,6 +16753,24 @@ arrows (morphism), positioned in a Cartesian coordinate system.")
 using @code{pict2e} so that the restrictions on line direction are removed.")
     (license license:lppl)))
 
+(define-public texlive-ditaa
+  (package
+    (name "texlive-ditaa")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ditaa/" "tex/latex/ditaa/")
+             (base32
+              "1dk915p169hnpy9888kpslawhkmlipbkdrsnk1pajypcl7jyrniw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ditaa")
+    (synopsis "Use ditaa diagrams within LaTeX documents")
+    (description
+     "With this package, @acronym{DITAA, DIagrams Through Ascii Art} diagrams
+can be embedded directly into LaTeX files.")
+    (license license:lppl)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 5332693c3cf538825142f397fe49691851de028b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:20:48 +0200
Subject: gnu: Add texlive-doc-pictex.

* gnu/packages/tex.scm (texlive-doc-pictex): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1e39c1e1a9..a5e535e8e2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16771,6 +16771,26 @@ using @code{pict2e} so that the restrictions on line direction are removed.")
 can be embedded directly into LaTeX files.")
     (license license:lppl)))
 
+(define-public texlive-doc-pictex
+  (package
+    (name "texlive-doc-pictex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/doc-pictex/")
+             (base32
+              "0fdvqhkgi5j33rx0r4fifj69f4smn5w0n99vx90a3fw15qzxsg5y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/doc-pictex")
+    (synopsis "Summary list of PicTeX documentation")
+    (description
+     "This package provides a summary of available resources providing
+documentation of PicTeX.")
+    (license
+     (list
+      (license:fsf-free "share/texmf-dist/doc/generic/doc-pictex/Doc-PiCTeX.txt")))))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From b7618a44afe539cd3b706d30961b479b4e8c1094 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:21:05 +0200
Subject: gnu: Add texlive-dot2texi.

* gnu/packages/tex.scm (texlive-dot2texi): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a5e535e8e2..7af70e2c83 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16791,6 +16791,27 @@ documentation of PicTeX.")
      (list
       (license:fsf-free "share/texmf-dist/doc/generic/doc-pictex/Doc-PiCTeX.txt")))))
 
+(define-public texlive-dot2texi
+  (package
+    (name "texlive-dot2texi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/dot2texi/" "tex/latex/dot2texi/")
+             (base32
+              "1m8774ds3hsky4nk0krj4a582fyznrxdfbfma5z8hp083nrlm469")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dot2texi")
+    (synopsis "Create graphs within LaTeX using the @code{dot2tex} tool")
+    (description
+     "The @code{dot2texi} package allows you to embed graphs in the DOT graph
+description language in your LaTeX documents.  The @code{dot2tex} tool is used
+to invoke Graphviz for graph layout, and to transform the output from Graphviz
+to LaTeX code.  The generated code relies on the TikZ and PGF package or the
+PSTricks package.")
+    (license license:gpl3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 8d31456bc11481af132fb6dde03f9460db47e857 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:21:20 +0200
Subject: gnu: Add texlive-dottex.

* gnu/packages/tex.scm (texlive-dottex): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7af70e2c83..08ea5c6745 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16812,6 +16812,26 @@ to LaTeX code.  The generated code relies on the TikZ and PGF package or the
 PSTricks package.")
     (license license:gpl3+)))
 
+(define-public texlive-dottex
+  (package
+    (name "texlive-dottex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/dottex/" "source/latex/dottex/"
+                   "tex/latex/dottex/")
+             (base32
+              "0lk3ylbbgq2glni6qp6spmn8mr2qv4q1b06raadsb7hh75p1r218")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dottex")
+    (synopsis "Use DOT code in LaTeX")
+    (description
+     "The @code{dottex} package allows you to encapsulate DOT and Neato files
+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-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 047c2c453bf842f73ffc25138c5f6b8e2dfec981 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:21:36 +0200
Subject: gnu: Add texlive-dpcircling.

* gnu/packages/tex.scm (texlive-dpcircling): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 08ea5c6745..c5f04212ac 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16832,6 +16832,29 @@ 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-dpcircling
+  (package
+    (name "texlive-dpcircling")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/dpcircling/"
+                   "tex/latex/dpcircling/")
+             (base32
+              "0wpskh9rixgjvn4h5kand9ggiqa2mqca5fc0l565pxq8a9sq2bm0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dpcircling")
+    (synopsis "Decorated text boxes using TikZ")
+    (description
+     "This simple package provides four types of text decorations using TikZ.
+You can frame your text with circles, rectangles, jagged rectangles, and
+fan-shapes.  The baseline will be adjusted properly according to the
+surroundings.  You can use these decorations both in text mode and in math
+mode.  You can specify line color, line width, width, and height using option
+keys.")
+    (license license:expat)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From b71f77dc96cefb7d0049a92abbf43af8acd794e4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:21:49 +0200
Subject: gnu: Add texlive-dratex.

* gnu/packages/tex.scm (texlive-dratex): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c5f04212ac..ef788ae97f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16855,6 +16855,24 @@ mode.  You can specify line color, line width, width, and height using option
 keys.")
     (license license:expat)))
 
+(define-public texlive-dratex
+  (package
+    (name "texlive-dratex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/dratex/" "tex/generic/dratex/")
+             (base32
+              "02qpchj2ws1d9d80284k7akzafbgdm358qxd41ms21rszyzdj11c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dratex")
+    (synopsis "General drawing macros")
+    (description
+     "This package provides a low level (@file{DraTex.sty}) and
+a high-level (@file{AlDraTex.sty}) drawing package written entirely in TeX.")
+    (license license:lppl)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 6901fadbb92567bbe7599dd73572b5c89fc70e4e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:22:02 +0200
Subject: gnu: Add texlive-drs.

* gnu/packages/tex.scm (texlive-drs): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ef788ae97f..c1890270bd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16873,6 +16873,28 @@ keys.")
 a high-level (@file{AlDraTex.sty}) drawing package written entirely in TeX.")
     (license license:lppl)))
 
+(define-public texlive-drs
+  (package
+    (name "texlive-drs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/drs/" "tex/latex/drs/")
+             (base32
+              "0vvwbn1qxxh42v1jjvk3nra79zv0lz0fyrj5c6q8yjppn2rj10h0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/drs")
+    (synopsis "Typeset Discourse Representation Structures (DRS)")
+    (description
+     "The package draws Discourse Representation Structures (DRSs).  It can
+draw embedded DRSs, if-then conditions and quantificational duplex
+conditions (with a properly scaled connecting diamond).  Formatting parameters
+allow the user to control the appearance and placement of DRSs, and of DRS
+variables and conditions.  The package is based on DRS macros in the
+@code{covington} package.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 8181a38d115e00b2217be904b78d9424956a16f7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:22:16 +0200
Subject: gnu: Add texlive-duotenzor.

* gnu/packages/tex.scm (texlive-duotenzor): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c1890270bd..9ccb202031 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16895,6 +16895,26 @@ variables and conditions.  The package is based on DRS macros in the
 @code{covington} package.")
     (license license:lppl1.3+)))
 
+(define-public texlive-duotenzor
+  (package
+    (name "texlive-duotenzor")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/duotenzor/"
+                   "tex/latex/duotenzor/")
+             (base32
+              "1l99ah5p2cp1qikk3jrbn1xrs6fz23c9h7wqc228jnrkmni7kn98")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/duotenzor")
+    (synopsis "Drawing package for circuit and duotensor diagrams")
+    (description
+     "This is a drawing package for circuit and duotensor diagrams within
+LaTeX documents.  It consists of about eighty commands, calling on TikZ for
+support.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 256b5153f89f65c8993fda840908f423ea23aa34 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:22:30 +0200
Subject: gnu: Add texlive-dynkin-diagrams.

* gnu/packages/tex.scm (texlive-dynkin-diagrams): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9ccb202031..2a0c3e8967 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16915,6 +16915,25 @@ LaTeX documents.  It consists of about eighty commands, calling on TikZ for
 support.")
     (license license:lppl1.3+)))
 
+(define-public texlive-dynkin-diagrams
+  (package
+    (name "texlive-dynkin-diagrams")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/dynkin-diagrams/"
+                   "tex/latex/dynkin-diagrams/")
+             (base32
+              "0s2bf8l51ngpf9bg8vx8s4xa0dmdxj02h0hcyf23kh58xpxvmylh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dynkin-diagrams")
+    (synopsis "Draw Dynkin, Coxeter, and Satake diagrams using TikZ")
+    (description
+     "This is a drawing package for Dynkin, Coxeter, and Satake diagrams in
+LaTeX documents, using the TikZ package.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From a5481f7cef8e710428b334fbe9c4fbcb1ad0a873 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:22:52 +0200
Subject: gnu: Add texlive-layaureo.

* gnu/packages/tex.scm (texlive-layaureo): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2a0c3e8967..ca16a9975c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -19597,6 +19597,27 @@ It is particularly useful in the page footer that says: @samp{Page N of M}.")
 
 (define-deprecated-package texlive-latex-lastpage texlive-lastpage)
 
+(define-public texlive-layaureo
+  (package
+    (name "texlive-layaureo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/layaureo/" "source/latex/layaureo/"
+                   "tex/latex/layaureo/")
+             (base32
+              "021dcqv8flqv665falbiq7ga56zpihzrdi6kc59nbk0l4jmxf1w9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/layaureo")
+    (synopsis "Improve the A4 page layout")
+    (description
+     "This package produces a wide page layout for documents that use A4 paper
+size.  Moreover, LayAureo provides both a simple hook for leaving an empty
+space, which is required if pages are bundled by a press binding, and an
+option called @code{big} that forces typearea to become maximum.")
+    (license license:lppl)))
+
 (define-public texlive-tabto-ltx
   (package
     (name "texlive-tabto-ltx")
-- 
cgit 1.4.1


From 0b794d0e1cdff1622754bcc3e2ac2077ba543a6b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:23:27 +0200
Subject: gnu: Add texlive-ecgdraw.

* gnu/packages/tex.scm (texlive-ecgdraw): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ca16a9975c..19b852089c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16934,6 +16934,33 @@ support.")
 LaTeX documents, using the TikZ package.")
     (license license:lppl1.3c)))
 
+(define-public texlive-ecgdraw
+  (package
+    (name "texlive-ecgdraw")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ecgdraw/" "source/latex/ecgdraw/"
+                   "tex/latex/ecgdraw/")
+             (base32
+              "16kbmf9fckms0vhi41h2p6k8znv6plzwn4f2j374zmpqphq1m3il")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-hypdoc
+                  texlive-layaureo
+                  texlive-listings
+                  texlive-pgf
+                  texlive-tools))))
+    (home-page "https://ctan.org/pkg/ecgdraw")
+    (synopsis "Draws electrocardiograms (ECG)")
+    (description
+     "This package provides the @code{\\ECG} command, which draws
+electrocardiograms (ECG).  It can generate different types of wave.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 4328108fc8f3eaaec8a392658a14e766ef403bd7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:23:39 +0200
Subject: gnu: Add texlive-ellipse.

* gnu/packages/tex.scm (texlive-ellipse): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 19b852089c..5ff1a1a5d2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16961,6 +16961,26 @@ LaTeX documents, using the TikZ package.")
 electrocardiograms (ECG).  It can generate different types of wave.")
     (license license:lppl1.3+)))
 
+(define-public texlive-ellipse
+  (package
+    (name "texlive-ellipse")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ellipse/" "source/latex/ellipse/"
+                   "tex/latex/ellipse/")
+             (base32
+              "0biya15r55hr41vnqsviqqsqlb7p47i2n814dahfs0r65vlfnz23")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ellipse")
+    (synopsis
+     "Draw ellipses and elliptical arcs using @code{picture} environment")
+    (description
+     "This package provides commands to draw ellipses and elliptical arcs
+using the standard LaTeX2e @code{picture} environment.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 0945d1d5fdd015321863f384cba8c945787b1093 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:23:50 +0200
Subject: gnu: Add texlive-endofproofwd.

* gnu/packages/tex.scm (texlive-endofproofwd): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5ff1a1a5d2..b57b528e10 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16981,6 +16981,25 @@ electrocardiograms (ECG).  It can generate different types of wave.")
 using the standard LaTeX2e @code{picture} environment.")
     (license license:lppl1.3+)))
 
+(define-public texlive-endofproofwd
+  (package
+    (name "texlive-endofproofwd")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/endofproofwd/"
+                   "tex/latex/endofproofwd/common/")
+             (base32
+              "0lgygqfzklf3l0pijas4g1489p3k5hwb0nwijz7fmva6c7sn124i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/endofproofwd")
+    (synopsis "End of proof sign")
+    (description
+     "This package provides an additional end of proof sign.  The command's
+name is @code{\\wasserdicht}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From ea65d3b8f282df6e953a8a889ffa5b167415d056 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:24:11 +0200
Subject: gnu: Add texlive-epspdfconversion.

* gnu/packages/tex.scm (texlive-epspdfconversion): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b57b528e10..c9a1b7c353 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17000,6 +17000,26 @@ using the standard LaTeX2e @code{picture} environment.")
 name is @code{\\wasserdicht}.")
     (license license:lppl1.3+)))
 
+(define-public texlive-epspdfconversion
+  (package
+    (name "texlive-epspdfconversion")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/epspdfconversion/"
+                   "tex/latex/epspdfconversion/")
+             (base32
+              "1czh9ppkgk9lxw4imagnwm4b88vylr4vwhzb1k63ik749h047kg2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/epspdfconversion")
+    (synopsis "On-the-fly conversion of EPS to PDF")
+    (description
+     "The package calls the @code{epstopdf} package to convert EPS graphics to
+PDF, on the fly.  It serves as a vehicle for passing conversion options (such
+as grayscale, prepress or pdfversion) to the @code{epspdf} converter.")
+    (license license:lppl)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 54eeeaa48c6a666bd065cb40e2285ed8a73429b1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:24:24 +0200
Subject: gnu: Add texlive-esk.

* gnu/packages/tex.scm (texlive-esk): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c9a1b7c353..93a9599513 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17020,6 +17020,30 @@ PDF, on the fly.  It serves as a vehicle for passing conversion options (such
 as grayscale, prepress or pdfversion) to the @code{epspdf} converter.")
     (license license:lppl)))
 
+(define-public texlive-esk
+  (package
+    (name "texlive-esk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/esk/" "source/latex/esk/"
+                   "tex/latex/esk/")
+             (base32
+              "0hx58ajinbfc6axd4xbj395vyhr7mj247fvlzfjx71hcg9jnwkp4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/esk")
+    (synopsis "Package to encapsulate Sketch files in LaTeX sources")
+    (description
+     "The ESK package allows to encapsulate Sketch files in LaTeX sources.
+This is very useful for keeping illustrations synchronized with the text.  It
+also frees the user from inventing descriptive names for new files that fit
+into the confines of file system conventions.  Sketch is a 3D scene
+description language by Eugene K. Ressler and can generate TikZ and PSTricks
+code.  ESK behaves in a similar fashion to EMP (which encapsulates MetaPost
+files), and was in fact developed from it.")
+    (license license:gpl3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 69a322c9d7edfd551ee06b672b087e26cf602cec Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 12 Jul 2023 22:24:35 +0200
Subject: gnu: Add texlive-euflag.

* gnu/packages/tex.scm (texlive-euflag): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 93a9599513..be11094929 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17044,6 +17044,27 @@ code.  ESK behaves in a similar fashion to EMP (which encapsulates MetaPost
 files), and was in fact developed from it.")
     (license license:gpl3+)))
 
+(define-public texlive-euflag
+  (package
+    (name "texlive-euflag")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/euflag/" "source/latex/euflag/"
+                   "tex/latex/euflag/")
+             (base32
+              "0dhbz79grhdls4cl7idk0hvr6vddniwgn1h21f5bvxqcv1xj0d8v")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/euflag")
+    (synopsis "Command to reproduce the flag of the European Union")
+    (description
+     "This LaTeX package implements a command to reproduce the official flag
+of the European Union (EU).  The flag is reproduced at 1em high based on the
+current font size, so it can be scaled arbitrarily by changing the font
+size.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 0c746edd1daff63703d075afb982738f71669d0c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:18:42 +0200
Subject: gnu: Add texlive-fast-diagram.

* gnu/packages/tex.scm (texlive-fast-diagram): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index be11094929..9576f4d539 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17065,6 +17065,26 @@ current font size, so it can be scaled arbitrarily by changing the font
 size.")
     (license license:lppl1.3c)))
 
+(define-public texlive-fast-diagram
+  (package
+    (name "texlive-fast-diagram")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fast-diagram/"
+                   "tex/latex/fast-diagram/")
+             (base32
+              "03ygmgh6gnlkn7dwnwyifv946ja6yswm3gdgv7ad39h5s0ay99hy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fast-diagram")
+    (synopsis "Easy generation of FAST diagrams")
+    (description
+     "The package provides simple means of producing FAST diagrams, using
+TikZ/PGF tools.  FAST diagrams are useful for functional analysis techniques
+in design methods.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 2b09b6a8fd22a629a951a7f8faf2eaf14adff9cc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:19:05 +0200
Subject: gnu: Add texlive-fig4latex.

* gnu/packages/tex.scm (texlive-fig4latex): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9576f4d539..87ed573188 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17085,6 +17085,30 @@ TikZ/PGF tools.  FAST diagrams are useful for functional analysis techniques
 in design methods.")
     (license license:lppl1.3+)))
 
+(define-public texlive-fig4latex
+  (package
+    (name "texlive-fig4latex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/fig4latex/"
+                   "scripts/fig4latex/")
+             (base32
+              "0z4dnd369q1ynpb3xd4pwyhmysn78zx8izq7va1s5kpwdr2hdj99")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts #~(list "fig4latex")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/fig4latex")
+    (synopsis "Management of figures for large LaTeX documents")
+    (description
+     "Fig4LaTeX simplifies management of the figures in a large LaTeX document.
+Fig4LaTeX is appropriate for projects that include figures with graphics
+created by XFig --- in particular, graphics which use the combined
+PS/LaTeX (or PDF/LaTeX) export method.")
+    (license license:gpl3)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From db622bb7166c70a1c2d00996c2577b0e1d83f47f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:19:27 +0200
Subject: gnu: Add texlive-figchild.

* gnu/packages/tex.scm (texlive-figchild): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 87ed573188..de6344533e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17109,6 +17109,28 @@ created by XFig --- in particular, graphics which use the combined
 PS/LaTeX (or PDF/LaTeX) export method.")
     (license license:gpl3)))
 
+(define-public texlive-figchild
+  (package
+    (name "texlive-figchild")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/figchild/" "tex/latex/figchild/")
+             (base32
+              "1q02q8cpkjwjqlykjq64vm65shqm6bn281j2jsv7qnay19lqmd3n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/figchild")
+    (synopsis "Pictures for creating children's activities")
+    (description
+     "This package was created with the aim of facilitating the work of
+Elementary School teachers who need to create colorful and attractive
+activities for their students.  It is a product of the Computational
+Mathematics discipline offered at the Federal University of Vicosa --- Campus
+UFV --- Florestal by professor Fernando de Souza Bastos.  It makes use of the
+TikZ and @code{xcolor} packages.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 8ebc5ae86131125d40c7161bb57e0676517de262 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:19:39 +0200
Subject: gnu: Add texlive-figput.

* gnu/packages/tex.scm (texlive-figput): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index de6344533e..de0a184d93 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17131,6 +17131,26 @@ UFV --- Florestal by professor Fernando de Souza Bastos.  It makes use of the
 TikZ and @code{xcolor} packages.")
     (license license:lppl1.3c)))
 
+(define-public texlive-figput
+  (package
+    (name "texlive-figput")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/figput/" "tex/latex/figput/")
+             (base32
+              "0ckwbrsl5075902pmmjp1r3n31pdpbqvydh69vq6mkfwk3ipp4gj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/figput")
+    (synopsis "Create interactive figures in LaTeX")
+    (description
+     "FigPut allows figures to be specified using JavaScript.  The resulting
+document can be viewed as a static PDF, as usual, or the document can be
+viewed in a web-browser, in which case the figures are interactive.  A variety
+of interactive widgets are included.")
+    (license license:cc-by-sa4.0)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 4b31d8b527a4a361cd31784efc3c91ebd26f9375 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:19:55 +0200
Subject: gnu: Add texlive-fitbox.

* gnu/packages/tex.scm (texlive-fitbox): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index de0a184d93..dd76d92171 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17151,6 +17151,27 @@ viewed in a web-browser, in which case the figures are interactive.  A variety
 of interactive widgets are included.")
     (license license:cc-by-sa4.0)))
 
+(define-public texlive-fitbox
+  (package
+    (name "texlive-fitbox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fitbox/" "source/latex/fitbox/"
+                   "tex/latex/fitbox/")
+             (base32
+              "0li1nvwv8ifw1dkfsqgnhapkagndibs75lp03byxnwrmc99r7a2y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fitbox")
+    (synopsis "Fit graphics on a page")
+    (description
+     "The package allows a box (usually an @code{\\includegraphics} box) to
+fit on the page.  It scales the box to the maximal allowed size within the
+user-set limits.  If there is not enough space on the page, the box is moved
+to the next one.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 234967d21e3933d493d8030751d8cf1b93b1046b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:20:09 +0200
Subject: gnu: Add texlive-flowchart.

* gnu/packages/tex.scm (texlive-flowchart): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dd76d92171..e0762d78ed 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17172,6 +17172,27 @@ user-set limits.  If there is not enough space on the page, the box is moved
 to the next one.")
     (license license:lppl1.3+)))
 
+(define-public texlive-flowchart
+  (package
+    (name "texlive-flowchart")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/flowchart/"
+                   "source/latex/flowchart/"
+                   "tex/latex/flowchart/")
+             (base32
+              "1r0n7wr7ljhlvyhmm7f85h1c5imj9iqy7afv4mjy1ychcaws233w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/flowchart")
+    (synopsis "Shapes for drawing flowcharts, using TikZ")
+    (description
+     "The package provides a set of traditional flowchart element shapes; the
+documentation shows how to build a flowchart from these elements, using
+PGF/TikZ.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 89a13e7815e9b5160bdf9c613491ebfb31071096 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:20:28 +0200
Subject: gnu: Add texlive-elocalloc.

* gnu/packages/tex.scm (texlive-elocalloc): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e0762d78ed..011d6ec5ae 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16981,6 +16981,27 @@ electrocardiograms (ECG).  It can generate different types of wave.")
 using the standard LaTeX2e @code{picture} environment.")
     (license license:lppl1.3+)))
 
+(define-public texlive-elocalloc
+  (package
+    (name "texlive-elocalloc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/elocalloc/"
+                   "source/latex/elocalloc/"
+                   "tex/latex/elocalloc/")
+             (base32
+              "121hpnka88y6laayjbhgiphbqn8qv42024bjda21qcc076s4b632")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/elocalloc")
+    (synopsis "Local allocation macros for LaTeX 2015")
+    (description
+     "This package provides local allocation macros, with names taken from
+@file{etex.sty} but with implementation based on the LaTeX 2015 allocation
+macros.")
+    (license license:lppl)))
+
 (define-public texlive-endofproofwd
   (package
     (name "texlive-endofproofwd")
-- 
cgit 1.4.1


From a65bf6b780a2dde6aa1c11a449954d6eeac8c16c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:29:44 +0200
Subject: gnu: Add texlive-inlinedef.

* gnu/packages/tex.scm (texlive-inlinedef): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 011d6ec5ae..3c0e290d4a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17242,6 +17242,34 @@ TeX implementation, running in any current environment, requires the
 interpreter, not just LuaTeX.")
     (license license:lppl)))
 
+(define-public texlive-inlinedef
+  (package
+    (name "texlive-inlinedef")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/inlinedef/"
+                   "source/latex/inlinedef/"
+                   "tex/latex/inlinedef/")
+             (base32
+              "0ys2pb8dmgg41nwh9r9qhmxlfw5wxrfwryvdx1ppab4ndi138baw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/inlinedef")
+    (synopsis "Inline expansions within definitions")
+    (description
+     "The package provides a macro @code{\\Inline} that precedes
+a @code{\\def} or @code{\\gdef}.  Within the definition text of an inlined
+definition, keywords such as @code{\\Expand} may be used to selectively inline
+certain expansions at definition-time.  This eases the process of redefining
+macros in terms of the original definition, as well as definitions in which
+the token that must be expanded is deep within, where @code{\\expandafter}
+would be difficult and @code{\\edef} is not suitable.  Another application is
+as an easier version of @code{\\aftergroup}, by defining a macro in terms of
+expanded local variables, then ending the group with
+@code{\\expandafter\\endgroup\\macro}.")
+    (license license:lppl)))
+
 (define-public texlive-qrcode
   (package
     (name "texlive-qrcode")
-- 
cgit 1.4.1


From 2b125a99d68021e3b04a2e42c37af8a4c0af1324 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:29:59 +0200
Subject: gnu: Add texlive-forest.

* gnu/packages/tex.scm (texlive-forest): New variable.
---
 gnu/packages/tex.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3c0e290d4a..ae44457083 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17214,6 +17214,39 @@ documentation shows how to build a flowchart from these elements, using
 PGF/TikZ.")
     (license license:lppl1.3+)))
 
+(define-public texlive-forest
+  (package
+    (name "texlive-forest")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/forest/" "makeindex/forest/"
+                   "source/latex/forest/" "tex/latex/forest/")
+             (base32
+              "00zyxfi59kglnby7l24l1bz08afv7r9qc1wifcxrb6s5xygj42zs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-elocalloc
+           texlive-environ
+           texlive-etoolbox
+           texlive-inlinedef
+           texlive-l3packages
+           texlive-pgf
+           texlive-pgfopts))
+    (home-page "https://ctan.org/pkg/forest")
+    (synopsis "Drawing (linguistic) trees")
+    (description
+     "The package provides a PGF/TikZ-based mechanism for drawing
+linguistic (and other kinds of) trees.  Its main features are: a packing
+algorithm which can produce very compact trees; a user-friendly interface
+consisting of the familiar bracket encoding of trees plus the key-value
+interface to option-setting; many tree-formatting options, with control over
+option values of individual nodes and mechanisms for their manipulation; the
+possibility to decorate the tree using the full power of PGF/TikZ; and an
+externalization mechanism sensitive to code-changes.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gates
   (package
     (name "texlive-gates")
-- 
cgit 1.4.1


From 8f02e31cad788f3face1081bf2d29aee09b48fa4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:30:16 +0200
Subject: gnu: Add texlive-genealogytree.

* gnu/packages/tex.scm (texlive-genealogytree): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ae44457083..f0535b47c5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17275,6 +17275,29 @@ TeX implementation, running in any current environment, requires the
 interpreter, not just LuaTeX.")
     (license license:lppl)))
 
+(define-public texlive-genealogytree
+  (package
+    (name "texlive-genealogytree")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/genealogytree/"
+                   "tex/latex/genealogytree/")
+             (base32
+              "10h12qgjrh37ax1grpkyas5blf3s4g6bfp6g5d9x7y1ddfpxjmix")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/genealogytree")
+    (synopsis "Pedigree and genealogical tree diagrams")
+    (description
+     "Pedigree and genealogical tree diagrams are proven tools to visualize
+genetic and relational connections between individuals.  The package provides
+a set of tools to typeset genealogical trees, i.e., to typeset a set of
+special graphs for the description of family-like structures.  The package
+uses an autolayout algorithm which can be customized, e.g., to prioritize
+certain paths.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-inlinedef
   (package
     (name "texlive-inlinedef")
-- 
cgit 1.4.1


From 51443f69e4a8c1b2dc900ecf53e1a96e95cd24c2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:31:16 +0200
Subject: gnu: Add texlive-getmap.

* gnu/packages/tex.scm (texlive-getmap): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f0535b47c5..c7acf2d1fa 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17298,6 +17298,31 @@ uses an autolayout algorithm which can be customized, e.g., to prioritize
 certain paths.")
     (license license:lppl1.3+)))
 
+
+(define-public texlive-getmap
+  (package
+    (name "texlive-getmap")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/getmap/" "scripts/getmap/"
+                   "tex/latex/getmap/")
+             (base32
+              "12pip7a1pibjlbllkrbz0fss0i5zdd8x1pbvzzbwn6rb3ragqwl9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts #~(list "getmapdl.lua")))
+    (home-page "https://ctan.org/pkg/getmap")
+    (synopsis "Download OpenStreetMap maps for use in documents")
+    (description
+     "The package provides a simple interface to OpenStreetMap, and to Google
+Maps, map images.  In the simplest case, it is sufficient to specify the
+address you need.  The package loads the map image using an external Lua
+script (LaTeX must be running with @samp{\\write 18} enabled).  The Lua script
+may be used from the command line; a Bash version is provided.")
+    (license license:lppl)))
+
 (define-public texlive-inlinedef
   (package
     (name "texlive-inlinedef")
-- 
cgit 1.4.1


From 904724409182e495ac1a074e28aed3c331ec9738 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:31:28 +0200
Subject: gnu: Add texlive-gnuplottex.

* gnu/packages/tex.scm (texlive-gnuplottex): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c7acf2d1fa..9878521d34 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17323,6 +17323,31 @@ script (LaTeX must be running with @samp{\\write 18} enabled).  The Lua script
 may be used from the command line; a Bash version is provided.")
     (license license:lppl)))
 
+(define-public texlive-gnuplottex
+  (package
+    (name "texlive-gnuplottex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gnuplottex/"
+                   "source/latex/gnuplottex/"
+                   "tex/latex/gnuplottex/")
+             (base32
+              "1c99xc24bqp0j1xy31ayna4xmdsyshs9fjarb8cmn4m3ffwvlrmw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gnuplottex")
+    (synopsis "Embed Gnuplot commands in LaTeX documents")
+    (description
+     "This package allows you to include Gnuplot graphs in your LaTeX
+documents.  The Gnuplot code is extracted from the document and written to
+@file{.gnuplot} files.  Then, if shell escape is used, the graph files are
+automatically processed to graphics or LaTeX code files which will then be
+included in the document.  If shell escape isn't used, the user will have to
+manually convert the files by running Gnuplot on the extracted @file{.gnuplot}
+files.")
+    (license license:gpl2)))
+
 (define-public texlive-inlinedef
   (package
     (name "texlive-inlinedef")
-- 
cgit 1.4.1


From 8da59a5b5a73b5bc4cc13cf638f342cc279e6539 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:31:40 +0200
Subject: gnu: Add texlive-gradientframe.

* gnu/packages/tex.scm (texlive-gradientframe): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9878521d34..7335bb8c83 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17348,6 +17348,34 @@ manually convert the files by running Gnuplot on the extracted @file{.gnuplot}
 files.")
     (license license:gpl2)))
 
+(define-public texlive-gradientframe
+  (package
+    (name "texlive-gradientframe")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gradientframe/"
+                   "source/latex/gradientframe/"
+                   "tex/latex/gradientframe/")
+             (base32
+              "0qy3ri6fdgzdslaaa7gakswvpc299xyarm8ng4cs8w64q14675r1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-charter
+                  texlive-emp
+                  texlive-hypdoc
+                  texlive-listings
+                  texlive-tools))))
+    (home-page "https://ctan.org/pkg/gradientframe")
+    (synopsis "Simple gradient frames around objects")
+    (description
+     "The package provides a means of drawing graded frames around objects.
+The gradients of the frames are drawn using the @code{color} package.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-inlinedef
   (package
     (name "texlive-inlinedef")
-- 
cgit 1.4.1


From 278c533b093edc0d67cf2eddb5fc9c626c03e5f2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:31:53 +0200
Subject: gnu: Add texlive-grafcet.

* gnu/packages/tex.scm (texlive-grafcet): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7335bb8c83..ce2c2fd3f6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17376,6 +17376,25 @@ files.")
 The gradients of the frames are drawn using the @code{color} package.")
     (license license:lppl1.3+)))
 
+(define-public texlive-grafcet
+  (package
+    (name "texlive-grafcet")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/grafcet/" "tex/latex/grafcet/")
+             (base32
+              "1swrap90i4l3a6azvy40b991zkqvyfw2z3mk6cq727yplmr1hkwk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/grafcet")
+    (synopsis "Draw Grafcet/SFC with TikZ")
+    (description
+     "The package provides a library (GRAFCET) that can draw Grafcet
+Sequential Function Chart (SFC) diagrams, in accordance with EN 60848, using
+PGF/TikZ.")
+    (license license:lppl1.0+)))
+
 (define-public texlive-inlinedef
   (package
     (name "texlive-inlinedef")
-- 
cgit 1.4.1


From bf04cdd8909db78bba92392b536da3c72a03dd81 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:32:05 +0200
Subject: gnu: Add texlive-graph35.

* gnu/packages/tex.scm (texlive-graph35): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ce2c2fd3f6..c2f6570832 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17395,6 +17395,26 @@ Sequential Function Chart (SFC) diagrams, in accordance with EN 60848, using
 PGF/TikZ.")
     (license license:lppl1.0+)))
 
+(define-public texlive-graph35
+  (package
+    (name "texlive-graph35")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/graph35/" "source/latex/graph35/"
+                   "tex/latex/graph35/")
+             (base32
+              "0012mfpl8cxqm0grmgazixqbgicfgzr4z891zgjw60xy6df8qhwb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/graph35")
+    (synopsis "Draw keys and screen items of several Casio calculators")
+    (description
+     "This package defines commands to draw the Casio Graph 35 / Fx-9750GII
+calculator (and other models).  It can draw the whole calculator, or parts of
+it.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-inlinedef
   (package
     (name "texlive-inlinedef")
-- 
cgit 1.4.1


From 1dbdd0feea0d074ad60676a4d047db1fee505167 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:32:20 +0200
Subject: gnu: Add texlive-graphicxpsd.

* gnu/packages/tex.scm (texlive-graphicxpsd): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c2f6570832..bec01bb17f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17415,6 +17415,26 @@ calculator (and other models).  It can draw the whole calculator, or parts of
 it.")
     (license license:lppl1.3+)))
 
+(define-public texlive-graphicxpsd
+  (package
+    (name "texlive-graphicxpsd")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/graphicxpsd/"
+                   "tex/latex/graphicxpsd/")
+             (base32
+              "04fll1h90rl75bqbkhjp2yp8bragfkv5rj2kwrbbi6p7zq9nfrpn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/graphicxpsd")
+    (synopsis
+     "Adobe Photoshop Data format (PSD) support for @code{graphicx} package")
+    (description
+     "This package provides Adobe Photoshop Data format (PSD) support for the
+@code{graphicx} package with the @command{convert} command from ImageMagick.")
+    (license license:expat)))
+
 (define-public texlive-inlinedef
   (package
     (name "texlive-inlinedef")
-- 
cgit 1.4.1


From 3384b68dcf235829294d9e599ba5733b503feab3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:33:11 +0200
Subject: gnu: Add texlive-graphviz.

* gnu/packages/tex.scm (texlive-graphviz): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bec01bb17f..88e11d63cd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17435,6 +17435,25 @@ it.")
 @code{graphicx} package with the @command{convert} command from ImageMagick.")
     (license license:expat)))
 
+(define-public texlive-graphviz
+  (package
+    (name "texlive-graphviz")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/graphviz/"
+                   "source/latex/graphviz/"
+                   "tex/latex/graphviz/")
+             (base32
+              "0abg1cmzr449gd5pbg3ppgf35xixjyszy3jxnrg37kqly7c26l6s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/graphviz")
+    (synopsis "Write Graphviz inline in LaTeX documents")
+    (description
+     "The package allows inline use of Graphviz code, in a LaTeX document.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-inlinedef
   (package
     (name "texlive-inlinedef")
-- 
cgit 1.4.1


From 252b94f0170510e9d7bb5146aca5007746c5c250 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:33:23 +0200
Subject: gnu: Add texlive-gtrlib-largetrees.

* gnu/packages/tex.scm (texlive-gtrlib-largetrees): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 88e11d63cd..44f2ba5a48 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17454,6 +17454,27 @@ it.")
      "The package allows inline use of Graphviz code, in a LaTeX document.")
     (license license:lppl1.3+)))
 
+(define-public texlive-gtrlib-largetrees
+  (package
+    (name "texlive-gtrlib-largetrees")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gtrlib-largetrees/"
+                   "source/latex/gtrlib-largetrees/"
+                   "tex/latex/gtrlib-largetrees/")
+             (base32
+              "0yfc18v919brdj6psah8q9hsjpqs8zalnz3ridrhgir98x0l8wq9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gtrlib-largetrees")
+    (synopsis "Library for genealogytree aiming at large trees")
+    (description
+     "The main goal of this package is to offer additional database fields and
+formats for the @code{genealogytree} package, particularly for typesetting
+large trees.")
+    (license license:lppl1.2+)))
+
 (define-public texlive-inlinedef
   (package
     (name "texlive-inlinedef")
-- 
cgit 1.4.1


From be9825275671663e0d8ca0b916c857bc5203393b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:33:39 +0200
Subject: gnu: Add texlive-harveyballs.

* gnu/packages/tex.scm (texlive-harveyballs): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 44f2ba5a48..516cc1083c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17475,6 +17475,25 @@ formats for the @code{genealogytree} package, particularly for typesetting
 large trees.")
     (license license:lppl1.2+)))
 
+(define-public texlive-harveyballs
+  (package
+    (name "texlive-harveyballs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/harveyballs/"
+                   "tex/latex/harveyballs/")
+             (base32
+              "15zng922zyc0jiq8yrdgl3gwj1gvdqk71zc1bcc8gl08j4y0cxgi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/harveyballs")
+    (synopsis "Create Harvey Balls using TikZ")
+    (description
+     "The package provides five commands to create Harvey Balls in
+a document.")
+    (license license:gpl3+)))
+
 (define-public texlive-inlinedef
   (package
     (name "texlive-inlinedef")
-- 
cgit 1.4.1


From 61e8a2d33f691ac6683d13bd428ac91e7383549b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:33:51 +0200
Subject: gnu: Add texlive-here.

* gnu/packages/tex.scm (texlive-here): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 516cc1083c..e9da1356af 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17494,6 +17494,28 @@ large trees.")
 a document.")
     (license license:gpl3+)))
 
+(define-public texlive-here
+  (package
+    (name "texlive-here")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/here/" "tex/latex/here/")
+             (base32
+              "0pmjh9xvwmv6cf775lzfagf9wziwrgx6fri4jjhl4mzkxmxhsnpp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/here")
+    (synopsis "Emulation of obsolete package for @code{here} floats")
+    (description
+     "This package provides the @samp{H} option for floats in LaTeX to signify
+that the environment is not really a float, and should therefore be placed
+@emph{here} and not float at all.  The package emulates an older package of
+the same name, which has long been suppressed by its author.  The job is done
+by nothing more than loading the @code{float} package, which has long provided
+the option in an acceptable framework.")
+    (license license:public-domain)))
+
 (define-public texlive-inlinedef
   (package
     (name "texlive-inlinedef")
-- 
cgit 1.4.1


From 75442a5e2d493f79c8c33e2b358b4fbc0532c3ec Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:34:05 +0200
Subject: gnu: Add texlive-hf-tikz.

* gnu/packages/tex.scm (texlive-hf-tikz): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e9da1356af..52487ac2e9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17516,6 +17516,25 @@ by nothing more than loading the @code{float} package, which has long provided
 the option in an acceptable framework.")
     (license license:public-domain)))
 
+(define-public texlive-hf-tikz
+  (package
+    (name "texlive-hf-tikz")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hf-tikz/" "source/latex/hf-tikz/"
+                   "tex/latex/hf-tikz/")
+             (base32
+              "02zkax3k50rb080yn5bwy12680y0mdzddv9an3wgsycl9ycxrmi8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hf-tikz")
+    (synopsis "Highlight formulas and formula parts")
+    (description
+     "The package provides a way to highlight formulas and formula parts in
+both documents and presentations, us TikZ.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-inlinedef
   (package
     (name "texlive-inlinedef")
-- 
cgit 1.4.1


From 1d8451ddedb79f19acc9ac4035b1b47f5a2efeb1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:34:18 +0200
Subject: gnu: Add texlive-hobby.

* gnu/packages/tex.scm (texlive-hobby): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 52487ac2e9..b986e6dd42 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17535,6 +17535,26 @@ the option in an acceptable framework.")
 both documents and presentations, us TikZ.")
     (license license:lppl1.3+)))
 
+(define-public texlive-hobby
+  (package
+    (name "texlive-hobby")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hobby/" "source/latex/hobby/"
+                   "tex/latex/hobby/")
+             (base32
+              "1y0np4xpra136y2rqlwsifas33avfrv1psr8nxa92m7vmpd7l7fg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hobby")
+    (synopsis "Implementation of Hobby's algorithm for PGF/TikZ")
+    (description
+     "This package defines a path generation function for PGF/TikZ which
+implements Hobby's algorithm for a path built out of Bezier curves which
+passes through a given set of points.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-inlinedef
   (package
     (name "texlive-inlinedef")
-- 
cgit 1.4.1


From 64cb0f2f08f34642a7eb933ef1f84f9af7cd9e26 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:34:54 +0200
Subject: gnu: Add texlive-hvfloat.

* gnu/packages/tex.scm (texlive-hvfloat): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b986e6dd42..6adb905332 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17555,6 +17555,25 @@ implements Hobby's algorithm for a path built out of Bezier curves which
 passes through a given set of points.")
     (license license:lppl1.3+)))
 
+(define-public texlive-hvfloat
+  (package
+    (name "texlive-hvfloat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hvfloat/" "tex/latex/hvfloat/")
+             (base32
+              "0qfmgxn77vzb9jv3njfpzbqrs2c31z6kl89nwmr3la4kphb7y91w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hvfloat")
+    (synopsis "Controlling captions, fullpage and doublepage floats")
+    (description
+     "This package defines a macro to place objects (tables and figures) and
+their captions in different positions with different rotating angles within
+a float.  All objects and captions can be framed.")
+    (license license:lppl)))
+
 (define-public texlive-inlinedef
   (package
     (name "texlive-inlinedef")
-- 
cgit 1.4.1


From 9326d077ff07daa4ca1933793fb5b283fa61b78d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:35:20 +0200
Subject: gnu: Add texlive-istgame.

* gnu/packages/tex.scm (texlive-istgame): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6adb905332..7368c5ad42 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17602,6 +17602,28 @@ expanded local variables, then ending the group with
 @code{\\expandafter\\endgroup\\macro}.")
     (license license:lppl)))
 
+(define-public texlive-istgame
+  (package
+    (name "texlive-istgame")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/istgame/" "tex/latex/istgame/")
+             (base32
+              "00hpr45s31bhvhhzmgm49knjb8jb3v53gd0w87rlx9ghll38lg0m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/istgame")
+    (synopsis "Draw game trees with TikZ")
+    (description
+     "This LaTeX package provides macros based on TikZ to draw a game tree.
+The main idea underlying its core macros is the completion of a whole tree by
+using a sequence of simple parent-child tree structures, with no longer nested
+relations involved (like the use of grandchildren or great-grandchildren).
+Using this package you can draw a game tree as easily as drawing a game tree
+with pen and paper.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-qrcode
   (package
     (name "texlive-qrcode")
-- 
cgit 1.4.1


From c66357f961980841031d54275106e57f2de24f0b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:35:59 +0200
Subject: gnu: Add texlive-kblocks.

* gnu/packages/tex.scm (texlive-kblocks): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7368c5ad42..c7204408f6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17624,6 +17624,26 @@ Using this package you can draw a game tree as easily as drawing a game tree
 with pen and paper.")
     (license license:lppl1.3c)))
 
+(define-public texlive-kblocks
+  (package
+    (name "texlive-kblocks")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/kblocks/" "tex/latex/kblocks/")
+             (base32
+              "0x85k295bxn4b3i083qmfvjvz2nqrh1r4r6njn491lgsfymyc0pq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/kblocks")
+    (synopsis "Easily typeset control block diagrams and signal flow graphs")
+    (description
+     "Kblocks defines a number of commands to make drawing control block
+diagrams using TikZ/PGF more structured and easier.  It reduces the learning
+curve for TikZ/PGF and serves as a frontend, by focusing on the block or flow
+diagrams only.")
+    (license license:expat)))
+
 (define-public texlive-qrcode
   (package
     (name "texlive-qrcode")
-- 
cgit 1.4.1


From a2034cbd1d140ff204f3dec52715ec350ac1a78a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:36:12 +0200
Subject: gnu: Add texlive-kinematikz.

* gnu/packages/tex.scm (texlive-kinematikz): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c7204408f6..bfe92f531a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17644,6 +17644,30 @@ curve for TikZ/PGF and serves as a frontend, by focusing on the block or flow
 diagrams only.")
     (license license:expat)))
 
+(define-public texlive-kinematikz
+  (package
+    (name "texlive-kinematikz")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/kinematikz/"
+                   "tex/latex/kinematikz/")
+             (base32
+              "0cg1s59xq8dkfzhnf9mh2lgyrwnlwgpqf1wjwqqnscvds85s52l2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/kinematikz")
+    (synopsis "Design kinematic chains and mechanisms")
+    (description
+     "This package provides functionalities to draw kinematic diagrams for
+mechanisms using dedicate symbols (some from the ISO standard and others).
+The intention is not to represent CAD mechanical drawings of mechanisms and
+robots, but only to represent 2D and 3D kinematic chains.  The package
+provides links, joints and other symbols, mostly in the form of TikZ pic
+objects.  These pictures can be placed in the canvas either by a central point
+for joints, and start and end points for some links.")
+    (license (list license:lppl1.3+ license:gpl3+))))
+
 (define-public texlive-qrcode
   (package
     (name "texlive-qrcode")
-- 
cgit 1.4.1


From 9692afb385829df838ddd2acd700660286201adc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:36:24 +0200
Subject: gnu: Add texlive-knitting.

* gnu/packages/tex.scm (texlive-knitting): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bfe92f531a..8dab65394b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17668,6 +17668,34 @@ objects.  These pictures can be placed in the canvas either by a central point
 for joints, and start and end points for some links.")
     (license (list license:lppl1.3+ license:gpl3+))))
 
+(define-public texlive-knitting
+  (package
+    (name "texlive-knitting")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/knitting/"
+                   "fonts/afm/public/knitting/"
+                   "fonts/map/dvips/knitting/"
+                   "fonts/source/public/knitting/"
+                   "fonts/tfm/public/knitting/"
+                   "fonts/type1/public/knitting/"
+                   "tex/latex/knitting/"
+                   "tex/plain/knitting/")
+             (base32
+              "106p9wx4zdkz609kxsyk4zjdb0zvhnwihlnrqd1wh2p5ij7mv7vx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/knitting")
+    (synopsis "Produce knitting charts, in Plain TeX or LaTeX")
+    (description
+     "The package provides symbol fonts and commands to write charted
+instructions for cable and lace knitting patterns, using either plain TeX or
+LaTeX.  The fonts are available both as Metafont source and in Adobe Type
+1 format.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-qrcode
   (package
     (name "texlive-qrcode")
-- 
cgit 1.4.1


From 855a2219484e02f6d737d8d26465742ec222b804 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:36:36 +0200
Subject: gnu: Add texlive-knittingpattern.

* gnu/packages/tex.scm (texlive-knittingpattern): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8dab65394b..f8246e6234 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17696,6 +17696,27 @@ LaTeX.  The fonts are available both as Metafont source and in Adobe Type
 1 format.")
     (license license:lppl1.3+)))
 
+(define-public texlive-knittingpattern
+  (package
+    (name "texlive-knittingpattern")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/knittingpattern/"
+                   "tex/latex/knittingpattern/")
+             (base32
+              "0q52213yj08bhhgwr622ss3gwhx3l1yvgv0a2g3arhp3a8iq2g9a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/knittingpattern")
+    (synopsis "Create knitting patterns")
+    (description
+     "The class provides a simple, effective method for knitters to produce
+high-quality, attractive patterns using LaTeX.  It does this by providing
+commands to handle as much of the layout of the document as possible, leaving
+the author free to concentrate on the pattern.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-qrcode
   (package
     (name "texlive-qrcode")
-- 
cgit 1.4.1


From edffdd7056b570c69b7cc66836ef287e3e3a3478 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:36:49 +0200
Subject: gnu: Add texlive-ladder.

* gnu/packages/tex.scm (texlive-ladder): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f8246e6234..bd5070f17b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17717,6 +17717,24 @@ commands to handle as much of the layout of the document as possible, leaving
 the author free to concentrate on the pattern.")
     (license license:lppl1.3+)))
 
+(define-public texlive-ladder
+  (package
+    (name "texlive-ladder")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ladder/" "tex/latex/ladder/")
+             (base32
+              "0wm0c75g6k8pb9kqdbw7rmbhs9sjdq8pn01nsaxfv2zqxnbc1znz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ladder")
+    (synopsis "Draw simple ladder diagrams using TikZ")
+    (description
+     "This package permits the creation of simple ladder diagrams within LaTeX
+documents.")
+    (license license:expat)))
+
 (define-public texlive-qrcode
   (package
     (name "texlive-qrcode")
-- 
cgit 1.4.1


From c41f8e589832d954f4ca596f391627a4cce6790b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:40:05 +0200
Subject: gnu: Add texlive-lapdf.

* gnu/packages/tex.scm (texlive-lapdf): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bd5070f17b..b24aadcc60 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2373,6 +2373,29 @@ developments based on, or complementary to, the matter in his distribution
 directories.")
     (license license:public-domain)))
 
+(define-public texlive-lapdf
+  (package
+    (name "texlive-lapdf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lapdf/" "tex/latex/lapdf/")
+             (base32
+              "0rnwgb3fy8f4app543lx72f4rhc5c4kladnazkay9lr8hkfa8s4d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lapdf")
+    (synopsis "PDF drawing directly in TeX documents")
+    (description
+     "The package provides the means to use PDF drawing primitives to produce
+high quality, colored graphics.  It uses Bezier curves (integral and rational)
+from degree one to seven, allows TeX typesetting in the graphic, offers most
+of the standard math functions, allows plotting normal, parametric and polar
+functions.  The package has linear, logx, logy, logxy and polar grids with
+many specs; it can rotate, clip and do many nice things easily it has two
+looping commands for programming and many instructive example files.")
+    (license license:gpl3+)))
+
 (define-public texlive-latex-fonts
   (package
     (name "texlive-latex-fonts")
-- 
cgit 1.4.1


From 94f89931127fa07a2a12d01bfe4f44ff1c1c1641 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:41:43 +0200
Subject: gnu: Add texlive-latex-make.

* gnu/packages/tex.scm (texlive-latex-make): New variable.
---
 gnu/packages/tex.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b24aadcc60..dfdef2f907 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2422,6 +2422,42 @@ fonts.")
 
 (define-deprecated-package texlive-fonts-latex texlive-latex-fonts)
 
+(define-public texlive-latex-make
+  (package
+    (name "texlive-latex-make")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/latex-make/"
+                   "scripts/latex-make/"
+                   "source/support/latex-make/"
+                   "tex/latex/latex-make/")
+             (base32
+              "0ll6v1mdi1m5fp3s0c4dkgh351lg9ckzdfwz3k488y6cbcvrpm5x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (home-page "https://ctan.org/pkg/latex-make")
+    (synopsis "Easy compiling of complex (and simple) LaTeX documents")
+    (description
+     "This package provides several tools that aim to simplify the compilation
+of LaTeX documents:
+
+@itemize
+
+@item @file{LaTeX.mk}: a Makefile snippet to help compiling LaTeX documents in
+DVI, PDF, PS, ...  format.  Dependencies are automatically tracked: one should
+be able to compile documents with a one-line Makefile containing @samp{include
+LaTeX.mk}.  Complex documents (with multiple bibliographies, indexes,
+glossaries, ...)  should be correctly managed.
+
+@item @file{figlatex.sty}: a LaTeX package to easily insert Xfig figures.  It
+can interact with LaTeX.mk so that the latter automatically invokes
+@command{transfig} if needed.
+
+@end itemize")
+    (license license:gpl3+)))
+
 (define-public texlive-mflogo
   (package
     (name "texlive-mflogo")
-- 
cgit 1.4.1


From ef2d165645d3e161e596500e3e9a7e3beede4d9b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:42:02 +0200
Subject: gnu: Add texlive-liftarm.

* gnu/packages/tex.scm (texlive-liftarm): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dfdef2f907..e5b073fc9f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2458,6 +2458,25 @@ can interact with LaTeX.mk so that the latter automatically invokes
 @end itemize")
     (license license:gpl3+)))
 
+(define-public texlive-liftarm
+  (package
+    (name "texlive-liftarm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/liftarm/" "tex/latex/liftarm/")
+             (base32
+              "1dqi322kqlqbh4hli6nwm88nsg4dkr2fnrwi4i70gxyzxdh1mjj4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/liftarm")
+    (synopsis "Draw liftarms")
+    (description
+     "This package can be used to draw liftarms with TikZ.  It provides
+several options for the appearance of the liftarms, a command which connects
+two liftarms and an environment to describe a construction.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-mflogo
   (package
     (name "texlive-mflogo")
-- 
cgit 1.4.1


From 6963403a1c0cf2f9d2f8f31889c9cca05fa1ea23 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:42:17 +0200
Subject: gnu: Add texlive-lpic.

* gnu/packages/tex.scm (texlive-lpic): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e5b073fc9f..cc4f121104 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2477,6 +2477,30 @@ several options for the appearance of the liftarms, a command which connects
 two liftarms and an environment to describe a construction.")
     (license license:lppl1.3+)))
 
+(define-public texlive-lpic
+  (package
+    (name "texlive-lpic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lpic/" "tex/latex/lpic/")
+             (base32
+              "15jzvpn3gnj5c0wachbsjazll9qlibyzxf4i2g8ad7l4yd967m3c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lpic")
+    (synopsis "Put LaTeX material over included graphics")
+    (description
+     "The package defines a convenient interface to put any LaTeX material on
+top of included graphics.  The LaTeX material may also be rotated and typeset
+on top of a white box overshadowing the graphics.  The coordinates of the
+LaTeX boxes are given relative to the original, unscaled graphics; when the
+graphics is rescaled, the LaTeX annotations stay at their right places (unless
+you do something extreme).  In a draft mode, the package enables you to draw
+a coordinate grid over the picture for easy adjustment of positions of the
+annotations.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-mflogo
   (package
     (name "texlive-mflogo")
-- 
cgit 1.4.1


From 605f03c900f479deb623a43408da932b799f9448 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:43:28 +0200
Subject: gnu: Add texlive-lroundrect.

* gnu/packages/tex.scm (texlive-lroundrect): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cc4f121104..7348a93fd1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2501,6 +2501,28 @@ a coordinate grid over the picture for easy adjustment of positions of the
 annotations.")
     (license license:lppl1.3+)))
 
+(define-public texlive-lroundrect
+  (package
+    (name "texlive-lroundrect")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lroundrect/"
+                   "source/latex/lroundrect/"
+                   "tex/latex/lroundrect/")
+             (base32
+              "1yjfg9z0s8drij13fdhii1r9j9i57c112iv2q0airndycm6y8wsg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lroundrect")
+    (synopsis "LaTeX macros for using the @code{roundrect} MetaPost routines")
+    (description
+     "This LaTeX package provides ways to use the extremely configurable
+rounded rectangles of the @code{roundrect} MetaPost package with LaTeX.  It is
+chiefly useful for examples, but also has macros for particular types of boxes
+which are useful on their own.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-mflogo
   (package
     (name "texlive-mflogo")
-- 
cgit 1.4.1


From 2ed97a41ca668ded9c2cffd6cc205dcc41e19210 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:43:52 +0200
Subject: gnu: Add texlive-luamesh.

* gnu/packages/tex.scm (texlive-luamesh): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7348a93fd1..c3281dcbaf 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2523,6 +2523,29 @@ chiefly useful for examples, but also has macros for particular types of boxes
 which are useful on their own.")
     (license license:lppl1.3+)))
 
+(define-public texlive-luamesh
+  (package
+    (name "texlive-luamesh")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luamesh/" "metapost/luamesh/"
+                   "scripts/luamesh/" "tex/lualatex/luamesh/")
+             (base32
+              "02qq6d51pihkxz4zbcxppikkzpr99mw8kmp64gm986fpcn6k2wns")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luamesh")
+    (synopsis "Computes and draws 2D Delaunay triangulation")
+    (description
+     "The package allows to compute and draw 2D Delaunay triangulation.
+The algorithm is written with Lua, and depending upon the choice of the
+engine, the drawing is done by MetaPost (with @code{luamplib}) or by TikZ.
+The Delaunay triangulation algorithm is the Bowyer and Watson algorithm.
+Several macros are provided to draw the global mesh, the set of points, or
+a particular step of the algorithm.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-mflogo
   (package
     (name "texlive-mflogo")
-- 
cgit 1.4.1


From 1b82fc636da96bc1918e698e442b818e26a2a9cd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 00:44:37 +0200
Subject: gnu: Add texlive-luasseq.

* gnu/packages/tex.scm (texlive-luasseq): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c3281dcbaf..1a6fe5ae8c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2546,6 +2546,27 @@ Several macros are provided to draw the global mesh, the set of points, or
 a particular step of the algorithm.")
     (license license:lppl1.3+)))
 
+(define-public texlive-luasseq
+  (package
+    (name "texlive-luasseq")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luasseq/" "scripts/luasseq/"
+                   "source/lualatex/luasseq/"
+                   "tex/lualatex/luasseq/")
+             (base32
+              "1mkhzysyhpbblpwwy4d4983b5np23jnxl9ai986g0n1vpyv0kc47")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luasseq")
+    (synopsis "Drawing spectral sequences in LuaLaTeX")
+    (description
+     "The package is an update of the author's @code{sseq} package, for use
+with LuaLaTeX.  This version uses less memory, and operates faster than the
+original; it also offers several enhancements.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-mflogo
   (package
     (name "texlive-mflogo")
-- 
cgit 1.4.1


From a8a9039f6ea62900c973e0298cedef9322e0a307 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:04:06 +0200
Subject: gnu: Add texlive-maker.

* gnu/packages/tex.scm (texlive-maker): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1a6fe5ae8c..9e34dc388f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2567,6 +2567,27 @@ with LuaLaTeX.  This version uses less memory, and operates faster than the
 original; it also offers several enhancements.")
     (license license:lppl1.3+)))
 
+(define-public texlive-maker
+  (package
+    (name "texlive-maker")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/maker/" "tex/latex/maker/")
+             (base32
+              "08shs5fah2yfdgsydk93jfb1sz42qckal2p031vs95vqd8rpq11g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/maker")
+    (synopsis "Include Arduino or Processing code in LaTeX documents")
+    (description
+     "The first version of the package allows to include Arduino or Processing
+code using three different forms: writing the code directly in the LaTeX
+document, writing Arduino or Processing commands in line with the text,
+calling to Arduino or Processing files.  All these options support the syntax
+highlighting of the official IDE.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-mflogo
   (package
     (name "texlive-mflogo")
-- 
cgit 1.4.1


From b696bb1cde6aa0d401d8a18268a023d37e04f6f2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:04:38 +0200
Subject: gnu: Add texlive-makeshape.

* gnu/packages/tex.scm (texlive-makeshape): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9e34dc388f..632d89eb4c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2588,6 +2588,28 @@ calling to Arduino or Processing files.  All these options support the syntax
 highlighting of the official IDE.")
     (license license:lppl1.3c)))
 
+(define-public texlive-makeshape
+  (package
+    (name "texlive-makeshape")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/makeshape/"
+                   "source/latex/makeshape/"
+                   "tex/latex/makeshape/")
+             (base32
+              "1mc7qxqs87f87s4rzdd7fqy44sxc9a6imz62kqmigfap2kjwnflb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/makeshape")
+    (synopsis "Declare new PGF shapes")
+    (description
+     "The package simplifies production of custom shapes with correct anchor
+borders, in PGF/TikZ; the only requirement is a PGF path describing the anchor
+border.  The package also provides macros that help with the management of
+shape parameters, and the definition of anchor points.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-mflogo
   (package
     (name "texlive-mflogo")
-- 
cgit 1.4.1


From 2fa0ec238c2cd79aa025f2cd54616ff5315050b0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:05:31 +0200
Subject: gnu: Add texlive-mathspic.

* gnu/packages/tex.scm (texlive-mathspic): New variable.
---
 gnu/packages/tex.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 632d89eb4c..a116032cc6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2610,6 +2610,38 @@ border.  The package also provides macros that help with the management of
 shape parameters, and the definition of anchor points.")
     (license license:lppl1.3+)))
 
+(define-public texlive-mathspic
+  (package
+    (name "texlive-mathspic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mathspic/"
+                   "doc/man/man1/mathspic.1"
+                   "doc/man/man1/mathspic.man1.pdf"
+                   "scripts/mathspic/" "tex/latex/mathspic/")
+             (base32
+              "0rlcskfvpl4niv680v8fgfpfxkrhfavmm8431ffp3vjjbqrhv7xr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts #~(list "mathspic.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/mathspic")
+    (synopsis "Perl filter program for use with PiCTeX")
+    (description
+     "MathsPIC (Perl) is a development of the earlier MathsPIC (DOS) program,
+now implemented as a Perl script, being much more portable than the earlier
+program.  MathsPIC parses a plain text input file and generates a plain text
+output-file containing commands for drawing a diagram.  It produces output
+containing PiCTeX and (La)TeX commands, which may then be processed by plain
+TeX or LaTeX in the usual way.  MathsPIC also outputs a comprehensive log
+file.  MathsPIC facilitates creating figures using PiCTeX by providing an
+environment for manipulating named points and also allows the use of variables
+and maths (advance, multiply, and divide)---in short---it takes the pain out
+of PiCTeX.")
+    (license license:lppl)))
+
 (define-public texlive-mflogo
   (package
     (name "texlive-mflogo")
-- 
cgit 1.4.1


From 8205ada12ef7e6568d758a89f969cc913c77b931 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:05:47 +0200
Subject: gnu: Add texlive-mercatormap.

* gnu/packages/tex.scm (texlive-mercatormap): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a116032cc6..a9d9d9d47f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2642,6 +2642,30 @@ and maths (advance, multiply, and divide)---in short---it takes the pain out
 of PiCTeX.")
     (license license:lppl)))
 
+(define-public texlive-mercatormap
+  (package
+    (name "texlive-mercatormap")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mercatormap/"
+                   "tex/latex/mercatormap/")
+             (base32
+              "11kcwzly8m8wqyppymanpvgabyjl1w33xzsy43sb5p4xv8fdaa5j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mercatormap")
+    (synopsis
+     "Spherical Mercator coordinate systems and Web Mercator tile integration")
+    (description
+     "This package extends TikZ with tools to create map graphics.  The
+provided coordinate system relies on the Web Mercator projection used on the
+Web by OpenStreetMap and others.  The package supports the seamless
+integration of graphics from public map tile servers by a Python script.
+Also, common map elements like markers, geodetic networks, bar scales, routes,
+orthodrome pieces, and more are part of the package.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-mflogo
   (package
     (name "texlive-mflogo")
-- 
cgit 1.4.1


From c7a31936db6333c08ea032177819eb4201bc23b6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:08:48 +0200
Subject: gnu: Add texlive-milsymb.

* gnu/packages/tex.scm (texlive-milsymb): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a9d9d9d47f..63c66c8a36 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2748,6 +2748,27 @@ Taco Hoekwater.")
 processing the output of Metafont.")
     (license license:public-domain)))
 
+(define-public texlive-milsymb
+  (package
+    (name "texlive-milsymb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/milsymb/" "tex/latex/milsymb/")
+             (base32
+              "0bzrgnk934alp51j1qy4c73kkr4jv0bjq5fv50dm1bl22m9h3s17")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/milsymb")
+    (synopsis "TikZ-based drawing of military symbols")
+    (description
+     "The package offers commands to draw military symbols as per
+@url{https://www.awl.edu.pl/images/en/APP_6_C.pdf, NATO APP-6(C)}.  It has
+a set of commands for drawing all symbols found in the document up to the
+control measures, as well as support for custom non-standard symbols.  Control
+measures are planned to be included in a future release.")
+    (license license:cc-by-sa4.0)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 9c53c8771a85e84686f5cdff3d2cd8600d78cf93 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:09:07 +0200
Subject: gnu: Add texlive-miniplot.

* gnu/packages/tex.scm (texlive-miniplot): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 63c66c8a36..75704b6633 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2769,6 +2769,29 @@ control measures, as well as support for custom non-standard symbols.  Control
 measures are planned to be included in a future release.")
     (license license:cc-by-sa4.0)))
 
+(define-public texlive-miniplot
+  (package
+    (name "texlive-miniplot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/miniplot/" "tex/latex/miniplot/")
+             (base32
+              "0k98mfd4bf43br74wyjqjlwb93yzi2b5r53jsrsr58p6lg59c200")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/miniplot")
+    (synopsis "Package for easy figure arrangement")
+    (description
+     "MiniPlot is a package to help the LaTeX user typeset EPS figures using
+an easy-to-use interface.  Figures can be arranged as one-figure-only or as
+a collection of figures in columns and rows which can itself contain
+sub-figures in columns and rows.  Wrapped figures are also supported.  This
+package provides commands to display a framebox instead of the figure as the
+graphics package does already but additionally it writes useful information
+such as the label and scaling factor into these boxes.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 76118a35f92e0ee99c570efa2a8e7833fd1dd2fa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:10:26 +0200
Subject: gnu: Add texlive-mkpic.

* gnu/packages/tex.scm (texlive-mkpic): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 75704b6633..9b82c236ae 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2792,6 +2792,29 @@ graphics package does already but additionally it writes useful information
 such as the label and scaling factor into these boxes.")
     (license license:lppl)))
 
+(define-public texlive-mkpic
+  (package
+    (name "texlive-mkpic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/mkpic/" "scripts/mkpic/")
+             (base32
+              "1a8jzsgw63siirifpsvwjmfbj68fv58hnn5vrv737i9vbjrv0vm7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "mkpic")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/mkpic")
+    (synopsis "Perl interface to @code{mfpic}")
+    (description
+     "@code{mkpic} provides an easy interface for making small pictures with
+@code{mfpic}.  To this end you create an input file consisting of commands,
+one per line, with space separated parameters (or you modify the DATA section
+of the @code{mkpic} script, which is used if you run it without an input
+file).")
+    (license license:gpl3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From f5d1c7445338bf588b685a10bbd27c6469f0e7a3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:10:41 +0200
Subject: gnu: Add texlive-modiagram.

* gnu/packages/tex.scm (texlive-modiagram): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9b82c236ae..20744d4c00 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2815,6 +2815,25 @@ of the @code{mkpic} script, which is used if you run it without an input
 file).")
     (license license:gpl3+)))
 
+(define-public texlive-modiagram
+  (package
+    (name "texlive-modiagram")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/modiagram/"
+                   "tex/latex/modiagram/")
+             (base32
+              "0817c3yj5q4srbl29kqw16cg3c6gwr9ahy33hyicqbqap034fnyd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/modiagram")
+    (synopsis "Drawing molecular orbital diagrams")
+    (description
+     "The package provides an environment MOdiagram and some commands, to
+create molecular orbital diagrams using TikZ.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 6e883a925faf3f4062f7f0c7001ec8cb65a6177d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:10:56 +0200
Subject: gnu: Add texlive-neuralnetwork.

* gnu/packages/tex.scm (texlive-neuralnetwork): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 20744d4c00..1763967926 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2834,6 +2834,25 @@ file).")
 create molecular orbital diagrams using TikZ.")
     (license license:lppl1.3c)))
 
+(define-public texlive-neuralnetwork
+  (package
+    (name "texlive-neuralnetwork")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/neuralnetwork/examples/"
+                   "tex/latex/neuralnetwork/")
+             (base32
+              "11k0hwg1mx52mrp7csp93m4rvv22vq91l4ij1ylgbw9flh189p8x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/neuralnetwork")
+    (synopsis "Graph-drawing for neural networks")
+    (description
+     "The package provides facilities for graph-drawing, with facilities
+designed for neural network diagrams.")
+    (license license:gpl3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 2586840d5fefbe3436813cd497d704fb415f6d15 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:11:09 +0200
Subject: gnu: Add texlive-nl-interval.

* gnu/packages/tex.scm (texlive-nl-interval): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1763967926..bd0f9c72f6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2853,6 +2853,25 @@ create molecular orbital diagrams using TikZ.")
 designed for neural network diagrams.")
     (license license:gpl3+)))
 
+(define-public texlive-nl-interval
+  (package
+    (name "texlive-nl-interval")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/nl-interval/"
+                   "tex/latex/nl-interval/")
+             (base32
+              "0n11a26d48jr6lngfc128fpvahdnbvnlxz9kxp7hirl0cm8ssiwa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nl-interval")
+    (synopsis "Represent intervals on the number line")
+    (description
+     "This package provides macros to simplify the process of representing
+intervals on the number line.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 46b9175c2f99a69328765c776c7844ed73d3a8cc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:11:21 +0200
Subject: gnu: Add texlive-nndraw.

* gnu/packages/tex.scm (texlive-nndraw): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bd0f9c72f6..07e43054f7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2872,6 +2872,25 @@ designed for neural network diagrams.")
 intervals on the number line.")
     (license license:lppl1.3c)))
 
+(define-public texlive-nndraw
+  (package
+    (name "texlive-nndraw")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/nndraw/" "source/latex/nndraw/"
+                   "tex/latex/nndraw/")
+             (base32
+              "08mhl61b2fzsnfz6ldrlz9m5s37w2c4wml8gpd2f4wc9rjag68l4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nndraw")
+    (synopsis "Draw neural networks")
+    (description
+     "With this package you can create fully connected neural networks in
+a simple and efficient way.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 3c901873a2e6a82d628cf2c1f2275e2645cdb5c0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:11:47 +0200
Subject: gnu: Add texlive-numericplots.

* gnu/packages/tex.scm (texlive-numericplots): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 07e43054f7..1b1cd0db41 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2891,6 +2891,27 @@ intervals on the number line.")
 a simple and efficient way.")
     (license license:lppl1.3+)))
 
+(define-public texlive-numericplots
+  (package
+    (name "texlive-numericplots")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin name version
+                            (list "doc/latex/numericplots/"
+                                  "tex/latex/numericplots/")
+                            (base32
+                             "187h4q35s2asfgv9zxw992316v37p5nnvphjylnxfvygxci36lwg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/numericplots")
+    (synopsis "Plot numeric data (including Matlab export) using PSTricks")
+    (description
+     "Plotting numeric data is a task which has often to be done for
+scientific papers.  LaTeX itself provides no facilities for drawing more than
+the simplest plots from supplied data.  The package will process user input,
+and uses PSTricks to plot the results.  The package provides Matlab functions
+to transform Matlab results to plottable data.")
+    (license license:gpl3)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From beaabbc39bf5e1a5cae13794df4317448542bc3d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:12:10 +0200
Subject: gnu: Add texlive-outilsgeomtikz.

* gnu/packages/tex.scm (texlive-outilsgeomtikz): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1b1cd0db41..fbab581e91 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2912,6 +2912,26 @@ and uses PSTricks to plot the results.  The package provides Matlab functions
 to transform Matlab results to plottable data.")
     (license license:gpl3)))
 
+(define-public texlive-outilsgeomtikz
+  (package
+    (name "texlive-outilsgeomtikz")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/outilsgeomtikz/"
+                   "tex/latex/outilsgeomtikz/")
+             (base32
+              "0zk47dlz9jl2xk0q1sfnd6f57iww8qaq5wd0l1k23pci86x4nv6a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/outilsgeomtikz")
+    (synopsis "Some geometric tools, with TikZ")
+    (description
+     "This package provides some commands, with French keys, to display
+geometric tools using TikZ, for example a pen, a compass, a rule, a square, or
+a protractor.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 8d9ee9a5962e096ef08e28c542b321457c1ad25b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:12:23 +0200
Subject: gnu: Add texlive-pb-diagram.

* gnu/packages/tex.scm (texlive-pb-diagram): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fbab581e91..08c720493c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2932,6 +2932,26 @@ geometric tools using TikZ, for example a pen, a compass, a rule, a square, or
 a protractor.")
     (license license:lppl1.3c)))
 
+(define-public texlive-pb-diagram
+  (package
+    (name "texlive-pb-diagram")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pb-diagram/"
+                   "tex/latex/pb-diagram/")
+             (base32
+              "1g790ykz0xq01d8zmy6llr33imh42dy51700c9z49xga4dvnyqlv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pb-diagram")
+    (synopsis "Commutative diagram package using LAMSTeX or Xy-pic fonts")
+    (description
+     "The package provides a @code{diagram} environment.  This allows the
+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-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 071994bbf177c4e076aba6368813af66c8b2da36 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:12:37 +0200
Subject: gnu: Add texlive-penrose.

* gnu/packages/tex.scm (texlive-penrose): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 08c720493c..3c4296b2b3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2952,6 +2952,29 @@ 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-penrose
+  (package
+    (name "texlive-penrose")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/penrose/" "source/latex/penrose/"
+                   "tex/latex/penrose/")
+             (base32
+              "0vdbyvprb75if93lx138v2li2ijylbs8w8787dwk2pys5pp7s4ql")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/penrose")
+    (synopsis "TikZ library for producing Penrose tilings")
+    (description
+     "This package provides a TikZ library for drawing Penrose tiles.  It
+currently supports the kite/dart, rhombus, and pentagon tile sets.  There are
+two main methods for their placement: one that automatically generates
+a tiling, and one that allows for manual placement.  Furthermore, the tiles
+themselves can be deformed and will still (hopefully!) fit together in the
+correct fashion.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 2e669a39bf8fb94509c3087a136e99d3a33f366f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:12:51 +0200
Subject: gnu: Add texlive-petri-nets.

* gnu/packages/tex.scm (texlive-petri-nets): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3c4296b2b3..4f082d0681 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2975,6 +2975,30 @@ themselves can be deformed and will still (hopefully!) fit together in the
 correct fashion.")
     (license license:lppl1.3c)))
 
+(define-public texlive-petri-nets
+  (package
+    (name "texlive-petri-nets")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/petri-nets/"
+                   "scripts/petri-nets/"
+                   "tex/generic/petri-nets/")
+             (base32
+              "0m6qmahbw1q5vs63mr30kf75di86drhi8z3a8p7yn9n524jn435c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "pn2pdf")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/petri-nets")
+    (synopsis "Set TeX/LaTeX packages for drawing Petri nets")
+    (description
+     "Petri-nets offers a set of TeX/LaTeX packages about Petri nets and
+related models.  Three packages are available: the first allows the user to
+draw Petri-nets in PostScript documents; the second defines macros related to
+PBC, M-nets and B(PN) models; and a third that combines the other two.")
+    (license license:gpl3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 1f43ad80de835ac31ffa768335ef5028301f1d9b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:13:11 +0200
Subject: gnu: Add texlive-pgf-blur.

* gnu/packages/tex.scm (texlive-pgf-blur): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4f082d0681..f2124c569a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2999,6 +2999,26 @@ draw Petri-nets in PostScript documents; the second defines macros related to
 PBC, M-nets and B(PN) models; and a third that combines the other two.")
     (license license:gpl3+)))
 
+(define-public texlive-pgf-blur
+  (package
+    (name "texlive-pgf-blur")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgf-blur/"
+                   "source/latex/pgf-blur/"
+                   "tex/latex/pgf-blur/")
+             (base32
+              "1lsndflhx56gawqkcyjyh8pll986m7msraq5qr1asppybf4m0hij")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pgf-blur")
+    (synopsis "PGF/TikZ package for blurred shadows")
+    (description
+     "The package adds blurred/faded/fuzzy shadows to PGF/TikZ pictures.
+It is configured as a TikZ/PGF library module.")
+    (license (list license:lppl license:public-domain))))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From dd19424bfac7e8edd650d6d0dd7966c2aedc9127 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:13:26 +0200
Subject: gnu: Add texlive-pgf-interference.

* gnu/packages/tex.scm (texlive-pgf-interference): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f2124c569a..825a193d1d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3019,6 +3019,26 @@ PBC, M-nets and B(PN) models; and a third that combines the other two.")
 It is configured as a TikZ/PGF library module.")
     (license (list license:lppl license:public-domain))))
 
+(define-public texlive-pgf-interference
+  (package
+    (name "texlive-pgf-interference")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgf-interference/"
+                   "tex/latex/pgf-interference/")
+             (base32
+              "1aa741h358iwn0zd25y3wsr4mr1q2fia1mrfqrbz6p00fvv0rgv5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pgf-interference")
+    (synopsis "Drawing interference patterns with PGF/TikZ")
+    (description
+     "This LaTeX package makes it possible to simulate interference patterns
+occuring on a screen if monochromatic light is diffracted at regular
+structures of slits.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From af641cd459125d066f66365ddc05ae7fb37f0f5f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:13:59 +0200
Subject: gnu: Add texlive-pgf-periodictable.

* gnu/packages/tex.scm (texlive-pgf-periodictable): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 825a193d1d..5985548fd4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3039,6 +3039,29 @@ occuring on a screen if monochromatic light is diffracted at regular
 structures of slits.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pgf-periodictable
+  (package
+    (name "texlive-pgf-periodictable")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgf-periodictable/"
+                   "tex/latex/pgf-periodictable/flags/"
+                   "tex/latex/pgf-periodictable/lattice/"
+                   "tex/latex/pgf-periodictable/spectra/")
+             (base32
+              "0jxl52m4ik710n14crr6b2ymgnl58asw78mb0p5vdz21r6qgb11n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pgf-periodictable")
+    (synopsis "Create custom periodic tables of elements")
+    (description
+     "The purpose of this package is to provide the periodic table of elements
+in a simple way.  It relies on PGF/TikZ to offer a full or partial periodic
+table with a variety of options and displaying the desired data for all the
+118 elements.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From d601f80d25aaa017c3e78e0fd7a669be0e57ace8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:14:16 +0200
Subject: gnu: Add texlive-pgf-pie.

* gnu/packages/tex.scm (texlive-pgf-pie): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5985548fd4..2618bb06b8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3062,6 +3062,25 @@ table with a variety of options and displaying the desired data for all the
 118 elements.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pgf-pie
+  (package
+    (name "texlive-pgf-pie")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgf-pie/" "tex/latex/pgf-pie/")
+             (base32
+              "1nvg61v9pzc0mqs8m818ixi8rmw2wv3h7s17shjc7mcdqkp7k1qq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-carlisle texlive-latex texlive-pgf))
+    (home-page "https://ctan.org/pkg/pgf-pie")
+    (synopsis "Draw pie charts, using PGF")
+    (description
+     "The package provides the means to draw pie (and variant) charts,
+using PGF/TikZ.")
+    (license (list license:gpl2 license:lppl1.3c))))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 48d7613bdca8a1b552f5aec4eb6f0a277bd33267 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:14:31 +0200
Subject: gnu: Add texlive-pgf-soroban.

* gnu/packages/tex.scm (texlive-pgf-soroban): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2618bb06b8..72717bdb95 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3081,6 +3081,25 @@ table with a variety of options and displaying the desired data for all the
 using PGF/TikZ.")
     (license (list license:gpl2 license:lppl1.3c))))
 
+(define-public texlive-pgf-soroban
+  (package
+    (name "texlive-pgf-soroban")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgf-soroban/"
+                   "tex/latex/pgf-soroban/")
+             (base32
+              "1vcycmd5a3z6p9glbgw4lsxs0zv0lidvs240i18kv8s39yx6f88r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pgf-soroban")
+    (synopsis "Create images of the soroban using TikZ/PGF")
+    (description
+     "The package makes it possible to create pictures of the
+soroban (Japanese abacus) using PGF/TikZ.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From da5e05d8ecfd6ebb1fe2e507030218037f307877 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:14:47 +0200
Subject: gnu: Add texlive-pgf-spectra.

* gnu/packages/tex.scm (texlive-pgf-spectra): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 72717bdb95..66e6d99b9f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3100,6 +3100,28 @@ using PGF/TikZ.")
 soroban (Japanese abacus) using PGF/TikZ.")
     (license license:lppl)))
 
+(define-public texlive-pgf-spectra
+  (package
+    (name "texlive-pgf-spectra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgf-spectra/"
+                   "tex/latex/pgf-spectra/")
+             (base32
+              "03jci0jc5ryzkp6930hn1l4awjrw9y1xwc3f327igccj78w24pnb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pgf-spectra")
+    (synopsis "Draw continuous or discrete spectra using PGF/TikZ")
+    (description
+     "The purpose of this package is to draw the spectra of elements in
+a simple way.  It relies on PGF/TikZ for drawing the desired spectrum,
+continuous or discrete.  There are data available for the spectra of 98
+elements and their ions (from the NASA database and from NIST).  It also
+allows the user to draw spectra using their own data.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From e9a9491a07ec2cf111f73105bad49a494c4a74b2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:15:56 +0200
Subject: gnu: Add texlive-pgf-umlcd.

* gnu/packages/tex.scm (texlive-pgf-umlcd): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 66e6d99b9f..30c21aa296 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3122,6 +3122,25 @@ elements and their ions (from the NASA database and from NIST).  It also
 allows the user to draw spectra using their own data.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pgf-umlcd
+  (package
+    (name "texlive-pgf-umlcd")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgf-umlcd/"
+                   "tex/latex/pgf-umlcd/")
+             (base32
+              "14zx2jms616qfzwqbgixz0pd3qzjzr2bxr6ahhy7mgj3i7rlbr8r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-latex texlive-pgf))
+    (home-page "https://ctan.org/pkg/pgf-umlcd")
+    (synopsis "Some LaTeX macros for UML class diagrams")
+    (description
+     "This package provides some LaTeX macros for UML class diagrams.")
+    (license (list license:gpl2 license:lppl1.3c))))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 8b2b7bd23975c1ea7be99ea247e58478e95f9370 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:16:17 +0200
Subject: gnu: Add texlive-pgf-umlsd.

* gnu/packages/tex.scm (texlive-pgf-umlsd): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 30c21aa296..c93cafa478 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3141,6 +3141,25 @@ allows the user to draw spectra using their own data.")
      "This package provides some LaTeX macros for UML class diagrams.")
     (license (list license:gpl2 license:lppl1.3c))))
 
+(define-public texlive-pgf-umlsd
+  (package
+    (name "texlive-pgf-umlsd")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgf-umlsd/"
+                   "tex/latex/pgf-umlsd/")
+             (base32
+              "1bw23gm9x6ijhn3h0q7af0n9wxnc3ixfjc23v8x49s80gh96gmqg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-latex texlive-pgf))
+    (home-page "https://ctan.org/pkg/pgf-umlsd")
+    (synopsis "Draw UML sequence diagrams")
+    (description
+     "This package provides LaTeX macros to draw UML diagrams using PGF.")
+    (license license:gpl3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From e59e60e7d107d95654580e91e64c852e1dcdca0e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:16:58 +0200
Subject: gnu: Add texlive-pgfkeyx.

* gnu/packages/tex.scm (texlive-pgfkeyx): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c93cafa478..7e768088ac 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3160,6 +3160,27 @@ allows the user to draw spectra using their own data.")
      "This package provides LaTeX macros to draw UML diagrams using PGF.")
     (license license:gpl3+)))
 
+(define-public texlive-pgfkeyx
+  (package
+    (name "texlive-pgfkeyx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgfkeyx/" "tex/latex/pgfkeyx/")
+             (base32
+              "0g5wvhlyfplv0fd0nsxpw3al9wmk0hw0pjvyyplh1vzdk5rr3xzq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pgfkeyx")
+    (synopsis "Extended and more robust version of @code{pgfkeys}")
+    (description
+     "The package extends and improves the robustness of the @code{pgfkeys}
+package.  In particular, it can deal with active comma, equality sign, and
+slash in key parsing.  The difficulty with active characters has long been
+a problem with the @code{pgfkeys} package.  The package also introduces
+handlers beyond those that @code{pgfkeys} can offer.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 71e96b62f3125cbafdd1680bd346e6c2d02ef9d2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:17:11 +0200
Subject: gnu: Add texlive-pgfmolbio.

* gnu/packages/tex.scm (texlive-pgfmolbio): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7e768088ac..268990cfc0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3181,6 +3181,28 @@ a problem with the @code{pgfkeys} package.  The package also introduces
 handlers beyond those that @code{pgfkeys} can offer.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pgfmolbio
+  (package
+    (name "texlive-pgfmolbio")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/pgfmolbio/"
+                   "scripts/pgfmolbio/"
+                   "source/lualatex/pgfmolbio/"
+                   "tex/lualatex/pgfmolbio/")
+             (base32
+              "12kajg7jrhd612lk7m6gwadxb5y7v9znqjlg1n3n05zwrmfd54w1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pgfmolbio")
+    (synopsis "Draw graphs typically found in molecular biology texts")
+    (description
+     "The package draws graphs typically found in molecular biology texts.
+Currently, the package contains modules for drawing DNA sequencing
+chromatograms and protein domain diagrams.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From f5993cfec7768933810bf0be99f82bb126f0c419 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:17:26 +0200
Subject: gnu: Add texlive-pgfmorepages.

* gnu/packages/tex.scm (texlive-pgfmorepages): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 268990cfc0..8cc638cfdb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3203,6 +3203,27 @@ Currently, the package contains modules for drawing DNA sequencing
 chromatograms and protein domain diagrams.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pgfmorepages
+  (package
+    (name "texlive-pgfmorepages")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgfmorepages/"
+                   "tex/latex/pgfmorepages/")
+             (base32
+              "0k0njkw34ql0vlpmay155rr4v0sszizhh1pixy20npbk26dkzljw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pgfmorepages")
+    (synopsis "Assemble multiple logical pages onto a physical page")
+    (description
+     "This package replaces and extends the @code{pgfpages} sub-package of the
+PGF system.  It provides the capability to arrange multiple logical pages on
+multiple physical pages, for example as for arranging pages to make
+booklets.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 1b44c450c4ef01346335d58efc4a65fad044d312 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:17:51 +0200
Subject: gnu: Add texlive-pgfornament.

* gnu/packages/tex.scm (texlive-pgfornament): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8cc638cfdb..b5432616c1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3224,6 +3224,28 @@ multiple physical pages, for example as for arranging pages to make
 booklets.")
     (license license:lppl1.3c)))
 
+(define-public texlive-pgfornament
+  (package
+    (name "texlive-pgfornament")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgfornament/"
+                   "tex/generic/pgfornament/am/"
+                   "tex/generic/pgfornament/pgfhan/"
+                   "tex/generic/pgfornament/vectorian/"
+                   "tex/latex/pgfornament/")
+             (base32
+              "02fmyyp1hgasa8k6v0nkdvdmqfbiscyyk3hpqg63b5956ksgap21")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pgfornament")
+    (synopsis "Drawing of vectorian ornaments with PGF/TikZ")
+    (description
+     "This package allows the drawing of vectorian ornaments (196) with
+PGF/TikZ.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From a39c6b74400df93f8318583e6b15c9a4bb9d127d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:18:20 +0200
Subject: gnu: Add texlive-pgfplots.

* gnu/packages/tex.scm (texlive-pgfplots): New variable.
---
 gnu/packages/tex.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b5432616c1..f0ad3c2a24 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3246,6 +3246,40 @@ booklets.")
 PGF/TikZ.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pgfplots
+  (package
+    (name "texlive-pgfplots")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/context/third/pgfplots/"
+                   "doc/generic/pgfplots/"
+                   "doc/latex/pgfplots/"
+                   "doc/plain/pgfplots/"
+                   "scripts/pgfplots/"
+                   "source/context/third/pgfplots/"
+                   "source/latex/pgfplots/"
+                   "tex/context/third/pgfplots/"
+                   "tex/generic/pgfplots/"
+                   "tex/latex/pgfplots/"
+                   "tex/plain/pgfplots/")
+             (base32
+              "1c0gah7ia61s435zlyq4ay9snkrs2xcs627wky7c0sp8mgxyybwr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-pgf))
+    (home-page "https://ctan.org/pkg/pgfplots")
+    (synopsis "Create normal/logarithmic plots in two and three dimensions")
+    (description
+     "PGFPlots draws high-quality function plots in normal or logarithmic
+scaling with a user-friendly interface directly in TeX.  The user supplies
+axis labels, legend entries and the plot coordinates for one or more plots and
+PGFPlots applies axis scaling, computes any logarithms and axis ticks and
+draws the plots, supporting line plots, scatter plots, piecewise constant
+plots, bar plots, area plots, mesh-- and surface plots and some more.
+PGFPlots is based on PGF/TikZ (PGF); it runs equally for LaTeX/TeX/ConTeXt.")
+    (license license:gpl3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 9c23a7ca6241830177906c4f6497ddb617fefa93 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:18:43 +0200
Subject: gnu: Add texlive-picinpar.

* gnu/packages/tex.scm (texlive-picinpar): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f0ad3c2a24..336c6e01b6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3280,6 +3280,26 @@ plots, bar plots, area plots, mesh-- and surface plots and some more.
 PGFPlots is based on PGF/TikZ (PGF); it runs equally for LaTeX/TeX/ConTeXt.")
     (license license:gpl3+)))
 
+(define-public texlive-picinpar
+  (package
+    (name "texlive-picinpar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/picinpar/" "tex/latex/picinpar/")
+             (base32
+              "1s6ymq4zg0wl6pfx34shansv3y1qlh6h3q58a97zpz5x21n1a5pq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/picinpar")
+    (synopsis "Insert pictures into paragraphs")
+    (description
+     "This package provides a legacy package for creating windows in
+paragraphs, for inserting graphics, etc.  Users should note that Pieter van
+Oostrum (in a published review of packages of this sort) does not recommend
+this package; Picins is recommended instead.")
+    (license license:gpl3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From f32be4aa97eae58923c1613e88610e044a080207 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:18:55 +0200
Subject: gnu: Add texlive-pictex.

* gnu/packages/tex.scm (texlive-pictex): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 336c6e01b6..3b447f1df4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3300,6 +3300,26 @@ Oostrum (in a published review of packages of this sort) does not recommend
 this package; Picins is recommended instead.")
     (license license:gpl3+)))
 
+(define-public texlive-pictex
+  (package
+    (name "texlive-pictex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pictex/" "tex/generic/pictex/")
+             (base32
+              "1wwlh9d7b3gsk3f29d6vk0ic7nnvc533jfg2z019vsf6pin9qvgv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pictex")
+    (synopsis "Picture drawing macros for TeX and LaTeX")
+    (description
+     "PicTeX is an early and very comprehensive drawing package that mostly
+draws by placing myriads of small dots to make up pictures.  It has a tendency
+to run out of space; packages @code{m-pictex} and @code{pictexwd} deal with
+the problems in different ways.")
+    (license license:lppl1.0+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From b37e07414b53150417ff243fd87dd2357ee56e3e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:19:08 +0200
Subject: gnu: Add texlive-pictex2.

* gnu/packages/tex.scm (texlive-pictex2): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3b447f1df4..83cef56957 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3320,6 +3320,26 @@ to run out of space; packages @code{m-pictex} and @code{pictexwd} deal with
 the problems in different ways.")
     (license license:lppl1.0+)))
 
+(define-public texlive-pictex2
+  (package
+    (name "texlive-pictex2")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/latex/pictex2/")
+             (base32
+              "1qqf08yharknq6csk01jdff62mg011bryqlq5mbmjwqwh7wxs0wy")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pictex2")
+    (synopsis "Adds relative coordinates and improves the @code{\\plot} command")
+    (description
+     "This package adds two user commands to standard PiCTeX.  One command
+uses relative coordinates, thus eliminating the need to calculate the
+coordinate of every point manually as in standard PiCTeX.  The other command
+modifies @code{\\plot} to use a rule instead of dots if the line segment is
+horizontal or vertical.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From a1b56241da1d4a4fa7a132918f874f7a17daffda Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:19:37 +0200
Subject: gnu: Add texlive-pinlabel.

* gnu/packages/tex.scm (texlive-pinlabel): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 83cef56957..60bb9beba2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3340,6 +3340,27 @@ modifies @code{\\plot} to use a rule instead of dots if the line segment is
 horizontal or vertical.")
     (license license:lppl)))
 
+(define-public texlive-pinlabel
+  (package
+    (name "texlive-pinlabel")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pinlabel/" "tex/latex/pinlabel/")
+             (base32
+              "0hfa6gdmc6f59840fia3pdll2bgjwyqk57plcqxb4vc0f7kdqqay")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pinlabel")
+    (synopsis "TeX labelling package")
+    (description
+     "Pinlabel is a labelling package for attaching perfectly formatted TeX
+labels to figures and diagrams in both EPS and PDF formats.  It is suitable
+both for labelling a new diagram and for relabelling an existing diagram.  The
+package uses coordinates derived from GhostView and labels are placed with
+automatic and consistent spacing relative to the object labelled.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 909a0b7aa902a0434ee7307a33e91e163d132189 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:19:49 +0200
Subject: gnu: Add texlive-pixelart.

* gnu/packages/tex.scm (texlive-pixelart): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 60bb9beba2..d9a5a5e7d0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3361,6 +3361,24 @@ package uses coordinates derived from GhostView and labels are placed with
 automatic and consistent spacing relative to the object labelled.")
     (license license:lppl)))
 
+(define-public texlive-pixelart
+  (package
+    (name "texlive-pixelart")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pixelart/" "tex/latex/pixelart/")
+             (base32
+              "14hridmq92md46vxaiv8ja5lij2zl449vbvq2x2dv4qqs7bi42ab")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pixelart")
+    (synopsis "Draw pixel-art pictures")
+    (description
+     "This package provides a LuaLaTeX package to draw pixel-art pictures
+using TikZ.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From d17931ef8137910db088f88899a5c1c874a79073 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:20:08 +0200
Subject: gnu: Add texlive-pixelarttikz.

* gnu/packages/tex.scm (texlive-pixelarttikz): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d9a5a5e7d0..50a470686d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3379,6 +3379,25 @@ automatic and consistent spacing relative to the object labelled.")
 using TikZ.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pixelarttikz
+  (package
+    (name "texlive-pixelarttikz")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pixelarttikz/"
+                   "tex/latex/pixelarttikz/")
+             (base32
+              "0ymjflng2rlb0bq375f28mbdpr2r7ihqphnpvrh2f0n4f3afv8hx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pixelarttikz")
+    (synopsis "Work with PixelArts, with TikZ")
+    (description
+     "The package defines commands and an environment for displaying pixel
+arts.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 5c9ba593c60728c5b93597b8b64ff0f77dc0df55 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:20:21 +0200
Subject: gnu: Add texlive-pmgraph.

* gnu/packages/tex.scm (texlive-pmgraph): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 50a470686d..f540a4b639 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3398,6 +3398,25 @@ using TikZ.")
 arts.")
     (license license:lppl1.3c)))
 
+(define-public texlive-pmgraph
+  (package
+    (name "texlive-pmgraph")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pmgraph/" "tex/latex/pmgraph/")
+             (base32
+              "1a4nd6c9i9y6g34ipjz2ia0m4vizlvx0wcn0yql53pk8k8zrlgnn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pmgraph")
+    (synopsis "Poor man's graphics")
+    (description
+     "This package provides a set of extensions to LaTeX @code{picture}
+environment, including a wider range of vectors, and a lot more box frame
+styles.")
+    (license license:gpl3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From bbb493cee5178b39b9deefa2b95c26f99cf80c14 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:20:37 +0200
Subject: gnu: Add texlive-postage.

* gnu/packages/tex.scm (texlive-postage): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f540a4b639..dfad01351f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3417,6 +3417,27 @@ environment, including a wider range of vectors, and a lot more box frame
 styles.")
     (license license:gpl3+)))
 
+(define-public texlive-postage
+  (package
+    (name "texlive-postage")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/postage/" "source/latex/postage/"
+                   "tex/latex/postage/")
+             (base32
+              "1sa9fm5hh57p0srnrd98jljj6200hnl17pmhw2v5q7jjgqj1n5gq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/postage")
+    (synopsis "Stamp letters with Deutsche Post's service Internetmarke")
+    (description
+     "The postage package is used for franking letters with Deutsche Post's
+online postage service Internetmarke.  Note that in order to print valid
+stamps you must point to a valid PDF of Deutsche Post's Ausdruck
+4-spaltig (DIN A4).")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 56f6aabb4be7103b64f6f9e4d897ac0bde31dca9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:21:16 +0200
Subject: gnu: Add texlive-prerex.

* gnu/packages/tex.scm (texlive-prerex): New variable.
---
 gnu/packages/tex.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dfad01351f..36071b66a9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -91,6 +91,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages readline)
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages shells)
   #:use-module (gnu packages tcl)
@@ -3438,6 +3439,55 @@ stamps you must point to a valid PDF of Deutsche Post's Ausdruck
 4-spaltig (DIN A4).")
     (license license:lppl1.3c)))
 
+(define-public texlive-prerex
+  (package
+    (name "texlive-prerex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/prerex/" "doc/man/man5/prerex.5"
+                   "doc/man/man5/prerex.man5.pdf"
+                   "tex/latex/prerex/")
+             (base32
+              "0cmkr8533p4lqnj9x7nlcqj0slin021y13mr4mx2hvd35ya0dd80")))
+    (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-prerex-source
+            (lambda _
+              (mkdir-p "build")
+              (with-directory-excursion "build"
+                (invoke "tar" "xvf"
+                        ;; Tarball includes a version number that we ignore.
+                        (first (find-files ".." "^prerex-.*\\.tar.gz"))
+                        "--strip-components=1"))))
+          (add-after 'unpack-prerex-source 'build-prerex
+            (lambda args
+              (with-directory-excursion "build"
+                (for-each (lambda (phase)
+                            (apply (assoc-ref gnu:%standard-phases phase) args))
+                          '(configure build check install))))))))
+    (native-inputs (list readline))
+    (home-page "https://ctan.org/pkg/prerex")
+    (synopsis "Interactive editor and macro support for prerequisite charts")
+    (description
+     "This package consists of @file{prerex.sty}, a LaTeX package for
+producing charts of course nodes linked by arrows representing pre- and
+co-requisites, and @command{prerex}, an interactive program for creating and
+editing chart descriptions.  The implementation of @file{prerex.sty} uses PGF,
+so that it may be used equally happily with LaTeX or PDFLaTeX; @code{prerex}
+itself is written in C.  The package includes source code for a previewer
+application, a lightweight Qt-4 and Poppler-based prerex-enabled PDF viewer.")
+    (license (list license:gpl2 license:lppl))))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 56b0bf0847ef9fa5555c4dc619c1ce918520bb6c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:21:35 +0200
Subject: gnu: Add texlive-productbox.

* gnu/packages/tex.scm (texlive-productbox): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 36071b66a9..463d4cadda 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3488,6 +3488,30 @@ itself is written in C.  The package includes source code for a previewer
 application, a lightweight Qt-4 and Poppler-based prerex-enabled PDF viewer.")
     (license (list license:gpl2 license:lppl))))
 
+(define-public texlive-productbox
+  (package
+    (name "texlive-productbox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/productbox/"
+                   "source/latex/productbox/"
+                   "tex/latex/productbox/")
+             (base32
+              "12jj5am2h6lqmhc0dz9v8p2j9ci104s9xplki7ncn3fmhy5mm2fq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/productbox")
+    (synopsis "Typeset a three-dimensional product box")
+    (description
+     "The package enables typesetting of a three-dimensional product box.
+This product box can be rendered as it is standing on a surface and some light
+is shed onto it.  Alternatively it can be typeset as a wireframe to be cut out
+and glued together.  This will lead to a physical product box.")
+    (license
+     (list
+      (license:fsf-free "https://tug.ctan.org/macros/latex/contrib/gene/productbox/productbox.ins")))))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 79272bedc17dfabdc7c8ef9ce71aa9d3506530c7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:21:55 +0200
Subject: gnu: Add texlive-ptolemaicastronomy.

* gnu/packages/tex.scm (texlive-ptolemaicastronomy): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 463d4cadda..6baafeb931 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3512,6 +3512,29 @@ and glued together.  This will lead to a physical product box.")
      (list
       (license:fsf-free "https://tug.ctan.org/macros/latex/contrib/gene/productbox/productbox.ins")))))
 
+(define-public texlive-ptolemaicastronomy
+  (package
+    (name "texlive-ptolemaicastronomy")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ptolemaicastronomy/"
+                   "source/latex/ptolemaicastronomy/"
+                   "tex/latex/ptolemaicastronomy/")
+             (base32
+              "05j082s8aj57lzbxlhddi7f6gscpl5j66zmmaj6kabpnv152r0l7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ptolemaicastronomy")
+    (synopsis "Diagrams of sphere models for variably strict conditionals")
+    (description
+     "David K. Lewis (Counterfactuals, Blackwell 1973) introduced a sphere
+semantics for counterfactual conditionals.  He jokingly referred to the
+diagrams depicting such sphere models as Ptolemaic astronomy, hence the name
+of this package.  The macros provided in this package aid in the construction
+of sphere model diagrams in the style of Lewis.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 453c307e2fa0c1d31f2ea6a4e4af0bd3dd655bee Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:39:23 +0200
Subject: gnu: Add texlive-pythontex.

* gnu/packages/tex.scm (texlive-pythontex): New variable.
---
 gnu/packages/tex.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6baafeb931..73a8c6e14b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -13253,6 +13253,42 @@ your Python code to be executed and the output to be integrated in your LaTeX
 file in a single compilation run.")
     (license (list license:expat license:lppl1.3c))))
 
+(define-public texlive-pythontex
+  (package
+    (name "texlive-pythontex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pythontex/" "scripts/pythontex/"
+                   "source/latex/pythontex/"
+                   "tex/latex/pythontex/")
+             (base32
+              "161kyk3sg7fnp9wxjmb1c9xbw0az0dxw2izipdyz0378ciqhqjfw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "depythontex.py" "pythontex.py")))
+    (inputs (list python))
+    (home-page "https://ctan.org/pkg/pythontex")
+    (synopsis "Run Python from within a document, typesetting the results")
+    (description
+     "The package allows you to enter Python code within a LaTeX document,
+execute the code, and access its output in the original document.  There is
+also support for Bash, JavaScript, Julia, Octave, Perl, R, Raku (Perl 6),
+Ruby, Rust, and SageMath.  Code is only executed when it has been modified, or
+when it meets user-specified criteria.  Code may be divided into user-defined
+sessions, which automatically run in parallel.  Errors and warnings are
+synchronized with the LaTeX document, so that they refer to the document's
+line numbers.  External dependencies can be tracked, so that code is
+re-executed when the data it depends on is modified.  PythonTeX also provides
+syntax highlighting for code in LaTeX documents via the Pygments syntax
+highlighter.
+
+The package also provides a @command{depythontex} utility.  This creates
+a copy of the document in which all Python code has been replaced by its
+output.  This is useful for journal submissions, sharing documents, and
+conversion to other formats.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-koma-script
   (package
     (name "texlive-koma-script")
-- 
cgit 1.4.1


From 07b554e2ffbd454f05a7ddd1997bfce111fc96cf Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:22:24 +0200
Subject: gnu: Add texlive-puyotikz.

* gnu/packages/tex.scm (texlive-puyotikz): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 73a8c6e14b..9c7539d665 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3535,6 +3535,26 @@ of this package.  The macros provided in this package aid in the construction
 of sphere model diagrams in the style of Lewis.")
     (license license:lppl1.3c)))
 
+(define-public texlive-puyotikz
+  (package
+    (name "texlive-puyotikz")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/puyotikz/" "scripts/puyotikz/"
+                   "tex/latex/puyotikz/")
+             (base32
+              "15vw485phk523kby1q1wn0s0f7185cqj7sjsr8hc6iccdbzwknc0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/puyotikz")
+    (synopsis "Quickly typeset board states of Puyo Puyo games")
+    (description
+     "This LaTeX package permits to quickly typeset board states of Puyo Puyo
+games.  It supports large and small boards with arbitrary shape, hidden rows,
+current and next puyos, labels and move planning markers.")
+    (license license:expat)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 2d44d383ed65f712627682d241d9b0a6a18dce28 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:23:37 +0200
Subject: gnu: Add texlive-pxpgfmark.

* gnu/packages/tex.scm (texlive-pxpgfmark): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9c7539d665..3f2a69c202 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3555,6 +3555,26 @@ games.  It supports large and small boards with arbitrary shape, hidden rows,
 current and next puyos, labels and move planning markers.")
     (license license:expat)))
 
+(define-public texlive-pxpgfmark
+  (package
+    (name "texlive-pxpgfmark")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pxpgfmark/"
+                   "tex/latex/pxpgfmark/")
+             (base32
+              "0c026i1bda0fxfrjhpv4laaj75ra6j8l2v6bxsgplng7f11nx36l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pxpgfmark")
+    (synopsis "e-pTeX driver for PGF inter-picture connections")
+    (description
+     "The distributed drivers do not support the PGF feature of inter-picture
+connections under e-pTeX and @code{dvipdfmx}.  The package uses existing
+features of @code{dvipdfmx} to fix this problem.")
+    (license license:expat)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From bcbf90763945eb09885a7c9b605b3ab8e6b2a1f1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:40:33 +0200
Subject: gnu: Add texlive-pxpic.

* gnu/packages/tex.scm (texlive-pxpic): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3f2a69c202..6f1ee2473f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3575,6 +3575,27 @@ connections under e-pTeX and @code{dvipdfmx}.  The package uses existing
 features of @code{dvipdfmx} to fix this problem.")
     (license license:expat)))
 
+(define-public texlive-pxpic
+  (package
+    (name "texlive-pxpic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pxpic/" "source/latex/pxpic/"
+                   "tex/latex/pxpic/")
+             (base32
+              "01k4c7fakc2wjbjasxqm9gnzhchn2bqnj3vvz5rrcxiq0wibmiyi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pxpic")
+    (synopsis "Draw pixel pictures")
+    (description
+     "With @code{pxpic} you draw pictures pixel by pixel.  It was inspired by
+a lovely post by Paulo Cereda, among other things (most notably a beautiful
+duck) showcasing the use of characters from the Mario video games by Nintendo
+in LaTeX.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From d46b8fa544d7275d85c42f085478cc74972e7fc8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:40:55 +0200
Subject: gnu: Add texlive-qcircuit.

* gnu/packages/tex.scm (texlive-qcircuit): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6f1ee2473f..64a1a25609 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3596,6 +3596,25 @@ duck) showcasing the use of characters from the Mario video games by Nintendo
 in LaTeX.")
     (license license:lppl1.3c)))
 
+(define-public texlive-qcircuit
+  (package
+    (name "texlive-qcircuit")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/qcircuit/" "tex/latex/qcircuit/")
+             (base32
+              "0gyygba4zv6ncbwailjh9fvwn95d4ckrn2vj2ja089drr0sd8zkq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/qcircuit")
+    (synopsis "Macros to generate quantum ciruits")
+    (description
+     "The package supports those within the quantum information community who
+typeset quantum circuits, using @code{xy-pic} package, offering macros
+designed to help users generate circuits.")
+    (license license:gpl2)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 185a8ced2a1bae0b2ba674db9c0185185737fe39 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:41:13 +0200
Subject: gnu: Add texlive-quantikz.

* gnu/packages/tex.scm (texlive-quantikz): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 64a1a25609..b28ad45fed 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3615,6 +3615,24 @@ typeset quantum circuits, using @code{xy-pic} package, offering macros
 designed to help users generate circuits.")
     (license license:gpl2)))
 
+(define-public texlive-quantikz
+  (package
+    (name "texlive-quantikz")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/quantikz/" "tex/latex/quantikz/")
+             (base32
+              "1pa9ry2sn70sjkxqj0f569148xfc5iq77rw0sjnd344m3xsz38db")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/quantikz")
+    (synopsis "Draw quantum circuit diagrams")
+    (description
+     "The purpose of this package is to extend TikZ with the functionality for
+drawing quantum circuit diagrams.")
+    (license license:cc-by4.0)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 520041c95454994f6f7d5e55c200c775eed25d0d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:41:35 +0200
Subject: gnu: Add texlive-randbild.

* gnu/packages/tex.scm (texlive-randbild): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b28ad45fed..220c4ea04d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3633,6 +3633,28 @@ designed to help users generate circuits.")
 drawing quantum circuit diagrams.")
     (license license:cc-by4.0)))
 
+(define-public texlive-randbild
+  (package
+    (name "texlive-randbild")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/randbild/"
+                   "source/latex/randbild/"
+                   "tex/latex/randbild/")
+             (base32
+              "1y9qf73163ai738pf6qvaqxy5s2cymyg19qyyfs8dfx2gygcyny9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/randbild")
+    (synopsis "Marginal pictures")
+    (description
+     "This package provides environments @code{randbild} to draw small
+marginal plots (using the packages PSTricks and @code{pst-plot}), and
+@code{randbildbasis} (the same, only without the automatically drawn
+coordinate system).")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 7e96dbef371d33971dd31431ad0a5d494c6cb0fb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 09:42:03 +0200
Subject: gnu: Add texlive-randomwalk.

* gnu/packages/tex.scm (texlive-randomwalk): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 220c4ea04d..4bf5bbccbe 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3655,6 +3655,27 @@ marginal plots (using the packages PSTricks and @code{pst-plot}), and
 coordinate system).")
     (license license:lppl)))
 
+(define-public texlive-randomwalk
+  (package
+    (name "texlive-randomwalk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/randomwalk/"
+                   "source/latex/randomwalk/"
+                   "tex/latex/randomwalk/")
+             (base32
+              "1mmisgiy0c6qww6xyp9r825snh1dkmn81qjg39c7n1jxig3a8rj3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/randomwalk")
+    (synopsis "Random walks using TikZ")
+    (description
+     "The @code{randomwalk} package provides a user command, @code{\\RandomWalk},
+to draw random walks with a given number of steps.  Lengths and angles of the
+steps can be customized in various ways.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 19d9f989491243e47a0ccd977a4673f488aa39d5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:23:00 +0200
Subject: gnu: Add texlive-realhats.

* gnu/packages/tex.scm (texlive-realhats): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4bf5bbccbe..48bc3e24f0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3676,6 +3676,25 @@ to draw random walks with a given number of steps.  Lengths and angles of the
 steps can be customized in various ways.")
     (license license:lppl1.3c)))
 
+(define-public texlive-realhats
+  (package
+    (name "texlive-realhats")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/realhats/"
+                   "source/latex/realhats/"
+                   "tex/latex/realhats/hats/")
+             (base32
+              "0y9s12kzzrrmzkx57yqy4mzx50bcsv972825nnlgcsgkxcd8wv51")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/realhats")
+    (synopsis "Put real hats on symbols instead of @samp{^}")
+    (description
+     "This LaTeX package makes @code{\\hat} put real hats on symbols.")
+    (license license:expat)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 3206a4424c87d34839176e16adbdf1a2d93620d1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:23:23 +0200
Subject: gnu: Add texlive-reotex.

* gnu/packages/tex.scm (texlive-reotex): New variable.
---
 gnu/packages/tex.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 48bc3e24f0..f1aaf4277e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3695,6 +3695,23 @@ steps can be customized in various ways.")
      "This LaTeX package makes @code{\\hat} put real hats on symbols.")
     (license license:expat)))
 
+(define-public texlive-reotex
+  (package
+    (name "texlive-reotex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/reotex/" "tex/latex/reotex/")
+             (base32
+              "1hcjk3nms2gg1h99mxnivb5n3382yq92c578mw0pxbwi0f67z3iw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/reotex")
+    (synopsis "Draw Reo Channels and Circuits")
+    (description
+     "The package defines macros and other utilities to design Reo Circuits.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From c69faf82a2adcb32327d0595f6e7637d45486bea Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:24:17 +0200
Subject: gnu: Add texlive-robotarm.

* gnu/packages/tex.scm (texlive-robotarm): New variable.
---
 gnu/packages/tex.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f1aaf4277e..b741bb1626 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3712,6 +3712,45 @@ steps can be customized in various ways.")
      "The package defines macros and other utilities to design Reo Circuits.")
     (license license:lppl)))
 
+(define-public texlive-robotarm
+  (package
+    (name "texlive-robotarm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/robotarm/"
+                   "source/latex/robotarm/"
+                   "tex/latex/robotarm/")
+             (base32
+              "1lhvbwq979whvjwx9gyfhsxz20x6imhh57xm843zk6068lv0b3wj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:tex-format "latex"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'add-missing-ins-file
+            ;; TeX Live distribution is missing the appropriate ".ins" file to
+            ;; generate the package.  Create it, but ignore all documentation
+            ;; related files in there.
+            (lambda _
+              (with-output-to-file "source/latex/robotarm/robotarm.ins"
+                (lambda ()
+                  (display "\\input docstrip.tex
+\\generate{\\file{robotarm.sty}{\\from{robotarm.dtx}{robotarm-package}}}
+\\endbatchfile"))))))))
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-hypdoc
+                  texlive-tools))))
+    (home-page "https://ctan.org/pkg/robotarm")
+    (synopsis "TikZ powered LaTeX package to draw parameterized 2D robot arms")
+    (description
+     "This LaTeX package uses TikZ to draw parameterized 2D robot arms, for
+example to be used in educational material.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 9d2c60cf16d04d1ff09ee7544e35ee8d255b3dfc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:24:42 +0200
Subject: gnu: Add texlive-rviewport.

* gnu/packages/tex.scm (texlive-rviewport): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b741bb1626..a5734b4e88 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3751,6 +3751,34 @@ steps can be customized in various ways.")
 example to be used in educational material.")
     (license license:lppl1.3+)))
 
+(define-public texlive-rviewport
+  (package
+    (name "texlive-rviewport")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/rviewport/"
+                   "source/latex/rviewport/"
+                   "tex/latex/rviewport/")
+             (base32
+              "13mrihyid25h70800ix0mbqhs8dbi39nyif8f12mj54jpfdjhxcz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/rviewport")
+    (synopsis "Relative viewport for graphics inclusion")
+    (description
+     "Package @code{graphicx} provides a useful keyword viewport which allows
+to show just a part of an image.  However, one needs to put there the actual
+coordinates of the viewport window.  Sometimes it is useful to have relative
+coordinates as fractions of natural size.  For example, one may want to print
+a large image on a spread, putting a half on a verso page, and another half on
+the next recto page.  For this one would need a viewport occupying exactly one
+half of the file's bounding box, whatever the actual width of the image may
+be.  This package adds a new keyword @code{rviewport} to the @code{graphicx}
+package specifiying relative viewport for graphics inclusion: a window defined
+by the given fractions of the natural width and height of the image.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From d0de82f44c0af1bd1f8ee40e9f34266b11585241 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:24:55 +0200
Subject: gnu: Add texlive-sa-tikz.

* gnu/packages/tex.scm (texlive-sa-tikz): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a5734b4e88..6372d1dcd7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3779,6 +3779,24 @@ package specifiying relative viewport for graphics inclusion: a window defined
 by the given fractions of the natural width and height of the image.")
     (license license:lppl)))
 
+(define-public texlive-sa-tikz
+  (package
+    (name "texlive-sa-tikz")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sa-tikz/" "tex/latex/sa-tikz/")
+             (base32
+              "0wdxdgc7jh0h7pql8wja9h4qjc7vr4gv03y4nk2mlxxycwsxiimn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sa-tikz")
+    (synopsis "TikZ library to draw switching architectures")
+    (description
+     "The package provides a library that offers an easy way to draw switching
+architectures and to customize their aspect.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From e7887a20ee9455193a9934675415b6c4c80a45f2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:25:09 +0200
Subject: gnu: Add texlive-sacsymb.

* gnu/packages/tex.scm (texlive-sacsymb): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6372d1dcd7..c37145d4ec 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3797,6 +3797,25 @@ by the given fractions of the natural width and height of the image.")
 architectures and to customize their aspect.")
     (license license:lppl1.3+)))
 
+(define-public texlive-sacsymb
+  (package
+    (name "texlive-sacsymb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sacsymb/" "tex/latex/sacsymb/")
+             (base32
+              "0pwkb8z4bvgqbffcclfif04iqkpdp6lciwmwvwci3mi9bc6yh4vr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sacsymb")
+    (synopsis "Sacred symbols prepared with TikZ")
+    (description
+     "The @code{sacsymb} package contains symbols used in objective
+reduction (Orch OR) theory of consciousness as applied to the three brains
+model of psychological experience.  These symbols are prepared using TikZ.")
+    (license license:lppl1.0+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 9ac99ba870404d5294227db6ba0d5446b0018c1f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:25:22 +0200
Subject: gnu: Add texlive-schemabloc.

* gnu/packages/tex.scm (texlive-schemabloc): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c37145d4ec..5db77bd877 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3816,6 +3816,25 @@ reduction (Orch OR) theory of consciousness as applied to the three brains
 model of psychological experience.  These symbols are prepared using TikZ.")
     (license license:lppl1.0+)))
 
+(define-public texlive-schemabloc
+  (package
+    (name "texlive-schemabloc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/schemabloc/"
+                   "tex/latex/schemabloc/")
+             (base32
+              "03kbriqlgxafxcy5l2215d3z874s4z1g5gg02w2ij0v8wjrgyn88")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/schemabloc")
+    (synopsis "Draw block diagrams, using TikZ")
+    (description
+     "The package provides a set of macros for constructing block diagrams,
+using TikZ.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From a01d92a1e51d5ce56342de0d2ba896c955f456ab Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:25:35 +0200
Subject: gnu: Add texlive-scratch.

* gnu/packages/tex.scm (texlive-scratch): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5db77bd877..edeb535d12 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3835,6 +3835,26 @@ model of psychological experience.  These symbols are prepared using TikZ.")
 using TikZ.")
     (license license:lppl)))
 
+(define-public texlive-scratch
+  (package
+    (name "texlive-scratch")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/scratch/" "tex/latex/scratch/")
+             (base32
+              "1np9mhfmn07clkzsg1glfxw1mkxihvv7yd10bnhc8lxxan9rymj1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/scratch")
+    (synopsis "Draw programs like Scratch")
+    (description
+     "This package permits to draw program charts in the style of the
+@url{https://scratch.mit.edu, Scratch} project.  This package is obsolete.
+From now on, Scratch is now version 3 with a new design.  Use the
+@code{scratch3} package to draw blocks with the new design.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 6ff4e948868f84bd438f620beb9cc1d98d882d03 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:25:52 +0200
Subject: gnu: Add texlive-scratch3.

* gnu/packages/tex.scm (texlive-scratch3): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index edeb535d12..fb16270cfe 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3855,6 +3855,24 @@ From now on, Scratch is now version 3 with a new design.  Use the
 @code{scratch3} package to draw blocks with the new design.")
     (license license:lppl1.3c)))
 
+(define-public texlive-scratch3
+  (package
+    (name "texlive-scratch3")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/scratch3/" "tex/latex/scratch3/")
+             (base32
+              "0g8s0p7j058z7hdm4p7kgh7nsyk4wn22lp3j25d5b4hr0xyxmhby")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/scratch3")
+    (synopsis "Draw programs like Scratch")
+    (description
+     "This package permits to draw program charts in the style of the
+@url{https://scratch.mit.edu, Scratch} project.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From dd85f4220d70724e91b2809d6120a74324a23bae Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:26:06 +0200
Subject: gnu: Add texlive-scsnowman.

* gnu/packages/tex.scm (texlive-scsnowman): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fb16270cfe..bac92168bd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3873,6 +3873,25 @@ From now on, Scratch is now version 3 with a new design.  Use the
 @url{https://scratch.mit.edu, Scratch} project.")
     (license license:lppl1.3c)))
 
+(define-public texlive-scsnowman
+  (package
+    (name "texlive-scsnowman")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/scsnowman/"
+                   "tex/latex/scsnowman/")
+             (base32
+              "1qr1cb19383hsxqh3a0640713m343v3jgxfk9whdxm0z11am5if0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/scsnowman")
+    (synopsis "Snowman variants using TikZ")
+    (description
+     "This LaTeX package provides a command @code{\\scsnowman} which can
+display many variants of snowman")
+    (license license:bsd-2)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 287345ef8fd9a48ae9a0044958766b64dd589830 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:26:21 +0200
Subject: gnu: Add texlive-setdeck.

* gnu/packages/tex.scm (texlive-setdeck): New variable.
---
 gnu/packages/tex.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bac92168bd..7341acc131 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3892,6 +3892,22 @@ From now on, Scratch is now version 3 with a new design.  Use the
 display many variants of snowman")
     (license license:bsd-2)))
 
+(define-public texlive-setdeck
+  (package
+    (name "texlive-setdeck")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/setdeck/" "tex/latex/setdeck/")
+             (base32
+              "11kk04nf37hmv7qw2azjl5r0cqf08khj41b1gp4nikrqvz2p1g49")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/setdeck")
+    (synopsis "Typeset cards for Set")
+    (description "The package will typeset cards for use in a game of Set.")
+    (license license:gpl3)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From eed4409bd41592ef55bfa1a8ae47f59b6398301e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:26:34 +0200
Subject: gnu: Add texlive-signchart.

* gnu/packages/tex.scm (texlive-signchart): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7341acc131..78ed9cd8f2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3908,6 +3908,26 @@ display many variants of snowman")
     (description "The package will typeset cards for use in a game of Set.")
     (license license:gpl3)))
 
+(define-public texlive-signchart
+  (package
+    (name "texlive-signchart")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/signchart/"
+                   "source/latex/signchart/"
+                   "tex/latex/signchart/")
+             (base32
+              "0vg7xkrc0chp0r9j05ra499n4zkwg1gh9ywfnb54yhwcas301izs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/signchart")
+    (synopsis "Create sign charts")
+    (description
+     "The package allows users to easily typeset sign charts directly into
+their (La)TeX document.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From d187be203642845b71670952977f83a73309cb5e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:26:48 +0200
Subject: gnu: Add texlive-simplenodes.

* gnu/packages/tex.scm (texlive-simplenodes): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 78ed9cd8f2..4e34b99ea2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3928,6 +3928,30 @@ display many variants of snowman")
 their (La)TeX document.")
     (license license:lppl1.3+)))
 
+(define-public texlive-simplenodes
+  (package
+    (name "texlive-simplenodes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/simplenodes/"
+                   "tex/latex/simplenodes/")
+             (base32
+              "0d3bqia3a7rnd57v8yld4i5d9nwrshkxxv6w2vglhpp447yv0nq7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/simplenodes")
+    (synopsis "Simple nodes in four colors written in TikZ for LaTeX")
+    (description
+     "This is a LaTeX macro package for generating simple node-based flow
+graphs or diagrams built upon the TikZ package.  The package provides two
+basic commands, one to generate a node and one to create links between nodes.
+The positioning of the nodes is not handled by the package itself but is
+preferably done in a tabular environment.  In total, four simple node types
+are defined, loosely based on the nomenclature and color patterns of the
+popular Java script Bootstrap.")
+    (license license:expat)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 42e6fbcfa74f30abe31b19afa96c719831436675 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:27:01 +0200
Subject: gnu: Add texlive-simpleoptics.

* gnu/packages/tex.scm (texlive-simpleoptics): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4e34b99ea2..ad89bb3381 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3952,6 +3952,25 @@ are defined, loosely based on the nomenclature and color patterns of the
 popular Java script Bootstrap.")
     (license license:expat)))
 
+(define-public texlive-simpleoptics
+  (package
+    (name "texlive-simpleoptics")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/simpleoptics/"
+                   "tex/latex/simpleoptics/")
+             (base32
+              "0hna56av80k1gc3fm2nbw2dy31sfdw7v14v8yppad4f2d12skpzd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/simpleoptics")
+    (synopsis "Drawing lenses and mirrors for optical diagrams")
+    (description
+     "This package provides some of macros for drawing simple lenses and
+mirrors for use in optical diagrams.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 75a5c6b8235daffb6f0366f5df49bee43f285fff Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:27:18 +0200
Subject: gnu: Add texlive-smartdiagram.

* gnu/packages/tex.scm (texlive-smartdiagram): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ad89bb3381..6f97a19d51 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3971,6 +3971,26 @@ popular Java script Bootstrap.")
 mirrors for use in optical diagrams.")
     (license license:lppl1.3c)))
 
+(define-public texlive-smartdiagram
+  (package
+    (name "texlive-smartdiagram")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/smartdiagram/"
+                   "source/latex/smartdiagram/"
+                   "tex/latex/smartdiagram/")
+             (base32
+              "0qlgafprxqjhy14imb3isgqjsp1y78qrcqlr0n1rvgwppmi1fd0c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/smartdiagram")
+    (synopsis "Generate diagrams from lists")
+    (description
+     "The package will create smart diagrams from lists of items, for simple
+documents and for presentations.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From c9011247c0fce3524f61be443de337cd34b465fd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:27:32 +0200
Subject: gnu: Add texlive-spath3.

* gnu/packages/tex.scm (texlive-spath3): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6f97a19d51..d65321e294 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3991,6 +3991,27 @@ mirrors for use in optical diagrams.")
 documents and for presentations.")
     (license license:lppl1.3+)))
 
+(define-public texlive-spath3
+  (package
+    (name "texlive-spath3")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/spath3/" "source/latex/spath3/"
+                   "tex/latex/spath3/")
+             (base32
+              "16hg6kbr0rzk1xsyrmhnkc0dr4vq8pamqdqncjx6n5jdpwr9kzkx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/spath3")
+    (synopsis "Manipulate soft paths in PGF")
+    (description
+     "The @code{spath3} library provides methods for manipulating the soft
+paths of TikZ/PGF.  Packaged with it are two TikZ libraries that make use of
+the methods provided.  These are libraries for drawing calligraphic paths and
+for drawing knot diagrams.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 32965a091dbb3d83d37bdf81f8080e067358279c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:28:03 +0200
Subject: gnu: Add texlive-spectralsequences.

* gnu/packages/tex.scm (texlive-spectralsequences): New variable.
---
 gnu/packages/tex.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d65321e294..c2e4c3b434 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4012,6 +4012,35 @@ the methods provided.  These are libraries for drawing calligraphic paths and
 for drawing knot diagrams.")
     (license license:lppl1.3c)))
 
+(define-public texlive-spectralsequences
+  (package
+    (name "texlive-spectralsequences")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/spectralsequences/"
+                   "tex/latex/spectralsequences/")
+             (base32
+              "0fdgkvhhg8i0j7c4ibc9d2xjbhgbpqvqp1shpqaslg5mdahml58f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/spectralsequences")
+    (synopsis "Print spectral sequence diagrams using PGF/TikZ")
+    (description
+     "The package is a specialized tool built on top of PGF/TikZ for drawing
+spectral sequences.  It provides a powerful, concise syntax for specifying the
+data of a spectral sequence, and then allows the user to print various pages
+of spectral sequences, automatically choosing which subset of the classes,
+differentials, and structure lines to display on each page.  It also handles
+most of the details of the layout.  At the same time, it is extremely
+flexible.  @code{spectralsequences} is closely integrated with TikZ to ensure
+that users can take advantage of as much as possible of its expressive power.
+It is possible to turn off most of the automated layout features and draw
+replacements using TikZ commands.  The package also provides a carefully
+designed error reporting system intended to ensure that it is as clear as
+possible what is going wrong.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From bce14ab1d19503611c1a860036d2cf8f20a36f78 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:29:34 +0200
Subject: gnu: Add texlive-strands.

* gnu/packages/tex.scm (texlive-strands): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c2e4c3b434..9920bf2f2f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4041,6 +4041,25 @@ designed error reporting system intended to ensure that it is as clear as
 possible what is going wrong.")
     (license license:lppl)))
 
+(define-public texlive-strands
+  (package
+    (name "texlive-strands")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/strands/" "source/latex/strands/"
+                   "tex/latex/strands/")
+             (base32
+              "1jhvbzy8qjrjmb6j7kjwjn1iqgnszvhwlnpsag8sl1f8qgg1ns9z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/strands")
+    (synopsis "Draw objects constructed from strands")
+    (description
+     "This package permits to draw objects constructed from strands, like set
+partitions, permutations, braids, etc.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 08a90839c4cfb08453fb3da2aea14a92f768597b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:29:47 +0200
Subject: gnu: Add texlive-swimgraf.

* gnu/packages/tex.scm (texlive-swimgraf): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9920bf2f2f..d083bd98e9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4060,6 +4060,31 @@ possible what is going wrong.")
 partitions, permutations, braids, etc.")
     (license license:lppl1.3+)))
 
+(define-public texlive-swimgraf
+  (package
+    (name "texlive-swimgraf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/swimgraf/" "tex/latex/swimgraf/")
+             (base32
+              "09s6wb3nzrxj20qrjyyr3r1fl2nbsgj1a4va101nwqb81pcmp4aq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/swimgraf")
+    (synopsis "Graphical/textual representations of swimming performances")
+    (description
+     "The package provides two macros that produce representations of
+a swimmer's performances.  The user records data in a text file and specifies
+as arguments of the macros the date range of interest.  The macros extract the
+relevant information from the file and process it: @code{\\swimgraph} produces
+a graph of the times in a single swimming event (specified as an argument),
+plotting long course and short course times in separate lines.  Records and
+qualifying times, stored in text files, may optionally be included on the
+graph. @code{\\swimtext} produces a written record of the times in all events.
+Files of current world and Canadian records are included.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 96a7f62b6e13c7d026941c308754e89e0e3e287a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:30:02 +0200
Subject: gnu: Add texlive-syntaxdi.

* gnu/packages/tex.scm (texlive-syntaxdi): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d083bd98e9..e5cf8fa58f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4085,6 +4085,24 @@ graph. @code{\\swimtext} produces a written record of the times in all events.
 Files of current world and Canadian records are included.")
     (license license:lppl)))
 
+(define-public texlive-syntaxdi
+  (package
+    (name "texlive-syntaxdi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/syntaxdi/" "tex/latex/syntaxdi/")
+             (base32
+              "0q6f45vr1dq5pildna9i6vxxqg76kylnlb2rfqs9f87r73dg0xak")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/syntaxdi")
+    (synopsis "Create railroad syntax diagrams")
+    (description
+     "This package provides TikZ styles for creating special syntax diagrams
+known as railroad diagrams.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From c38fb4ad865efd7dc5ebfd638a7b124be3716336 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:30:14 +0200
Subject: gnu: Add texlive-table-fct.

* gnu/packages/tex.scm (texlive-table-fct): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e5cf8fa58f..1523b39b3b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4103,6 +4103,26 @@ Files of current world and Canadian records are included.")
 known as railroad diagrams.")
     (license license:lppl1.3+)))
 
+(define-public texlive-table-fct
+  (package
+    (name "texlive-table-fct")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/table-fct/"
+                   "tex/latex/table-fct/")
+             (base32
+              "1l21dvfp4ypbfn5jvyrb2kwg8s8xfvcwlwxgcyix2ghawv9gsp7m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/table-fct")
+    (synopsis
+     "Draw a variations table of functions and a convexity table of its graph")
+    (description
+     "This package offers two environnements, to draw variations table of
+a function and a convexity table of its graph.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From e9e4e9983e05025d3c6bc668fd78f6b779d02ccf Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:30:29 +0200
Subject: gnu: Add texlive-texdraw.

* gnu/packages/tex.scm (texlive-texdraw): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1523b39b3b..17d713998b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4123,6 +4123,32 @@ known as railroad diagrams.")
 a function and a convexity table of its graph.")
     (license license:lppl1.3+)))
 
+(define-public texlive-texdraw
+  (package
+    (name "texlive-texdraw")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/info/texdraw.info"
+                   "doc/support/texdraw/"
+                   "tex/generic/texdraw/")
+             (base32
+              "1pqrmyc8jnwk06qbrf18cyny1z4ncq0snp4jc0r7qgnh6bmlbncs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/texdraw")
+    (synopsis "Graphical macros, using embedded PostScript")
+    (description
+     "TeXdraw is a set of macro definitions for TeX, which allow the user to
+produce PostScript drawings from within TeX and LaTeX.  TeXdraw has been
+designed to be extensible.  Drawing segments are relocatable, self-contained
+units.  Using a combination of TeX's grouping mechanism and the
+@code{gsave}/@code{grestore} mechanism in PostScript, drawing segments allow
+for local changes to the scaling and line parameters.  Using TeX's macro
+definition capability, new drawing commands can be constructed from drawing
+segments.")
+    (license license:cc-by4.0)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From d6801d89e36334cd44de31af1124d60b17eeb4de Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:30:49 +0200
Subject: gnu: Add texlive-ticollege.

* gnu/packages/tex.scm (texlive-ticollege): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 17d713998b..664658aa53 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4149,6 +4149,27 @@ definition capability, new drawing commands can be constructed from drawing
 segments.")
     (license license:cc-by4.0)))
 
+(define-public texlive-ticollege
+  (package
+    (name "texlive-ticollege")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ticollege/"
+                   "tex/latex/ticollege/")
+             (base32
+              "1qbng6vq8w3ln2aw2kckbjih8hz3m2yr1b0bx8bx1a7bf5fhmd6i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ticollege")
+    (synopsis
+     "Graphical representation of keys on a standard scientific calculator")
+    (description
+     "This package provides commands to draw scientific calculator keys with
+the help of TikZ.  It also provides commands to draw the content of screens
+and of menu items.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 16e6ad0794020f692bc9e6a73b98e2b227e430a6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:31:02 +0200
Subject: gnu: Add texlive-tikz-3dplot.

* gnu/packages/tex.scm (texlive-tikz-3dplot): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 664658aa53..1751614117 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4170,6 +4170,31 @@ the help of TikZ.  It also provides commands to draw the content of screens
 and of menu items.")
     (license license:lppl)))
 
+(define-public texlive-tikz-3dplot
+  (package
+    (name "texlive-tikz-3dplot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-3dplot/"
+                   "tex/latex/tikz-3dplot/")
+             (base32
+              "05hw2wxs4q477x16ffh6wcmypdf7mz7500dxnfywiqi0pgzmnh89")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-3dplot")
+    (synopsis "Coordinate transformation styles for 3d plotting in TikZ")
+    (description
+     "The package provides straightforward ways to define three-dimensional
+coordinate frames through which to plot in TikZ.  The user can specify the
+orientation of the main coordinate frame, and use standard TikZ commands and
+coordinates to render their @code{tikzfigure}.  A secondary coordinate frame
+is provided to allow rotations and translations with respect to the main
+coordinate frame.  In addition, the package can also handle plotting
+user-specified functions in spherical polar coordinates, where both the radius
+and fill color can be expressed as parametric functions of polar angles.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 3a5e5f53f13dc28e169d7ab6b89ea3b350bf3bdf Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:31:16 +0200
Subject: gnu: Add texlive-tikz-among-us.

* gnu/packages/tex.scm (texlive-tikz-among-us): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1751614117..47f2cb1346 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4195,6 +4195,25 @@ user-specified functions in spherical polar coordinates, where both the radius
 and fill color can be expressed as parametric functions of polar angles.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikz-among-us
+  (package
+    (name "texlive-tikz-among-us")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-among-us/"
+                   "tex/latex/tikz-among-us/")
+             (base32
+              "0rrkzh1hain7mvnx4r5s7pccxvcj0izjbjwyrjg3nwin03mqqxy1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-among-us")
+    (synopsis "Create some AmongUs characters in TikZ environments")
+    (description
+     "This package recreates some AmongUs characters in TikZ environments.
+Some interesting uses alongside other packages are also supported.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 48e6adaeb15a11ccda91b2e99506bece37cee792 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:31:29 +0200
Subject: gnu: Add texlive-tikz-bagua.

* gnu/packages/tex.scm (texlive-tikz-bagua): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 47f2cb1346..acc6653737 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4214,6 +4214,26 @@ and fill color can be expressed as parametric functions of polar angles.")
 Some interesting uses alongside other packages are also supported.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tikz-bagua
+  (package
+    (name "texlive-tikz-bagua")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-bagua/"
+                   "tex/latex/tikz-bagua/")
+             (base32
+              "1kn0ggpxz5ksnnxsfhbhavik7n8mpblm9x3qjxcsg2qhs286lwyh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-bagua")
+    (synopsis "Draw Bagua symbols in Yijing")
+    (description
+     "This package provides commands for drawing symbols in Yijing (I Ching)
+or Zhouyi using TikZ.  There is no need for extra special fonts for showing
+these symbols.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 258879226ff28a320e100513bf443eba7b7b5fb2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:31:54 +0200
Subject: gnu: Add texlive-tikz-bayesnet.

* gnu/packages/tex.scm (texlive-tikz-bayesnet): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index acc6653737..8e9d9d767f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4234,6 +4234,26 @@ or Zhouyi using TikZ.  There is no need for extra special fonts for showing
 these symbols.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tikz-bayesnet
+  (package
+    (name "texlive-tikz-bayesnet")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-bayesnet/"
+                   "tex/latex/tikz-bayesnet/")
+             (base32
+              "0fmm93h0kl6q45sglfz1ssrnj20sqds9kvamf1dqzmfw2g77qwqr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-bayesnet")
+    (synopsis
+     "Draw Bayesian networks, graphical models and directed factor graphs")
+    (description
+     "The package provides a library supporting the display of Bayesian networks,
+graphical models and (directed) factor graphs in LaTeX.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 6b68cdfcdfbb341751a3ce7590cc234b29061be5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:32:09 +0200
Subject: gnu: Add texlive-tikz-bbox.

* gnu/packages/tex.scm (texlive-tikz-bbox): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8e9d9d767f..f1beec3c17 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4254,6 +4254,28 @@ these symbols.")
 graphical models and (directed) factor graphs in LaTeX.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikz-bbox
+  (package
+    (name "texlive-tikz-bbox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-bbox/"
+                   "tex/latex/tikz-bbox/")
+             (base32
+              "0h224gmdbx63dff0zikv9grf5p7780rdxng2ws9d68k7rk961lb7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-bbox")
+    (synopsis "Precise determination of bounding boxes in TikZ")
+    (description
+     "The built-in determination of the bounding box in TikZ is not entirely
+accurate.  This is because, for Bezier curves, it is the smallest box that
+contains all control points, which is in general larger than the box that just
+contains the curve.  This library determines the exact bounding box of the
+curve.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From c2befb9c7c8bfcc11598c9769202ff3b3259d96e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:32:22 +0200
Subject: gnu: Add texlive-tikz-cd.

* gnu/packages/tex.scm (texlive-tikz-cd): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f1beec3c17..d58e8a71ac 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4276,6 +4276,29 @@ contains the curve.  This library determines the exact bounding box of the
 curve.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tikz-cd
+  (package
+    (name "texlive-tikz-cd")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-cd/" "tex/generic/tikz-cd/"
+                   "tex/latex/tikz-cd/")
+             (base32
+              "188vd02cwy7r58cnam4aj4lq1jp295mmn3q1w3ki7p6n8v1gnl0c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-cd")
+    (synopsis "Create commutative diagrams with TikZ")
+    (description
+     "The general-purpose drawing package TiKZ can be used to typeset
+commutative diagrams and other kinds of mathematical pictures.  The purpose of
+this package is to make the process of creation of such diagrams easier by
+providing a convenient set of macros and reasonable default settings.  This
+package also includes an arrow tip library that match closely the arrows
+present in the Computer Modern typeface.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 267224e94953228574caada4c262d37c5fdc35b2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:32:35 +0200
Subject: gnu: Add texlive-tikz-dependency.

* gnu/packages/tex.scm (texlive-tikz-dependency): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d58e8a71ac..45d2b9c374 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4299,6 +4299,27 @@ package also includes an arrow tip library that match closely the arrows
 present in the Computer Modern typeface.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikz-dependency
+  (package
+    (name "texlive-tikz-dependency")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-dependency/"
+                   "tex/latex/tikz-dependency/")
+             (base32
+              "12a31jqrxlaj8jj5f7p9vgwp8yqinl5ab0c3nfv4b1c9a08p8q3s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-dependency")
+    (synopsis "Library for drawing dependency graphs")
+    (description
+     "The package provides a library that draws together existing TikZ
+facilities to make a comfortable environment for drawing dependency graphs.
+Basic facilities of the package include a lot of styling facilities, to let
+you personalize the look and feel of the graphs.")
+    (license (list license:lppl license:gpl2))))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 1f944d147380e6cd66234e6be2d7e0a125a7c786 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:33:23 +0200
Subject: gnu: Add texlive-tikz-dimline.

* gnu/packages/tex.scm (texlive-tikz-dimline): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 45d2b9c374..64eb23e822 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4320,6 +4320,25 @@ Basic facilities of the package include a lot of styling facilities, to let
 you personalize the look and feel of the graphs.")
     (license (list license:lppl license:gpl2))))
 
+(define-public texlive-tikz-dimline
+  (package
+    (name "texlive-tikz-dimline")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-dimline/"
+                   "tex/latex/tikz-dimline/")
+             (base32
+              "15zxc3zxl8mk0rq3b30d2a89lxlnybih49j8w8c6xsfn5mqbn8br")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-dimline")
+    (synopsis "Technical dimension lines using PGF/TikZ")
+    (description
+     "@code{tikz-dimline} helps drawing technical dimension lines in TikZ
+@code{picture} environments.")
+    (license license:wtfpl2)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 9b71929c9fccf872efa71ea25a6cb290dc5e5e4d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:33:36 +0200
Subject: gnu: Add texlive-tikz-ext.

* gnu/packages/tex.scm (texlive-tikz-ext): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 64eb23e822..e5913773a7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4339,6 +4339,28 @@ you personalize the look and feel of the graphs.")
 @code{picture} environments.")
     (license license:wtfpl2)))
 
+(define-public texlive-tikz-ext
+  (package
+    (name "texlive-tikz-ext")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-ext/"
+                   "tex/generic/tikz-ext/"
+                   "tex/latex/tikz-ext/" "tex/plain/tikz-ext/")
+             (base32
+              "1sb7h2jrz82g10j5qq4h4qiyj5jdriyx7618rfgx05cz8rdv6mxs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-ext")
+    (synopsis "Collection of libraries for PGF/TikZ")
+    (description
+     "This is a collection of libraries for PGF/TikZ.  Currently these are
+@code{transformations.mirror}, @code{paths.arcto}, @code{paths.ortho},
+@code{paths.timer}, @code{patterns.images}, @code{topaths.arcthrough} and
+@code{misc}.")
+    (license (list license:fdl1.3+ license:lppl))))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From fba705ef56b181a5f257173fcb09e4797f4c1e10 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:33:51 +0200
Subject: gnu: Add texlive-tikz-feynhand.

* gnu/packages/tex.scm (texlive-tikz-feynhand): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e5913773a7..946828c9bd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4361,6 +4361,31 @@ you personalize the look and feel of the graphs.")
 @code{misc}.")
     (license (list license:fdl1.3+ license:lppl))))
 
+(define-public texlive-tikz-feynhand
+  (package
+    (name "texlive-tikz-feynhand")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-feynhand/"
+                   "tex/latex/tikz-feynhand/")
+             (base32
+              "11cz44yqxm7dhx53h27r3n5q911dhllzfl53a401w1wnybymj84s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-feynhand")
+    (synopsis "Feynman diagrams with TikZ")
+    (description
+     "This package lets you draw Feynman diagrams using TikZ.  It is a low-end
+modification of the TikZ-Feynman package, one of whose principal advantages is
+the automatic generation of diagrams, for which it needs LuaTeX.
+TikZ-FeynHand only provides the manual mode and hence runs in LaTeX without
+any reference to LuaTeX.  In addition it provides some new styles for vertices
+and propagators, alternative shorter keywords in addition to TikZ-Feynman's
+longer ones, some shortcut commands for quickly customizing the diagrams look,
+and the new feature of putting one propagator on top of another.")
+    (license license:gpl3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 65557fd635f3815840a30750c5896d47bc008fd0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:34:11 +0200
Subject: gnu: Add texlive-pgfopts.

* gnu/packages/tex.scm (texlive-pgfopts): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 946828c9bd..3780c5ab89 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3225,6 +3225,30 @@ multiple physical pages, for example as for arranging pages to make
 booklets.")
     (license license:lppl1.3c)))
 
+(define-public texlive-pgfopts
+  (package
+    (name "texlive-pgfopts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgfopts/" "source/latex/pgfopts/"
+                   "tex/latex/pgfopts/")
+             (base32
+              "0p4bfqgkwmzhismrs7a10sblbgx4b6w259vdp1dd3hxvhc2kbnyn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-pgf))
+    (home-page "https://ctan.org/pkg/pgfopts")
+    (synopsis "LaTeX package options with @code{pgfkeys}")
+    (description
+     "The @code{pgfkeys} package (part of the PGF distribution) is a way of
+defining and using large numbers of keys for key-value syntaxes.  However,
+@code{pgfkeys} itself does not offer means of handling LaTeX class and package
+options.  This package adds such option handling to @code{pgfkeys}, in the
+same way that @code{kvoptions} adds the same facility to the LaTeX standard
+@code{keyval} package.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-pgfornament
   (package
     (name "texlive-pgfornament")
-- 
cgit 1.4.1


From f20e4d3da14fc60abe1a72b29919105f93b8c1cd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:35:23 +0200
Subject: gnu: Add texlive-tikz-feynman.

* gnu/packages/tex.scm (texlive-tikz-feynman): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3780c5ab89..de195d0d3b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4410,6 +4410,30 @@ longer ones, some shortcut commands for quickly customizing the diagrams look,
 and the new feature of putting one propagator on top of another.")
     (license license:gpl3+)))
 
+(define-public texlive-tikz-feynman
+  (package
+    (name "texlive-tikz-feynman")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-feynman/"
+                   "tex/latex/tikz-feynman/")
+             (base32
+              "1yndmpghf3z5jddr3zcm5xw7v7zb6715d870ckjd5gifkvyv3nsy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-iftex texlive-pgfopts))
+    (home-page "https://ctan.org/pkg/tikz-feynman")
+    (synopsis "Feynman diagrams with TikZ")
+    (description
+     "This is a LaTeX package allowing Feynman diagrams to be easily generated
+within LaTeX with minimal user instructions and without the need of external
+programs.  It builds upon the TikZ package and leverages the graph placement
+algorithms from TikZ in order to automate the placement of many vertices.
+@code{tikz-feynman} allows fine-tuned placement of vertices so that even
+complex diagrams can still be generated with ease.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 7b97203ccbc05487297f5f1c4bc165a581d06da3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:35:38 +0200
Subject: gnu: Add texlive-tikz-imagelabels.

* gnu/packages/tex.scm (texlive-tikz-imagelabels): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index de195d0d3b..97fa42d3e9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4434,6 +4434,26 @@ algorithms from TikZ in order to automate the placement of many vertices.
 complex diagrams can still be generated with ease.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikz-imagelabels
+  (package
+    (name "texlive-tikz-imagelabels")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-imagelabels/"
+                   "source/latex/tikz-imagelabels/"
+                   "tex/latex/tikz-imagelabels/")
+             (base32
+              "1hvyrkpabnqscnsqz56hby71vpbby03va0xa6gcjjxak65lscwkv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-imagelabels")
+    (synopsis "Put labels on images using TikZ")
+    (description
+     "This package allows to add label texts to an existing image with the aid
+of TikZ.  This may be used to label certain features in an image.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 506638cee43545f6224a63a152809bf9ba19d6b9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:35:51 +0200
Subject: gnu: Add texlive-tikz-inet.

* gnu/packages/tex.scm (texlive-tikz-inet): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 97fa42d3e9..9a0649e798 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4454,6 +4454,24 @@ complex diagrams can still be generated with ease.")
 of TikZ.  This may be used to label certain features in an image.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikz-inet
+  (package
+    (name "texlive-tikz-inet")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-inet/"
+                   "tex/latex/tikz-inet/")
+             (base32
+              "1f4n5mp9hb92li2xywfzfrs8hjyrkd15xp97nh5rdgan695hvdpq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-inet")
+    (synopsis "Draw interaction nets with TikZ")
+    (description
+     "The package extends TikZ with macros to draw interaction nets.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 3dc9343ad7fa9086b454a80806b0c6d9b2eaf8dd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:36:04 +0200
Subject: gnu: Add texlive-tikz-kalender.

* gnu/packages/tex.scm (texlive-tikz-kalender): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9a0649e798..ef82b49870 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4472,6 +4472,25 @@ of TikZ.  This may be used to label certain features in an image.")
      "The package extends TikZ with macros to draw interaction nets.")
     (license license:lppl)))
 
+(define-public texlive-tikz-kalender
+  (package
+    (name "texlive-tikz-kalender")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-kalender/"
+                   "tex/latex/tikz-kalender/")
+             (base32
+              "1cwdssvbaibjf7nla0d88nyzip407kgqvndid2p2gxc0b2afp69f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-kalender")
+    (synopsis "LaTeX based calendar using TikZ")
+    (description
+     "This package generates a calendar included events provided as
+@file{.events} files.")
+    (license license:cc-by-sa4.0)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 5b5df6660b8d5abf529726e01760b26589e800c1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:36:19 +0200
Subject: gnu: Add texlive-tikz-karnaugh.

* gnu/packages/tex.scm (texlive-tikz-karnaugh): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ef82b49870..15fa572868 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4491,6 +4491,29 @@ of TikZ.  This may be used to label certain features in an image.")
 @file{.events} files.")
     (license license:cc-by-sa4.0)))
 
+(define-public texlive-tikz-karnaugh
+  (package
+    (name "texlive-tikz-karnaugh")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-karnaugh/"
+                   "tex/latex/tikz-karnaugh/")
+             (base32
+              "091s9gavh8f4jya01nkjhzgh3f5b80ijiiaj7simnxawn60mh1z1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-karnaugh")
+    (synopsis "Typeset Karnaugh maps using TikZ")
+    (description
+     "The @code{tikz-karnaugh} package is a LaTeX package used to draw
+Karnaugh maps.  It uses TikZ to produce high quality graph from 1 to 12
+variables, but this upper limit depends on the TeX memory usage and can be
+different for you.  You can control colour, styles and distances.  It can be
+considered as an upgrade and extension of Andreas W. Wieland's @code{karnaugh}
+package towards TikZ supporting.")
+    (license license:lppl1.0+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 8d696f27ea0fead92664951300caea5f82502b9f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:36:33 +0200
Subject: gnu: Add texlive-tikz-ladder.

* gnu/packages/tex.scm (texlive-tikz-ladder): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 15fa572868..1199c09643 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4514,6 +4514,29 @@ considered as an upgrade and extension of Andreas W. Wieland's @code{karnaugh}
 package towards TikZ supporting.")
     (license license:lppl1.0+)))
 
+(define-public texlive-tikz-ladder
+  (package
+    (name "texlive-tikz-ladder")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-ladder/"
+                   "tex/latex/tikz-ladder/")
+             (base32
+              "1fkq7z58h7g71ag4j77vy87hqgpp5q8qvw7kv1pmkff7ycrj8alw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-ladder")
+    (synopsis "Draw ladder diagrams using TikZ")
+    (description
+     "The @code{tikz-ladder} package contains a collection of symbols for
+typesetting ladder diagrams (PLC program) in agreement with the international
+standard IEC-61131-3/2013.  It includes blocks (for representing functions and
+function blocks) besides contacts and coils.  It extends the circuit library
+of TikZ and allows you to draw a ladder diagram in the same way as you would
+draw any other circuit.")
+    (license license:lppl1.0+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 74ec75f84c9e2c421ba295b6cdbe39a6c53c7d48 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:36:47 +0200
Subject: gnu: Add texlive-tikz-lake-fig.

* gnu/packages/tex.scm (texlive-tikz-lake-fig): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1199c09643..1a06b21921 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4537,6 +4537,26 @@ of TikZ and allows you to draw a ladder diagram in the same way as you would
 draw any other circuit.")
     (license license:lppl1.0+)))
 
+(define-public texlive-tikz-lake-fig
+  (package
+    (name "texlive-tikz-lake-fig")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-lake-fig/"
+                   "tex/latex/tikz-lake-fig/")
+             (base32
+              "1vyr3will7jivwc30aj13bm9gjj4nyl02754p42phn0y7gdf82kr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-lake-fig")
+    (synopsis "Schematic diagrams of lakes")
+    (description
+     "This package contains a collection of schematic diagrams of lakes for
+use in LaTeX documents.  Diagrams include representations of material budgets,
+fluxes, and connectivity arrangements.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 1771c6812b2e958c7d197312d620eafad0ddee2b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:37:02 +0200
Subject: gnu: Add texlive-tikz-layers.

* gnu/packages/tex.scm (texlive-tikz-layers): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1a06b21921..f284921ecd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4557,6 +4557,29 @@ use in LaTeX documents.  Diagrams include representations of material budgets,
 fluxes, and connectivity arrangements.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikz-layers
+  (package
+    (name "texlive-tikz-layers")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-layers/"
+                   "tex/latex/tikz-layers/")
+             (base32
+              "1j5wbsybd10zmmiz3lfkb9gzjhxjnbhp7lmdq1fzngywxsb81iz6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-layers")
+    (synopsis
+     "Add graphical layers on TikZ: @code{behind}, @code{above} and @code{glass}")
+    (description
+     "TikZ-layers is a tiny package that provides, alongside
+@code{background}, typical graphical layers on TikZ: @code{behind},
+@code{above} and @code{glass}.  The layers may be selected with one of the
+styles @code{on behind layer}, @code{on above layer}, @code{on glass layer} as
+an option to a @code{scope} environment.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From e7d87d53aa5078539763b4f8447a501988956776 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:37:20 +0200
Subject: gnu: Add texlive-tikz-mirror-lens.

* gnu/packages/tex.scm (texlive-tikz-mirror-lens): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f284921ecd..660aa63549 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4580,6 +4580,27 @@ styles @code{on behind layer}, @code{on above layer}, @code{on glass layer} as
 an option to a @code{scope} environment.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikz-mirror-lens
+  (package
+    (name "texlive-tikz-mirror-lens")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-mirror-lens/"
+                   "tex/latex/tikz-mirror-lens/")
+             (base32
+              "0sddmlki3bdd9js9vs1m1haqcdk3g1ji086jp1h4nfw6dy1s6y56")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-mirror-lens")
+    (synopsis "Spherical mirrors and lenses in TikZ")
+    (description
+     "This package allows the automatic drawing of the image of objects in
+spherical mirrors and lenses from the data of the focus, from the position and
+height of the object.  It calculates the position and height of the image, and
+also displays the notable rays.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From df4af09f21fc3419c04ba69753e2c767a7fe00bd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:38:04 +0200
Subject: gnu: Add texlive-tikz-nef.

* gnu/packages/tex.scm (texlive-tikz-nef): New variable.
---
 gnu/packages/tex.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 660aa63549..faa9690290 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4601,6 +4601,55 @@ height of the object.  It calculates the position and height of the image, and
 also displays the notable rays.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tikz-nef
+  (package
+    (name "texlive-tikz-nef")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-nef/" "tex/latex/tikz-nef/")
+             (base32
+              "18b2452hfcndqhljq2hn437z6myc45hn62s4bnnjb0f3xnayq1qr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-nef")
+    (synopsis "Create diagrams for neural networks")
+    (description
+     "The @code{nef} TikZ library provides predefined styles and shapes to
+create diagrams for neural networks constructed with the methods of
+the Neural Engineering Framework (NEF).  The following styles are
+supported:
+@itemize
+@item @code{ea}: ensemble array,
+@item @code{ens}: ensemble,
+@item @code{ext}: external input or output,
+@item @code{inhibt}: inhibitory connection,
+@item @code{net}: network,
+@item @code{pnode}: pass-through node,
+@item @code{rect}: rectification ensemble,
+@item @code{recurrent}: recurrent connection.
+@end itemize")
+    (license license:expat)))
+
+(define-public texlive-tikz-network
+  (package
+    (name "texlive-tikz-network")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-network/"
+                   "tex/latex/tikz-network/")
+             (base32
+              "1bs08sxxps4kjvgv53lc07ihkcaz2v1ygdc16vn46yy5dp16w2sz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-network")
+    (synopsis "Draw networks with TikZ")
+    (description
+     "This package allows the creation of images of complex networks that are
+seamlessly integrated into the underlying LaTeX files.")
+    (license license:gpl3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 599cf2cb461cbbd2dd526039009df31697fc906e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:38:18 +0200
Subject: gnu: Add texlive-tikz-opm.

* gnu/packages/tex.scm (texlive-tikz-opm): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index faa9690290..1ab3ca7171 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4650,6 +4650,24 @@ supported:
 seamlessly integrated into the underlying LaTeX files.")
     (license license:gpl3+)))
 
+(define-public texlive-tikz-opm
+  (package
+    (name "texlive-tikz-opm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-opm/" "tex/latex/tikz-opm/")
+             (base32
+              "0kv26i1lfm9zsvqsajaz9fmz1gv7az3pknk29gg6zwjlg5nxqac3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-opm")
+    (synopsis "Typeset OPM diagrams")
+    (description
+     "This package typesets OPM (Object-Process Methodology) diagrams using
+LaTeX and PGF/TikZ.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 83993f85d7fca99952bfff449998c2ba068795c0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:38:38 +0200
Subject: gnu: Add texlive-tikz-optics.

* gnu/packages/tex.scm (texlive-tikz-optics): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1ab3ca7171..ac23eec299 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4668,6 +4668,27 @@ seamlessly integrated into the underlying LaTeX files.")
 LaTeX and PGF/TikZ.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikz-optics
+  (package
+    (name "texlive-tikz-optics")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-optics/"
+                   "tex/latex/tikz-optics/")
+             (base32
+              "0ii7h57klxq8fjag363wmaaxi9bnds898nl6s1abiqb13pgbmb9n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-optics")
+    (synopsis "Library for drawing optical setups with TikZ")
+    (description
+     "This package provides a new TikZ library designed to easily draw optical
+setups with TikZ.  It provides shapes for lens, mirror, etc.  The
+geometrically (in)correct computation of light rays through the setup is left
+to the user.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From ce8df72ee3a1358df50974147afd721df7ebb43f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:39:06 +0200
Subject: gnu: Add texlive-tikz-page.

* gnu/packages/tex.scm (texlive-tikz-page): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ac23eec299..f7dbc681af 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4689,6 +4689,26 @@ geometrically (in)correct computation of light rays through the setup is left
 to the user.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikz-page
+  (package
+    (name "texlive-tikz-page")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-page/"
+                   "source/latex/tikz-page/"
+                   "tex/latex/tikz-page/")
+             (base32
+              "1ck1jr37wd7mx8irm0niv43pmfy2ix5s08vybai8k0jgpvvwwi1j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-page")
+    (synopsis "Small macro to help building nice and complex layout materials")
+    (description
+     "The package provides a small macro to help building nice and complex
+layout materials.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 85b52eff4ad055cb2fe8863d50f9241b43ad8022 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:39:33 +0200
Subject: gnu: Add texlive-tikz-palattice.

* gnu/packages/tex.scm (texlive-tikz-palattice): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f7dbc681af..a5a8bbdef8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4709,6 +4709,31 @@ to the user.")
 layout materials.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikz-palattice
+  (package
+    (name "texlive-tikz-palattice")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-palattice/"
+                   "tex/latex/tikz-palattice/")
+             (base32
+              "0vbzr6821q88x4yipa9czcqgpwnkzkkzynxxbxyzy1kh9657hqvg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-palattice")
+    (synopsis "Draw particle accelerator lattices with TikZ")
+    (description
+     "This package allows for drawing a map of a particle accelerator just by
+giving a list of elements --- similar to lattice files for simulation
+software.  The package includes 12 common element types like dipoles,
+quadrupoles, cavities, or screens, as well as automatic labels with element
+names, a legend, a rule, and an environment to fade out parts of the
+accelerator.  The coordinate of any element can be saved and used for custom
+TikZ drawings or annotations.  Thereby, lattices can be connected to draw
+injection/extraction or even a complete accelerator facility.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From ec11ac05821764a8870b011d3aa3153d07043997 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:39:47 +0200
Subject: gnu: Add texlive-tikz-planets.

* gnu/packages/tex.scm (texlive-tikz-planets): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a5a8bbdef8..3d3fd7d031 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4734,6 +4734,26 @@ TikZ drawings or annotations.  Thereby, lattices can be connected to draw
 injection/extraction or even a complete accelerator facility.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikz-planets
+  (package
+    (name "texlive-tikz-planets")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-planets/"
+                   "tex/latex/tikz-planets/")
+             (base32
+              "0sgdkcn0li4k48m0fvhdk6j1kjvh6kzgjbq2jjwnzrdxz97s7hig")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-planets")
+    (synopsis "Illustrate celestial mechanics and the solar system")
+    (description
+     "This TikZ-package makes it easy to illustrate celestial mechanics and
+the solar system.  You can use it to draw sketches of the eclipses, the phases
+of the Moon, etc.")
+    (license license:cc-by-sa4.0)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 8ce9487cb104ee9ae58866e0e0357123a90e33a7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:40:00 +0200
Subject: gnu: Add texlive-tikz-qtree.

* gnu/packages/tex.scm (texlive-tikz-qtree): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3d3fd7d031..967eb191e8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4754,6 +4754,29 @@ the solar system.  You can use it to draw sketches of the eclipses, the phases
 of the Moon, etc.")
     (license license:cc-by-sa4.0)))
 
+(define-public texlive-tikz-qtree
+  (package
+    (name "texlive-tikz-qtree")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-qtree/"
+                   "tex/latex/tikz-qtree/")
+             (base32
+              "15w7mr0rhra80rvf4zci2gkd5cy13ijlh64ay0bay87iviwbkn83")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-qtree")
+    (synopsis "Use existing Qtree syntax for trees in TikZ")
+    (description
+     "The package provides a macro for drawing trees with TikZ using the easy
+syntax of Alexis Dimitriadis Qtree.  It improves on TikZ's standard
+tree-drawing facility by laying out tree nodes without collisions; it improves
+on Qtree by adding lots of features from TikZ (for example, edge labels,
+arrows between nodes); and it improves on @code{pst-qtree} in being usable
+with pdfTeX and XeTeX.")
+    (license license:gpl3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 5978c718b24f28e3adbeae102c44eddaa2c6e354 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:40:13 +0200
Subject: gnu: Add texlive-tikz-relay.

* gnu/packages/tex.scm (texlive-tikz-relay): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 967eb191e8..695b5aa564 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4777,6 +4777,30 @@ arrows between nodes); and it improves on @code{pst-qtree} in being usable
 with pdfTeX and XeTeX.")
     (license license:gpl3+)))
 
+(define-public texlive-tikz-relay
+  (package
+    (name "texlive-tikz-relay")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-relay/"
+                   "tex/latex/tikz-relay/")
+             (base32
+              "06q0iamg001lvqmi51j61xbwamgnhiah0aw9qv61n7fnxqpwj66c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-relay")
+    (synopsis "TikZ library for typesetting electrical diagrams")
+    (description
+     "This package contains a collection of symbols for typesetting electrical
+wiring diagrams for relay control systems.  The symbols are meant to be in
+agreement with the international standard IEC-60617 which has been adopted
+worldwide, with perhaps the exception of the USA.  It extends and modifies,
+when needed, the TikZ-libray @code{circuits.ee.IEC}.  A few non-standard
+symbols are also included mainly to be used in presentations, particularly
+with the @code{beamer} package.")
+    (license license:lppl1.0+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From eb3c818ede06eaae2917e9bbe0a75953120b4a94 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:40:33 +0200
Subject: gnu: Add texlive-tikz-sfc.

* gnu/packages/tex.scm (texlive-tikz-sfc): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 695b5aa564..733032b4e4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4801,6 +4801,30 @@ symbols are also included mainly to be used in presentations, particularly
 with the @code{beamer} package.")
     (license license:lppl1.0+)))
 
+(define-public texlive-tikz-sfc
+  (package
+    (name "texlive-tikz-sfc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-sfc/" "tex/latex/tikz-sfc/")
+             (base32
+              "0blgyqvmnbwafx85mz4gkyhk0g0zqfmsd98gm3h794a4jfs3zl31")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-sfc")
+    (synopsis
+     "Symbols collection for typesetting Sequential Function Chart (SFC)
+diagrams")
+    (description
+     "This package contains a collection of symbols for typesetting Sequential
+Function Chart (SFC) diagrams in agreement with the international standard
+IEC-61131-3/2013.  It includes steps (normal and initial), transitions,
+actions and actions qualifiers (with and without time duration).  It extends
+the circuit library of TikZ and allows you to draw an SFC diagram in same way
+you would draw any other circuit.")
+    (license license:lppl1.0+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 9f5c91c1916f0a75581deb57445e24eec2333bec Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:40:54 +0200
Subject: gnu: Add texlive-tikz-swigs.

* gnu/packages/tex.scm (texlive-tikz-swigs): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 733032b4e4..847c5850b5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4825,6 +4825,28 @@ the circuit library of TikZ and allows you to draw an SFC diagram in same way
 you would draw any other circuit.")
     (license license:lppl1.0+)))
 
+(define-public texlive-tikz-swigs
+  (package
+    (name "texlive-tikz-swigs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-swigs/"
+                   "tex/latex/tikz-swigs/")
+             (base32
+              "0brbq02vafaajzrwrkg20gy5k3zlzvv7ycgkw0aa20l8rxjcyv71")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-swigs")
+    (synopsis "Horizontally and vertically split elliptical nodes")
+    (description
+     "This package provides horizontally and vertically split
+elliptical (pairs of) nodes in TikZ.  The package name derives from the fact
+that split ellipses of this type are used to represent Single-World
+Intervention Graph (SWIG) models which are used in counterfactual causal
+inference.")
+    (license (list license:lppl1.3c license:gpl3+))))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 5aae12e6191edcfff233e4d4e297015b81fe7b2f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:41:16 +0200
Subject: gnu: Add texlive-tikz-timing.

* gnu/packages/tex.scm (texlive-tikz-timing): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 847c5850b5..b9850d89d0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4847,6 +4847,30 @@ Intervention Graph (SWIG) models which are used in counterfactual causal
 inference.")
     (license (list license:lppl1.3c license:gpl3+))))
 
+(define-public texlive-tikz-timing
+  (package
+    (name "texlive-tikz-timing")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-timing/"
+                   "source/latex/tikz-timing/"
+                   "tex/latex/tikz-timing/")
+             (base32
+              "19zs6agcli2glm92z8y89nr4049v5sqvnlddbwlwym5rni33kh1m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-ydoc))
+    (propagated-inputs (list texlive-svn-prov))
+    (home-page "https://ctan.org/pkg/tikz-timing")
+    (synopsis "Easy generation of timing diagrams as TikZ pictures")
+    (description
+     "This package provides macros and an environment to generate timing
+diagrams (digital waveforms) without much effort.  The TikZ package is used to
+produce the graphics.  A tabular-like environment is provided to produce
+larger timing diagrams.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From ba7dd1f2d0645990e763a77859b81effd70c933f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:42:04 +0200
Subject: gnu: Add texlive-tikz-trackschematic.

* gnu/packages/tex.scm (texlive-tikz-trackschematic): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b9850d89d0..b7dfb38200 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4871,6 +4871,30 @@ produce the graphics.  A tabular-like environment is provided to produce
 larger timing diagrams.")
     (license license:lppl)))
 
+(define-public texlive-tikz-trackschematic
+  (package
+    (name "texlive-tikz-trackschematic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-trackschematic/"
+                   "tex/latex/tikz-trackschematic/")
+             (base32
+              "11dak88q9n54i385sjk4nxini2fycdfmhs2h41fdf9k2012ykdnx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-trackschematic")
+    (synopsis "TikZ library for creating track diagrams in railways")
+    (description
+     "This TikZ library is a toolbox of symbols geared primarily towards
+creating track schematic for either research or educational purposes.  It
+provides a TikZ frontend to some of the symbols which may be needed to
+describe situations and layouts in railway operation.  The library is divided
+into sublibraries: @code{topology}, @code{trafficcontrol}, @code{vehicles},
+@code{constructions}, @code{electrics}, @code{symbology}, and
+@code{measures}.")
+    (license license:isc)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 2f37314a17a82f289a7d4041e8df5302f8cb1c3e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:42:17 +0200
Subject: gnu: Add texlive-tikz-truchet.

* gnu/packages/tex.scm (texlive-tikz-truchet): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b7dfb38200..e2ce29a402 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4895,6 +4895,26 @@ into sublibraries: @code{topology}, @code{trafficcontrol}, @code{vehicles},
 @code{measures}.")
     (license license:isc)))
 
+(define-public texlive-tikz-truchet
+  (package
+    (name "texlive-tikz-truchet")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikz-truchet/"
+                   "source/latex/tikz-truchet/"
+                   "tex/latex/tikz-truchet/")
+             (base32
+              "1v959iw7swkkam73q759m09s5fcv932gx9d1vqj6n3b2yzxxc85b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikz-truchet")
+    (synopsis "Draw Truchet tiles")
+    (description
+     "This is a package for LaTeX that draws Truchet tiles, as used in Colin
+Beveridge's article Too good to be Truchet in issue 08 of Chalkdust.")
+    (license license:expat)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 06d305cef29d7d39d13239bb6dfc8163f34176dc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:42:33 +0200
Subject: gnu: Add texlive-tikzbricks.

* gnu/packages/tex.scm (texlive-tikzbricks): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e2ce29a402..7bcc6cc609 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4915,6 +4915,25 @@ into sublibraries: @code{topology}, @code{trafficcontrol}, @code{vehicles},
 Beveridge's article Too good to be Truchet in issue 08 of Chalkdust.")
     (license license:expat)))
 
+(define-public texlive-tikzbricks
+  (package
+    (name "texlive-tikzbricks")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzbricks/"
+                   "tex/latex/tikzbricks/")
+             (base32
+              "1wf5hdwpprbbxmd0rrwvk54raiwpv4q6qgd2gpbba6d26bmgjd1w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzbricks")
+    (synopsis "Drawing bricks with TikZ")
+    (description
+     "This package provides a small LaTeX package to draw bricks with TikZ.
+The user can modify color, shape, and viewpoint.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From cdfd9745dd3cc6c715a3087ef2ec58e6d5a5cf14 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:43:08 +0200
Subject: gnu: Add texlive-tikzcodeblocks.

* gnu/packages/tex.scm (texlive-tikzcodeblocks): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7bcc6cc609..04795d75a5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4934,6 +4934,25 @@ Beveridge's article Too good to be Truchet in issue 08 of Chalkdust.")
 The user can modify color, shape, and viewpoint.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tikzcodeblocks
+  (package
+    (name "texlive-tikzcodeblocks")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzcodeblocks/"
+                   "tex/latex/tikzcodeblocks/")
+             (base32
+              "04c8bjl3l97vsh7cydbh20wnq93my19avkhcf4kh0g5cvq02nizp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzcodeblocks")
+    (synopsis "Helps to draw codeblocks like Scratch, NEPO and PXT in TikZ")
+    (description
+     "@code{tikzcodeblocks} is a LaTeX package for typesetting blockwise
+graphic programming languages like Scratch, NEPO or PXT.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 7db6b07aa3a5729c926ccc3c6bbc168679d8289e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:43:21 +0200
Subject: gnu: Add texlive-tikzducks.

* gnu/packages/tex.scm (texlive-tikzducks): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 04795d75a5..501cbf9a38 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4953,6 +4953,24 @@ The user can modify color, shape, and viewpoint.")
 graphic programming languages like Scratch, NEPO or PXT.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tikzducks
+  (package
+    (name "texlive-tikzducks")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/tikzducks/"
+                   "tex/generic/tikzducks/")
+             (base32
+              "08gigdsi0gc0npv2jrd2i0yqs53s0ckwk1m0lrsiaxk66bb864y3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzducks")
+    (synopsis "Package for using rubber ducks in TikZ")
+    (description
+     "The package is a LaTeX package for ducks to be used in TikZ pictures.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 3d5d0eb44f7e4cc96d0fab585e9cc581d518f402 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:43:34 +0200
Subject: gnu: Add texlive-tikzfill.

* gnu/packages/tex.scm (texlive-tikzfill): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 501cbf9a38..23ead1e0a5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4971,6 +4971,26 @@ graphic programming languages like Scratch, NEPO or PXT.")
      "The package is a LaTeX package for ducks to be used in TikZ pictures.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tikzfill
+  (package
+    (name "texlive-tikzfill")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzfill/" "tex/latex/tikzfill/")
+             (base32
+              "0n2hnnw4ffafwd9yy6pzcv0pc580y28dvz93g4hbi25dz32sawmk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzfill")
+    (synopsis "TikZ libraries for filling with images and patterns")
+    (description
+     "This is a collection of TikZ libraries which add further options to fill
+TikZ paths with images and patterns.  The libraries comprise fillings with
+images from files and from TikZ pictures.  Also, patterns of hexagons and of
+rhombi are provided.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From ac5edde4cd69b83a3af9c7dbc85589ce285b444b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:43:45 +0200
Subject: gnu: Add texlive-tikzinclude.

* gnu/packages/tex.scm (texlive-tikzinclude): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 23ead1e0a5..aefe1cd816 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4991,6 +4991,26 @@ images from files and from TikZ pictures.  Also, patterns of hexagons and of
 rhombi are provided.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikzinclude
+  (package
+    (name "texlive-tikzinclude")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzinclude/"
+                   "source/latex/tikzinclude/"
+                   "tex/latex/tikzinclude/")
+             (base32
+              "0mcgzbfvj6pksr18813kpnknkdpzlyi0rncbn9g11ac0g0lyzgqq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzinclude")
+    (synopsis "Import TikZ images from colletions")
+    (description
+     "The package addresses the problem of importing only one TikZ-image from
+a file holding multiple images.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 6db56920bd109825873457efec27b3ad774de01b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:44:25 +0200
Subject: gnu: Add texlive-tikzlings.

* gnu/packages/tex.scm (texlive-tikzlings): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index aefe1cd816..13780bb601 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5011,6 +5011,29 @@ rhombi are provided.")
 a file holding multiple images.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikzlings
+  (package
+    (name "texlive-tikzlings")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzlings/"
+                   "tex/latex/tikzlings/")
+             (base32
+              "0cqja06i3s8w3wbz6dhlhbri1zhqsyh8jhyahi5v8q9ywdm389yd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzlings")
+    (synopsis "Collection of cute little animals and similar creatures")
+    (description
+     "This package provides a collection of LaTeX packages for drawing cute
+little animals and similar creatures using TikZ.  Currently, the following
+TikZlings are included: anteater, bat, bear, bee, bug, cat, chicken, coati,
+elephant, hippo, koala, marmot, mole, mouse, owl, panda, penguin, pig, rhino,
+sheep, sloth, snowman, squirrel, and wolf.  These little drawings can be
+customized in many ways.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From b498a1baf4c3a28291e3132b9c7f44d0f276bc6c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:44:43 +0200
Subject: gnu: Add texlive-tikzmark.

* gnu/packages/tex.scm (texlive-tikzmark): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 13780bb601..19dff79a13 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5034,6 +5034,27 @@ sheep, sloth, snowman, squirrel, and wolf.  These little drawings can be
 customized in many ways.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tikzmark
+  (package
+    (name "texlive-tikzmark")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzmark/"
+                   "source/latex/tikzmark/"
+                   "tex/latex/tikzmark/")
+             (base32
+              "0m3yij12kgbgficln9vdgc43bi0si7j0j86lv2k69f1bwf865w4z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzmark")
+    (synopsis "Use TikZ's method of remembering a position on a page")
+    (description
+     "The @code{tikzmark} package defines a command to remember a position on
+a page for later (or earlier) use, primarily (but not exclusively) with
+TikZ.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From ef145ab2bab9cb7e6d51e62888a6793a73377b7f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:44:59 +0200
Subject: gnu: Add texlive-tikzmarmots.

* gnu/packages/tex.scm (texlive-tikzmarmots): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 19dff79a13..180c8358e0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5055,6 +5055,26 @@ a page for later (or earlier) use, primarily (but not exclusively) with
 TikZ.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tikzmarmots
+  (package
+    (name "texlive-tikzmarmots")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzmarmots/"
+                   "tex/latex/tikzmarmots/")
+             (base32
+              "0j1z78r43czg09inw76ksgs97l7klivi93w7hvcvafd47h9zcvsg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzmarmots")
+    (synopsis "Drawing little marmots in TikZ")
+    (description
+     "This is a LaTeX package for marmots to be used in TikZ pictures.
+These little figures are constructed in such a way that they may even borrow
+some garments and other attributes from the TikZducks.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From ac54214b47c523914ee64619f297e96218fd48c8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:45:14 +0200
Subject: gnu: Add texlive-tikzorbital.

* gnu/packages/tex.scm (texlive-tikzorbital): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 180c8358e0..fe6061377c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5075,6 +5075,25 @@ These little figures are constructed in such a way that they may even borrow
 some garments and other attributes from the TikZducks.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tikzorbital
+  (package
+    (name "texlive-tikzorbital")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzorbital/"
+                   "tex/latex/tikzorbital/")
+             (base32
+              "0rjbl8gcsf752hkrn2j7angvwh55vldsd168w581frmx3g25d9rb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzorbital")
+    (synopsis "Atomic and molecular orbitals using TikZ")
+    (description
+     "This package draws atomic s, p and d orbitals, as well as molecular
+orbital diagrams.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 4453529a9c12472bf29a25ca1ef7f1491c4c7d05 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:45:37 +0200
Subject: gnu: Add texlive-tikzpackets.

* gnu/packages/tex.scm (texlive-tikzpackets): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fe6061377c..0b2f34b586 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5094,6 +5094,24 @@ some garments and other attributes from the TikZducks.")
 orbital diagrams.")
     (license license:lppl)))
 
+(define-public texlive-tikzpackets
+  (package
+    (name "texlive-tikzpackets")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzpackets/"
+                   "tex/latex/tikzpackets/")
+             (base32
+              "0i5v0yblm3fw0wy0vhl2a0g1r8ib72d2knk60apqvqizl98fn8ff")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzpackets")
+    (synopsis "Display network packets")
+    (description
+     "This package allows you to easily display network packets graphically.")
+    (license license:expat)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 40d9b08a97bb26fad1115e09b494c1ce80c49d5b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:45:55 +0200
Subject: gnu: Add texlive-tikzpagenodes.

* gnu/packages/tex.scm (texlive-tikzpagenodes): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0b2f34b586..c36193c4f1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5112,6 +5112,28 @@ orbital diagrams.")
      "This package allows you to easily display network packets graphically.")
     (license license:expat)))
 
+(define-public texlive-tikzpagenodes
+  (package
+    (name "texlive-tikzpagenodes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzpagenodes/"
+                   "source/latex/tikzpagenodes/"
+                   "tex/latex/tikzpagenodes/")
+             (base32
+              "13ddkwm4a1x2b47zqjk2m55y2dwl09rl3s0pm1vmxv7h2sawgqbr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-ydoc))
+    (home-page "https://ctan.org/pkg/tikzpagenodes")
+    (synopsis "Single TikZ node for the whole page")
+    (description
+     "The package provides special PGF/TikZ nodes for the text, marginpar,
+footer and header area of the current page.  They are inspired by the current
+page node defined by PGF/TikZ itself.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From b53b09a9763c5999575d6c07ac0b03a1fe0d63f4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:46:07 +0200
Subject: gnu: Add texlive-tikzpeople.

* gnu/packages/tex.scm (texlive-tikzpeople): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c36193c4f1..35562189cc 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5134,6 +5134,29 @@ footer and header area of the current page.  They are inspired by the current
 page node defined by PGF/TikZ itself.")
     (license license:lppl)))
 
+(define-public texlive-tikzpeople
+  (package
+    (name "texlive-tikzpeople")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzpeople/"
+                   "tex/latex/tikzpeople/")
+             (base32
+              "1sgxabjy54zcw0dkb5hgi9d84ilq4ik30xwwd1n8jhhmi4vg2sm7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzpeople")
+    (synopsis "Draw people-shaped nodes in TikZ")
+    (description
+     "This package provides people-shaped nodes in the style of Microsoft
+Visio clip art, to be used with TikZ.  The available, highly customizable,
+node shapes are: alice, bob, bride, builder, businessman, charlie, chef,
+conductor, cowboy, criminal, dave, devil, duck, graduate, groom, guard,
+jester, judge, maninblack, mexican, nun, nurse, physician, pilot, police,
+priest, sailor, santa, surgeon.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 677f5556c140161b956c2cd7de129abb2dd1426e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:46:28 +0200
Subject: gnu: Add texlive-tikzpfeile.

* gnu/packages/tex.scm (texlive-tikzpfeile): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 35562189cc..ee21592061 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5157,6 +5157,29 @@ jester, judge, maninblack, mexican, nun, nurse, physician, pilot, police,
 priest, sailor, santa, surgeon.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikzpfeile
+  (package
+    (name "texlive-tikzpfeile")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzpfeile/"
+                   "source/latex/tikzpfeile/"
+                   "tex/latex/tikzpfeile/")
+             (base32
+              "0h6kkrm462hk2hvbdqqjai3gxsslibghxbjyq3ih0vps7fakglc6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzpfeile")
+    (synopsis "Draw arrows using PGF/TikZ")
+    (description
+     "In a document with a lot of diagrams created with PGF/TikZ, there is
+a possibility of the reader being distracted by different sorts of arrowheads
+in the diagrams and in the text (as, e.g., in @code{\\rightarrow}).  The
+package defines macros to create all arrows using PGF/TikZ, so as to avoid the
+problem.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 120b01a2194d905ac34e289fac3764c6a81312f8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:47:04 +0200
Subject: gnu: Add texlive-tikzpingus.

* gnu/packages/tex.scm (texlive-tikzpingus): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ee21592061..35938f970c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5180,6 +5180,27 @@ package defines macros to create all arrows using PGF/TikZ, so as to avoid the
 problem.")
     (license license:lppl)))
 
+(define-public texlive-tikzpingus
+  (package
+    (name "texlive-tikzpingus")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzpingus/"
+                   "makeindex/tikzpingus/"
+                   "tex/latex/tikzpingus/")
+             (base32
+              "0cqswzdmp2154wdb9ljbqqinf9vh6vhpjn7b4adfj7sr8xji7ihj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzpingus")
+    (synopsis "Penguins with TikZ")
+    (description
+     "@code{tikzpingus} is a package similar to tikzducks but with penguins
+and a vast set of gadgets and extras (capable of changing the wing-positions,
+body-types, and more).")
+    (license license:gpl3)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 681513a2510cdacf4dead04f6fd69a532c57432d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:47:23 +0200
Subject: gnu: Add texlive-tikzposter.

* gnu/packages/tex.scm (texlive-tikzposter): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 35938f970c..5ec6e6a1bb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5201,6 +5201,27 @@ and a vast set of gadgets and extras (capable of changing the wing-positions,
 body-types, and more).")
     (license license:gpl3)))
 
+(define-public texlive-tikzposter
+  (package
+    (name "texlive-tikzposter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzposter/"
+                   "source/latex/tikzposter/"
+                   "tex/latex/tikzposter/")
+             (base32
+              "0hl5p14a79575s5n5rx4yy8vxcb2qrdhx851rhms7dk2sqcfynn5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzposter")
+    (synopsis "Create scientific posters using TikZ")
+    (description
+     "This package provides a document class provides a simple way of using
+TikZ for generating posters.  Several formatting options are available, and
+spacing and layout of the poster is to a large extent automated.")
+    (license license:lppl1.2+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 3251b54d522c541083034500c47834d8a2fa32b5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:47:35 +0200
Subject: gnu: Add texlive-tikzscale.

* gnu/packages/tex.scm (texlive-tikzscale): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5ec6e6a1bb..8f0df0db52 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5222,6 +5222,27 @@ TikZ for generating posters.  Several formatting options are available, and
 spacing and layout of the poster is to a large extent automated.")
     (license license:lppl1.2+)))
 
+(define-public texlive-tikzscale
+  (package
+    (name "texlive-tikzscale")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzscale/"
+                   "source/latex/tikzscale/"
+                   "tex/latex/tikzscale/")
+             (base32
+              "1iq7f9jnw86rhp7b3sim3z56ygj005zygzfc0bdnpmx5s4ds1gpv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzscale")
+    (synopsis "Resize pictures while respecting text size")
+    (description
+     "The package extends the @code{\\includegraphics} command to support
+@code{tikzpicture} environments.  It allows scaling of TikZ images and
+PGFPlots to a given width or height without changing the text size.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 15c3f3f6e3d95153fab6a279be5523596ba6d4b9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:47:51 +0200
Subject: gnu: Add texlive-tikzsymbols.

* gnu/packages/tex.scm (texlive-tikzsymbols): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8f0df0db52..d3970706ef 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5243,6 +5243,25 @@ spacing and layout of the poster is to a large extent automated.")
 PGFPlots to a given width or height without changing the text size.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tikzsymbols
+  (package
+    (name "texlive-tikzsymbols")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzsymbols/"
+                   "source/latex/tikzsymbols/"
+                   "tex/latex/tikzsymbols/")
+             (base32
+              "0q19w9adpfxrsh7jmf4qpjarhgb4wng66kjkmalcxijd99kxbkhk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzsymbols")
+    (synopsis "Some symbols created using TikZ")
+    (description
+     "The package provides various emoticons, cooking symbols and trees.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From ba81602c2449f05dc025b24afc4311abfed78bb6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:48:06 +0200
Subject: gnu: Add texlive-tikztosvg.

* gnu/packages/tex.scm (texlive-tikztosvg): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d3970706ef..bae8719be1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5262,6 +5262,28 @@ PGFPlots to a given width or height without changing the text size.")
      "The package provides various emoticons, cooking symbols and trees.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tikztosvg
+  (package
+    (name "texlive-tikztosvg")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/tikztosvg.1"
+                   "doc/man/man1/tikztosvg.man1.pdf"
+                   "doc/support/tikztosvg/"
+                   "scripts/tikztosvg/")
+             (base32
+              "1h1g3vsljx3bz929krr21i65n20drwhwxi88gwcvrxrgsvi9xj08")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "tikztosvg")))
+    (home-page "https://ctan.org/pkg/tikztosvg")
+    (synopsis "Utility for rendering TikZ diagrams to SVG")
+    (description
+     "This package provides a shell script that calls XeTeX and
+@command{pdf2svg} to convert TikZ environments to SVG files.")
+    (license license:gpl3)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 0c82291f453f48eb3123bbeb7397f9069328d631 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:48:26 +0200
Subject: gnu: Add texlive-tikzviolinplots.

* gnu/packages/tex.scm (texlive-tikzviolinplots): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bae8719be1..c1b5c0b507 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5284,6 +5284,28 @@ PGFPlots to a given width or height without changing the text size.")
 @command{pdf2svg} to convert TikZ environments to SVG files.")
     (license license:gpl3)))
 
+(define-public texlive-tikzviolinplots
+  (package
+    (name "texlive-tikzviolinplots")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tikzviolinplots/"
+                   "tex/latex/tikzviolinplots/")
+             (base32
+              "1cm1pcv4x9qpsxghvxv1w212j8p37g5miqn73d5xwy0vaqhd0hhz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tikzviolinplots")
+    (synopsis "Draws violin plots from data")
+    (description
+     "This package enables the user to draw violin plots, calculating the
+kernel density estimation from the data and plotting the resulting curve
+inside a @code{tikzpicture} environment.  It supports different kernels, and
+allows the user to either set the bandwidth value for each plot or use
+a default value.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From fbe85bb6fd082a67e5b8321f03c776b7dd1774a9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:48:39 +0200
Subject: gnu: Add texlive-tile-graphic.

* gnu/packages/tex.scm (texlive-tile-graphic): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c1b5c0b507..657b41244e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5306,6 +5306,28 @@ allows the user to either set the bandwidth value for each plot or use
 a default value.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tile-graphic
+  (package
+    (name "texlive-tile-graphic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tile-graphic/"
+                   "source/latex/tile-graphic/"
+                   "tex/latex/tile-graphic/")
+             (base32
+              "1vg2nrb6cjgkmbkv8igs76vzl1vzvisqlm1y612j4144v26n05nw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tile-graphic")
+    (synopsis "Create tiles of a graphical file")
+    (description
+     "This package breaks a given graphical file into @samp{n} rows and
+@samp{m} columns of subgraphics, which are called tiles.  The tiles can be
+written separately to individual PDF files, or packaged into a single PDF
+file.")
+    (license license:lppl1.2+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 426f8595fb490513d86014a1daab8aa0f8702065 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:49:24 +0200
Subject: gnu: Add texlive-timing-diagrams.

* gnu/packages/tex.scm (texlive-timing-diagrams): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 657b41244e..b7464e6668 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5328,6 +5328,25 @@ written separately to individual PDF files, or packaged into a single PDF
 file.")
     (license license:lppl1.2+)))
 
+(define-public texlive-timing-diagrams
+  (package
+    (name "texlive-timing-diagrams")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/timing-diagrams/"
+                   "tex/latex/timing-diagrams/")
+             (base32
+              "06hzcbbinrlvdsp9jxs82xi9b94x76f239z5b1x3y41ip3n51b1p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/timing-diagrams")
+    (synopsis "Draw timing diagrams")
+    (description
+     "The package provides commands to draw and annotate various kinds of
+timing diagrams, using TikZ.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 524afd725972d834c1ee2d9f6f9f03b98587f7ff Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:50:02 +0200
Subject: gnu: Add texlive-tipfr.

* gnu/packages/tex.scm (texlive-tipfr): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b7464e6668..b3a9802330 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5347,6 +5347,25 @@ file.")
 timing diagrams, using TikZ.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tipfr
+  (package
+    (name "texlive-tipfr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tipfr/" "tex/latex/tipfr/")
+             (base32
+              "1frgk49mw7wi18065y4ikg75vg03d2vbdflfnyanixn46zpf2p8z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tipfr")
+    (synopsis "Produces calculator's keys with the help of TikZ")
+    (description
+     "The package provides commands to draw calculator keys with the help of
+TikZ.  It also provides commands to draw the content of screens and of menu
+items.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 606ce23f3583e5e4ddb8610b7505a8bf6c6d4fa6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:50:26 +0200
Subject: gnu: Add texlive-tkz-base.

* gnu/packages/tex.scm (texlive-tkz-base): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b3a9802330..b3ab5203c5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5366,6 +5366,24 @@ TikZ.  It also provides commands to draw the content of screens and of menu
 items.")
     (license license:lppl)))
 
+(define-public texlive-tkz-base
+  (package
+    (name "texlive-tkz-base")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tkz-base/" "tex/latex/tkz-base/")
+             (base32
+              "0mi76p1ykifhmgzwmlkiwwq47s427n1flakiyad60dzyw953cg86")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tkz-base")
+    (synopsis "Tools for drawing with a cartesian coordinate system")
+    (description
+     "The bundle is a set of packages, designed to give mathematics
+teachers (and students) easy access to programming of drawings with TikZ.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 4ff396a886b86f839546e90efc5f3244ff6edf91 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:50:42 +0200
Subject: gnu: Add texlive-tkz-berge.

* gnu/packages/tex.scm (texlive-tkz-berge): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b3ab5203c5..0ea99d2940 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5384,6 +5384,26 @@ items.")
 teachers (and students) easy access to programming of drawings with TikZ.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tkz-berge
+  (package
+    (name "texlive-tkz-berge")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tkz-berge/" "tex/latex/tkz-berge/")
+             (base32
+              "16pgdkf0s97gkd662pddvxr5jbk68mcbikz4rclmv88d9zlgccxr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tkz-berge")
+    (synopsis "Macros for drawing graphs of graph theory")
+    (description
+     "The package provides a collection of useful macros for drawing classic
+graphs of graph theory, or to make other graphs.  This package has been taken
+temporarily out of circulation to give the author time to investigate some
+problems.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 3f5b28387559bd5fc7e050a2ea8b86e38a9b8a0a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:50:56 +0200
Subject: gnu: Add texlive-tkz-doc.

* gnu/packages/tex.scm (texlive-tkz-doc): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0ea99d2940..3c96f8f73b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5404,6 +5404,26 @@ temporarily out of circulation to give the author time to investigate some
 problems.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tkz-doc
+  (package
+    (name "texlive-tkz-doc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tkz-doc/")
+             (base32
+              "00awi2m8ak949r6bxzw1l69fx8gjcn4kmrr0q0yp8qghga40c6n3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tkz-doc")
+    (synopsis "Documentation macros for the TKZ series of packages")
+    (description
+     "This bundle offers a documentation class (@code{tkz-doc}) and
+a package (@code{tkzexample}).  These files are used in the documentation of
+the author's packages @code{tkz-base}, @code{tkz-euclide}, @code{tkz-fct},
+@code{tkz-linknodes}, and @code{tkz-tab}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 83341d33ff14e0c7fe71a6a7d97c4d5dbca332fa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:51:11 +0200
Subject: gnu: Add texlive-tkz-euclide.

* gnu/packages/tex.scm (texlive-tkz-euclide): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3c96f8f73b..b3e70ee2e6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5424,6 +5424,26 @@ the author's packages @code{tkz-base}, @code{tkz-euclide}, @code{tkz-fct},
 @code{tkz-linknodes}, and @code{tkz-tab}.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tkz-euclide
+  (package
+    (name "texlive-tkz-euclide")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tkz-euclide/"
+                   "tex/latex/tkz-euclide/")
+             (base32
+              "0ykhhyvrjy2q731m8dm2k73kiddy1xnznhsayyid4yjjnwdqq1bw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tkz-euclide")
+    (synopsis "Tools for drawing Euclidean geometry")
+    (description
+     "The @code{tkz-euclide} package is a set of files designed to give math
+teachers and students easy access to the programming of Euclidean geometry
+with TikZ.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 2039548b6608891780571de851a38a6c52a38239 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:51:24 +0200
Subject: gnu: Add texlive-tkz-fct.

* gnu/packages/tex.scm (texlive-tkz-fct): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b3e70ee2e6..12672cc4e3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5444,6 +5444,25 @@ teachers and students easy access to the programming of Euclidean geometry
 with TikZ.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tkz-fct
+  (package
+    (name "texlive-tkz-fct")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tkz-fct/" "tex/latex/tkz-fct/")
+             (base32
+              "0czwqkdws24qdp22s6p3m87fpfqmwdqjzwxckzkn3ig6rcl63nqj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tkz-fct")
+    (synopsis "Tools for drawing graphs of functions")
+    (description
+     "The @code{tkz-fct} package is designed to give math teachers (and
+students) easy access to programming graphs of functions with TikZ and
+Gnuplot.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 4f00f57e301313d8e37c57b258f30389dee92cb9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:51:42 +0200
Subject: gnu: Add texlive-tkz-graph.

* gnu/packages/tex.scm (texlive-tkz-graph): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 12672cc4e3..20db166f80 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5463,6 +5463,25 @@ students) easy access to programming graphs of functions with TikZ and
 Gnuplot.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tkz-graph
+  (package
+    (name "texlive-tkz-graph")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tkz-graph/"
+                   "tex/latex/tkz-graph/")
+             (base32
+              "1mdfdi97d8q7jqy7l3pqqs7ai4ph5r1aci3ahfsg5zmpmkwr981r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tkz-graph")
+    (synopsis "Draw graph-theory graphs")
+    (description
+     "The package is designed to create graph diagrams as simply as possible,
+using TikZ.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 667d5bc9fcdb299da5637bb79d2d59b0c301ef82 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:51:54 +0200
Subject: gnu: Add texlive-tkz-orm.

* gnu/packages/tex.scm (texlive-tkz-orm): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 20db166f80..5302481953 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5482,6 +5482,24 @@ Gnuplot.")
 using TikZ.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tkz-orm
+  (package
+    (name "texlive-tkz-orm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tkz-orm/" "tex/latex/tkz-orm/")
+             (base32
+              "0qmwiglz59djq0xkpsfgqzdf6872z33z9faxn86krs5mxmrik6cc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tkz-orm")
+    (synopsis "Create Object-Role Model (ORM) diagrams")
+    (description
+     "The package provides styles for drawing Object-Role Model (ORM) diagrams
+in TeX based on the PGF and TikZ picture environment.")
+    (license (list license:gpl2 license:lppl1.3+))))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From bd6330f65b5e9c0f11675f856b047acaf530eb00 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:53:20 +0200
Subject: gnu: Add texlive-tkz-tab.

* gnu/packages/tex.scm (texlive-tkz-tab): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5302481953..e28aff9b09 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5500,6 +5500,25 @@ using TikZ.")
 in TeX based on the PGF and TikZ picture environment.")
     (license (list license:gpl2 license:lppl1.3+))))
 
+(define-public texlive-tkz-tab
+  (package
+    (name "texlive-tkz-tab")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tkz-tab/" "tex/latex/tkz-tab/")
+             (base32
+              "0j50pf0lf9dbi0zfnqm62rlyazsgbmpcqwlajqsjccqqkirdv6pb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tkz-tab")
+    (synopsis "Tables of signs and variations using PGF/TikZ")
+    (description
+     "The package provides comprehensive facilities for preparing lists of
+signs and variations, using PGF.  This package has been taken temporarily out
+of circulation to give the author time to investigate some problems.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 17f9177e87dc02f43cd1ff3c2ac656caede29a4d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:53:48 +0200
Subject: gnu: Add texlive-tkzexample.

* gnu/packages/tex.scm (texlive-tkzexample): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e28aff9b09..bce4dda1c5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5519,6 +5519,25 @@ signs and variations, using PGF.  This package has been taken temporarily out
 of circulation to give the author time to investigate some problems.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tkzexample
+  (package
+    (name "texlive-tkzexample")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tkzexample/"
+                   "tex/latex/tkzexample/")
+             (base32
+              "1y445fjvy13cqa9y1sbac43wbmidvfn7vb7jws11fl4lj7vvgvhz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tkzexample")
+    (synopsis "Package for the documentation of all @samp{tkz-} packages")
+    (description
+     "This package is needed to compile the documentation of all @samp{tkz-}
+packages (like @code{tkz-euclide}).")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From ffcd953c3745aba9604837b01efb83a627372496 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:54:15 +0200
Subject: gnu: Add texlive-tonevalue.

* gnu/packages/tex.scm (texlive-tonevalue): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bce4dda1c5..3b0c7db5e1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5538,6 +5538,27 @@ of circulation to give the author time to investigate some problems.")
 packages (like @code{tkz-euclide}).")
     (license license:lppl1.3+)))
 
+(define-public texlive-tonevalue
+  (package
+    (name "texlive-tonevalue")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tonevalue/"
+                   "tex/latex/tonevalue/")
+             (base32
+              "16a724k0c8s3i2pdjfsq5v2z4v5nqdpnxvh63j4ngj822w9llg1z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tonevalue")
+    (synopsis
+     "Tool for linguists and phoneticians to visualize tone value patterns")
+    (description
+     "This package provides a TikZ-based solution to typeset visualisations of
+tone values.  Currently, unt's model is implemented.  Support for more models
+is planned.")
+    (license license:asl2.0)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 4649e211c2ef7a736290430fd1fad2e046be112d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:55:11 +0200
Subject: gnu: Add texlive-tqft.

* gnu/packages/tex.scm (texlive-tqft): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3b0c7db5e1..f879250ce3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5559,6 +5559,27 @@ tone values.  Currently, unt's model is implemented.  Support for more models
 is planned.")
     (license license:asl2.0)))
 
+(define-public texlive-tqft
+  (package
+    (name "texlive-tqft")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tqft/" "source/latex/tqft/"
+                   "tex/latex/tqft/")
+             (base32
+              "08lykpnw0hifhmh96pb7s3dd8sbzmz3gqyrwy5ann9fqxxjczf2d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tqft")
+    (synopsis "Drawing TQFT diagrams with TikZ/PGF")
+    (description
+     "The package defines some node shapes useful for drawing TQFT diagrams
+with TikZ/PGF.  That is, it defines highly customisable shapes that look like
+cobordisms between circles, such as those used in TQFT and other mathematical
+diagrams.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 8332766a60580a9b9cb4bc681f763751a482d0e7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:55:45 +0200
Subject: gnu: Add texlive-tsemlines.

* gnu/packages/tex.scm (texlive-tsemlines): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f879250ce3..c92ab4eeb9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5580,6 +5580,25 @@ cobordisms between circles, such as those used in TQFT and other mathematical
 diagrams.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tsemlines
+  (package
+    (name "texlive-tsemlines")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/latex/tsemlines/")
+             (base32
+              "1c7sjdrgqbjw6f2s3185k5rlkig643pkkahjisx16h0akbbdm4k3")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tsemlines")
+    (synopsis "Support for the ancient @code{\\emline} macro")
+    (description
+     "Occasional Documents appear, that use graphics generated by TeXcad from
+the EmTeX distribution.  These documents often use the @code{\\emline} macro,
+which produced lines at an arbitrary orientation.  The present package
+emulates the macro, using TikZ.")
+    (license license:public-domain)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From ce5395416c59b5be99df936eb37b08240246cbe8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:56:13 +0200
Subject: gnu: Add texlive-twemojis.

* gnu/packages/tex.scm (texlive-twemojis): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c92ab4eeb9..cd302d60c1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5599,6 +5599,27 @@ which produced lines at an arbitrary orientation.  The present package
 emulates the macro, using TikZ.")
     (license license:public-domain)))
 
+(define-public texlive-twemojis
+  (package
+    (name "texlive-twemojis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/twemojis/"
+                   "source/latex/twemojis/"
+                   "tex/latex/twemojis/")
+             (base32
+              "0wim1325dcx779305cany8rsifi67y8pbwifs4qbh090dzx5sy6r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/twemojis")
+    (synopsis "Use Twitter's open source emojis through LaTeX commands")
+    (description
+     "This package provides a simple wrapper which allows to use Twitter's
+open source emojis through LaTeX commands.  This relies on images, so no fancy
+Unicode font stuff is needed and it should work on every installation.")
+    (license (list license:lppl1.3+ license:cc-by4.0))))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From f2b8f7f7e1da06f8a1b58bf763d4b6c23abf1f40 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:56:51 +0200
Subject: gnu: Add texlive-tzplot.

* gnu/packages/tex.scm (texlive-tzplot): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cd302d60c1..31e510dc40 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5620,6 +5620,27 @@ open source emojis through LaTeX commands.  This relies on images, so no fancy
 Unicode font stuff is needed and it should work on every installation.")
     (license (list license:lppl1.3+ license:cc-by4.0))))
 
+(define-public texlive-tzplot
+  (package
+    (name "texlive-tzplot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tzplot/" "tex/latex/tzplot/")
+             (base32
+              "09k84vjvl3qkp8jffv3j5bksq3jaad2p71yj715z39qf36hwvm7s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tzplot")
+    (synopsis "Plot graphs with TikZ abbreviations")
+    (description
+     "This is a LaTeX package that provides TikZ-based macros to make it easy
+to draw graphs.  The macros provided in this package are just abbreviations
+for TikZ codes, which can be complicated; but using the package will hopefully
+make drawing easier, especially when drawing repeatedly.  The macros were
+chosen and developed with an emphasis on drawing graphs in economics.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From d7e9410cf551fabfb5b9b48befe93920d61e8635 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:57:09 +0200
Subject: gnu: Add texlive-utfsym.

* gnu/packages/tex.scm (texlive-utfsym): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 31e510dc40..9425c03f8e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5641,6 +5641,24 @@ make drawing easier, especially when drawing repeatedly.  The macros were
 chosen and developed with an emphasis on drawing graphs in economics.")
     (license license:lppl1.3c)))
 
+(define-public texlive-utfsym
+  (package
+    (name "texlive-utfsym")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/utfsym/" "tex/latex/utfsym/")
+             (base32
+              "0bbdhi9fy3bzm9qrjca8ghl04pv9iky380if17w1hxhp2jpd691b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/utfsym")
+    (synopsis "Provides various Unicode symbols")
+    (description
+     "This package provides various symbols from the Unicode in order to be
+able to use them originally in a school setting such as on worksheets.")
+    (license license:cc0)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 38c5aa989b8c1151257a82a00fcd3adfd3557c4b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:57:24 +0200
Subject: gnu: Add texlive-venndiagram.

* gnu/packages/tex.scm (texlive-venndiagram): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9425c03f8e..227b92d0d5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5659,6 +5659,26 @@ chosen and developed with an emphasis on drawing graphs in economics.")
 able to use them originally in a school setting such as on worksheets.")
     (license license:cc0)))
 
+(define-public texlive-venndiagram
+  (package
+    (name "texlive-venndiagram")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/venndiagram/"
+                   "source/latex/venndiagram/"
+                   "tex/latex/venndiagram/")
+             (base32
+              "1n48jgb0kbbnyk5pjg99l8hb1b3f1h30z78cl9lza2pi11p8mbgj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/venndiagram")
+    (synopsis "Creating Venn diagrams with TikZ")
+    (description
+     "The package assists generation of simple two- and three-set Venn
+diagrams for lectures or assignment sheets.")
+    (license license:lppl)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From c9e021cd16098090ac245f5851127f975f4fc290 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:57:41 +0200
Subject: gnu: Add texlive-visualpstricks.

* gnu/packages/tex.scm (texlive-visualpstricks): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 227b92d0d5..4e02b1f6ae 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5679,6 +5679,24 @@ able to use them originally in a school setting such as on worksheets.")
 diagrams for lectures or assignment sheets.")
     (license license:lppl)))
 
+(define-public texlive-visualpstricks
+  (package
+    (name "texlive-visualpstricks")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/visualpstricks/")
+             (base32
+              "1wfri908smlw1ngqq1mjll2b80b29piicqmv67x0xs1v3kc2sz3s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/visualpstricks")
+    (synopsis "Visual help for PSTricks based on images with minimum text")
+    (description
+     "Visual help for PSTricks based on images with minimum text, one image
+per command or per parameter.")
+    (license license:gpl3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 71c2a9ae703fce4650b10af8b7d93d58589af7cb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:58:47 +0200
Subject: gnu: Add texlive-wheelchart.

* gnu/packages/tex.scm (texlive-wheelchart): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4e02b1f6ae..4e92807729 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5697,6 +5697,26 @@ diagrams for lectures or assignment sheets.")
 per command or per parameter.")
     (license license:gpl3+)))
 
+(define-public texlive-wheelchart
+  (package
+    (name "texlive-wheelchart")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/wheelchart/"
+                   "tex/latex/wheelchart/")
+             (base32
+              "0p1fw6xxrf7s0k5pvll8iy66wxbvy2bw5372l3lxkbdzjjfxa46j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/wheelchart")
+    (synopsis "Draw wheelcharts with TikZ")
+    (description
+     "This package is based on the package TikZ and can be used to draw
+wheelcharts with TikZ.  It provides several options to customize the
+wheelcharts.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 58f557778a129428c8d9a7ee4c5c7fce6b316b33 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:59:21 +0200
Subject: gnu: Add texlive-worldflags.

* gnu/packages/tex.scm (texlive-worldflags): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4e92807729..e836b3060e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5717,6 +5717,28 @@ wheelcharts with TikZ.  It provides several options to customize the
 wheelcharts.")
     (license license:lppl1.3c)))
 
+(define-public texlive-worldflags
+  (package
+    (name "texlive-worldflags")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/worldflags/"
+                   "tex/latex/worldflags/")
+             (base32
+              "08biibvfa6fbrq1zsan8yib0cds6azp1ldwqlg5gd9j5r5aaqj5i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/worldflags")
+    (synopsis "Drawing flags with TikZ")
+    (description
+     "This is a package for drawing flags using TikZ.  Currently the national
+flags of all independent nations are included, along with some other flags of
+various organizations.  A flag can be drawn as a single TikZ-picture within
+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-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From e28d5c9e8c791a2649e11674eb5fc0d93d2aed96 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:59:34 +0200
Subject: gnu: Add texlive-xistercian.

* gnu/packages/tex.scm (texlive-xistercian): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e836b3060e..031945dde1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5739,6 +5739,31 @@ 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-xistercian
+  (package
+    (name "texlive-xistercian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xistercian/"
+                   "source/latex/xistercian/"
+                   "tex/latex/xistercian/")
+             (base32
+              "021iwd8w19dbj1iqm1fdf9s06lysbrackz0g897nmsf0fks6qf4r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xistercian")
+    (synopsis "Cistercian numerals in LaTeX")
+    (description
+     "@code{xistercian} allows you to use Cistercian numerals in LaTeX.
+The glyphs are created using PGF and to a certain degree configurable.  You
+can use Cistercian numerals as page numbers using
+@code{\\pagenumbering@{cistercian@}}.  The two main macros are:
+@code{\\cistercian@{<counter>@}}, which formats the LaTeX2e counter as
+a Cistercian numeral, and @code{\\cisterciannum@{<integer>@}}, formats the
+integer (given as a string) as a Cistercian numeral.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From 7ca7453f689cb34a744c2e04df67028dd4306fdc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 10:59:50 +0200
Subject: gnu: Add texlive-xpicture.

* gnu/packages/tex.scm (texlive-xpicture): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 031945dde1..795851d91f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5764,6 +5764,27 @@ a Cistercian numeral, and @code{\\cisterciannum@{<integer>@}}, formats the
 integer (given as a string) as a Cistercian numeral.")
     (license license:lppl1.3c)))
 
+(define-public texlive-xpicture
+  (package
+    (name "texlive-xpicture")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xpicture/"
+                   "source/latex/xpicture/"
+                   "tex/latex/xpicture/")
+             (base32
+              "0pzqnrk7mw1k9madah2ym9qsy20d8i1x1abkvkxvx7rxw7w38s2p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xpicture")
+    (synopsis "Extensions of LaTeX picture drawing")
+    (description
+     "The package extends the facilities of the @code{pict2e} and the
+@code{curve2e} packages, providing extra reference frames, conic section
+curves, graphs of elementary functions and other parametric curves.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amiri
   (package
     (name "texlive-amiri")
-- 
cgit 1.4.1


From f35207fb1faba45bd5f83d7c0b57f7039a38eeb0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 13 Jul 2023 11:01:03 +0200
Subject: gnu: Add texlive-collection-pictures.

* gnu/packages/tex.scm (texlive-collection-pictures): New variable.
---
 gnu/packages/tex.scm | 254 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 254 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 795851d91f..7b44db18a1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -19199,6 +19199,260 @@ in @code{collection-basic}.")
 with packages in @code{collection-basic}.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-collection-pictures
+  (package
+    (name "texlive-collection-pictures")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-adigraph
+           texlive-aobs-tikz
+           texlive-askmaps
+           texlive-asyfig
+           texlive-asypictureb
+           texlive-autoarea
+           texlive-bardiag
+           texlive-beamerswitch
+           texlive-binarytree
+           texlive-blochsphere
+           texlive-bloques
+           texlive-blox
+           texlive-bodegraph
+           texlive-bondgraph
+           texlive-bondgraphs
+           texlive-braids
+           texlive-bxeepic
+           texlive-byo-twemojis
+           texlive-byrne
+           texlive-cachepic
+           texlive-callouts
+           texlive-celtic
+           texlive-chemfig
+           texlive-circuit-macros
+           texlive-circuitikz
+           texlive-coffeestains
+           texlive-collection-basic
+           texlive-combinedgraphics
+           texlive-curve
+           texlive-curve2e
+           texlive-curves
+           texlive-dcpic
+           texlive-diagmac2
+           texlive-ditaa
+           texlive-doc-pictex
+           texlive-dot2texi
+           texlive-dottex
+           texlive-dpcircling
+           texlive-dratex
+           texlive-drs
+           texlive-duotenzor
+           texlive-dynkin-diagrams
+           texlive-ecgdraw
+           texlive-eepic
+           texlive-ellipse
+           texlive-endofproofwd
+           texlive-epspdf
+           texlive-epspdfconversion
+           texlive-esk
+           texlive-euflag
+           texlive-fast-diagram
+           texlive-fig4latex
+           texlive-figchild
+           texlive-figput
+           texlive-fitbox
+           texlive-flowchart
+           texlive-forest
+           texlive-genealogytree
+           texlive-getmap
+           texlive-gincltex
+           texlive-gnuplottex
+           texlive-gradientframe
+           texlive-grafcet
+           texlive-graph35
+           texlive-graphicxpsd
+           texlive-graphviz
+           texlive-gtrlib-largetrees
+           texlive-harveyballs
+           texlive-here
+           texlive-hf-tikz
+           texlive-hobby
+           texlive-hvfloat
+           texlive-istgame
+           texlive-kblocks
+           texlive-kinematikz
+           texlive-knitting
+           texlive-knittingpattern
+           texlive-ladder
+           texlive-lapdf
+           texlive-latex-make
+           texlive-liftarm
+           texlive-lpic
+           texlive-lroundrect
+           texlive-luamesh
+           texlive-luasseq
+           texlive-maker
+           texlive-makeshape
+           texlive-mathspic
+           texlive-mercatormap
+           texlive-milsymb
+           texlive-miniplot
+           texlive-mkpic
+           texlive-modiagram
+           texlive-neuralnetwork
+           texlive-nl-interval
+           texlive-nndraw
+           texlive-numericplots
+           texlive-outilsgeomtikz
+           texlive-pb-diagram
+           texlive-penrose
+           texlive-petri-nets
+           texlive-pgf
+           texlive-pgf-blur
+           texlive-pgf-interference
+           texlive-pgf-periodictable
+           texlive-pgf-pie
+           texlive-pgf-soroban
+           texlive-pgf-spectra
+           texlive-pgf-umlcd
+           texlive-pgf-umlsd
+           texlive-pgfgantt
+           texlive-pgfkeyx
+           texlive-pgfmolbio
+           texlive-pgfmorepages
+           texlive-pgfopts
+           texlive-pgfornament
+           texlive-pgfplots
+           texlive-picinpar
+           texlive-pict2e
+           texlive-pictex
+           texlive-pictex2
+           texlive-pinlabel
+           texlive-pixelart
+           texlive-pixelarttikz
+           texlive-pmgraph
+           texlive-postage
+           texlive-prerex
+           texlive-productbox
+           texlive-ptolemaicastronomy
+           texlive-puyotikz
+           texlive-pxpgfmark
+           texlive-pxpic
+           texlive-qcircuit
+           texlive-qrcode
+           texlive-quantikz
+           texlive-randbild
+           texlive-randomwalk
+           texlive-realhats
+           texlive-reotex
+           texlive-robotarm
+           texlive-rviewport
+           texlive-sa-tikz
+           texlive-sacsymb
+           texlive-schemabloc
+           texlive-scratch
+           texlive-scratch3
+           texlive-scsnowman
+           texlive-setdeck
+           texlive-signchart
+           texlive-simplenodes
+           texlive-simpleoptics
+           texlive-smartdiagram
+           texlive-spath3
+           texlive-spectralsequences
+           texlive-strands
+           texlive-swimgraf
+           texlive-syntaxdi
+           texlive-table-fct
+           texlive-texdraw
+           texlive-ticollege
+           texlive-tikz-3dplot
+           texlive-tikz-among-us
+           texlive-tikz-bagua
+           texlive-tikz-bayesnet
+           texlive-tikz-bbox
+           texlive-tikz-cd
+           texlive-tikz-dependency
+           texlive-tikz-dimline
+           texlive-tikz-ext
+           texlive-tikz-feynhand
+           texlive-tikz-feynman
+           texlive-tikz-imagelabels
+           texlive-tikz-inet
+           texlive-tikz-kalender
+           texlive-tikz-karnaugh
+           texlive-tikz-ladder
+           texlive-tikz-lake-fig
+           texlive-tikz-layers
+           texlive-tikz-mirror-lens
+           texlive-tikz-nef
+           texlive-tikz-network
+           texlive-tikz-opm
+           texlive-tikz-optics
+           texlive-tikz-page
+           texlive-tikz-palattice
+           texlive-tikz-planets
+           texlive-tikz-qtree
+           texlive-tikz-relay
+           texlive-tikz-sfc
+           texlive-tikz-swigs
+           texlive-tikz-timing
+           texlive-tikz-trackschematic
+           texlive-tikz-truchet
+           texlive-tikzbricks
+           texlive-tikzcodeblocks
+           texlive-tikzducks
+           texlive-tikzfill
+           texlive-tikzinclude
+           texlive-tikzlings
+           texlive-tikzmark
+           texlive-tikzmarmots
+           texlive-tikzorbital
+           texlive-tikzpackets
+           texlive-tikzpagenodes
+           texlive-tikzpeople
+           texlive-tikzpfeile
+           texlive-tikzpingus
+           texlive-tikzposter
+           texlive-tikzscale
+           texlive-tikzsymbols
+           texlive-tikztosvg
+           texlive-tikzviolinplots
+           texlive-tile-graphic
+           texlive-timing-diagrams
+           texlive-tipfr
+           texlive-tkz-base
+           texlive-tkz-berge
+           texlive-tkz-doc
+           texlive-tkz-euclide
+           texlive-tkz-fct
+           texlive-tkz-graph
+           texlive-tkz-orm
+           texlive-tkz-tab
+           texlive-tkzexample
+           texlive-tonevalue
+           texlive-tqft
+           texlive-tsemlines
+           texlive-tufte-latex
+           texlive-twemojis
+           texlive-tzplot
+           texlive-utfsym
+           texlive-venndiagram
+           texlive-visualpstricks
+           texlive-wheelchart
+           texlive-worldflags
+           texlive-xistercian
+           texlive-xpicture
+           texlive-xypic))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Graphics, pictures, diagrams")
+    (description
+     "This collection provides packages related to graphics, pictures, and
+diagrams.  It includes TikZ, @code{pict}, etc.  However, MetaPost and
+PStricks are separate.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-collection-xetex
   (package
     (name "texlive-collection-xetex")
-- 
cgit 1.4.1


From ce749beb17e58481b24853030043b44c6c6d3e8f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:28:12 +0200
Subject: gnu: Add texlive-accfonts.

* gnu/packages/tex.scm (texlive-accfonts): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7b44db18a1..54aa4ce60d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -988,6 +988,30 @@ ones.")
 (define-deprecated/alias texlive-union texlive-updmap.cfg)
 (export texlive-union)
 
+(define-public texlive-accfonts
+  (package
+    (name "texlive-accfonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/accfonts/" "scripts/accfonts/"
+                   "tex/latex/accfonts/")
+             (base32
+              "0kja24rh0ysljwgkyg9mf47h64ayi2kmb1jb3dmvb42ywvg0w9i7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "mkt1font" "vpl2ovp" "vpl2vpl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/accfonts")
+    (synopsis "Utilities to derive new fonts from existing ones")
+    (description
+     "The @code{accfonts} package contains three utilities to permit easy
+manipulation of fonts, in particular the creation of unusual accented
+characters. @command{mkt1font} works on Adobe Type 1 fonts, @command{vpl2vpl}
+works on TeX virtual fonts and @command{vpl2ovp} transforms a TeX font to an
+Omega one.")
+    (license license:gpl3+)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 347a6932b099069ebe44a7e52a692ae8f8641af5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:30:19 +0200
Subject: gnu: Add texlive-afm2pl.

* gnu/packages/tex.scm (texlive-afm2pl): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 54aa4ce60d..a2837ce4ed 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1012,6 +1012,29 @@ works on TeX virtual fonts and @command{vpl2ovp} transforms a TeX font to an
 Omega one.")
     (license license:gpl3+)))
 
+(define-public texlive-afm2pl
+  (package
+    (name "texlive-afm2pl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/afm2pl.1"
+                   "doc/man/man1/afm2pl.man1.pdf"
+                   "fonts/enc/dvips/afm2pl/"
+                   "fonts/lig/afm2pl/" "tex/fontinst/afm2pl/")
+             (base32
+              "19llzzr4kmmyf7l18ngx1rhaqaqvgm3md924m4dxcv7nmrvga2b2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/afm2pl")
+    (synopsis "Convert AFM to TeX property list (@file{.pl}) metrics")
+    (description
+     "@command{afm2pl} converts a @file{.afm} (Adobe Font Metric) file into
+a @file{.pl} (Property List) file, which in its turn can be converted to
+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-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 558107e4218a5a5925756e2bd83610a299e0b8c9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:30:35 +0200
Subject: gnu: Add texlive-albatross.

* gnu/packages/tex.scm (texlive-albatross): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a2837ce4ed..5519ead5f7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1035,6 +1035,29 @@ 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-albatross
+  (package
+    (name "texlive-albatross")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/albatross.1"
+                   "doc/man/man1/albatross.man1.pdf"
+                   "doc/support/albatross/"
+                   "scripts/albatross/"
+                   "source/support/albatross/")
+             (base32
+              "147cdqiyapmhs6s5cp4f0vhc71d3w9kvxk8ylbrhsp5h97r8y6w9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "albatross.sh")))
+    (home-page "https://ctan.org/pkg/albatross")
+    (synopsis "Find fonts that contain a given glyph")
+    (description
+     "This is a command line tool for finding fonts that contain
+a given (Unicode) glyph.  It relies on Fontconfig.")
+    (license license:bsd-3)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 1b0fb5ee0f53ad949dafd2eeca5d72fd569032f0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:30:49 +0200
Subject: gnu: Add texlive-dosepsbin.

* gnu/packages/tex.scm (texlive-dosepsbin): New variable.
---
 gnu/packages/tex.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5519ead5f7..6dfa8015db 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1058,6 +1058,36 @@ ligatures, but also offers additional control over them.")
 a given (Unicode) glyph.  It relies on Fontconfig.")
     (license license:bsd-3)))
 
+(define-public texlive-dosepsbin
+  (package
+    (name "texlive-dosepsbin")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/dosepsbin.1"
+                   "doc/man/man1/dosepsbin.man1.pdf"
+                   "doc/support/dosepsbin/"
+                   "scripts/dosepsbin/"
+                   "source/support/dosepsbin/")
+             (base32
+              "117crwcdpirvvm9srrzjn40marg00q16rzyqipm3xxbmwv52i93c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "dosepsbin.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/dosepsbin")
+    (synopsis "Deal with DOS binary EPS files")
+    (description
+     "This package provides a Encapsulated PostScript (EPS) file may given in
+a special binary format to support the inclusion of a thumbnail.  This file
+format, commonly known as DOS EPS format, starts with a binary header that
+contains the positions of the possible sections: PostScript (PS); Windows
+Metafile Format (WMF); and Tag Image File Format (TIFF).  The PS section must
+be present and either the WMF file or the TIFF file should be given.  The
+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-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From f595ccec81962da68b9107a3c6b96e795ed658cc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:31:04 +0200
Subject: gnu: Add texlive-dvipsconfig.

* gnu/packages/tex.scm (texlive-dvipsconfig): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6dfa8015db..023b7561f2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1088,6 +1088,28 @@ 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-dvipsconfig
+  (package
+    (name "texlive-dvipsconfig")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/dvipsconfig/")
+             (base32
+              "02vgk91y80ch4pkj83vbiz1b2ccigf152hm83p607y4n4qn2xzsf")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dvipsconfig")
+    (synopsis "Collection of dvips PostScript headers")
+    (description
+     "This is a collection of dvips PostScript header and dvips config files.
+They control certain features of the printer, including: A4, A3, usletter,
+simplex, duplex / long edge, duplex / short edge, screen frequencies of
+images, black/white invers, select transparency / paper for tektronix 550/560,
+manual feeder, envelope feeder, and tray 1, 2 and 3, and printing a PostScript
+grid underneath the page material--very useful for measuring and eliminating
+paper feed errors!")
+    (license license:gpl3+)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 3a1e1931b31ec2c757298c19843f56311b2392f4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:31:18 +0200
Subject: gnu: Add texlive-fontools.

* gnu/packages/tex.scm (texlive-fontools): New variable.
---
 gnu/packages/tex.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 023b7561f2..e351854f3d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1110,6 +1110,46 @@ grid underneath the page material--very useful for measuring and eliminating
 paper feed errors!")
     (license license:gpl3+)))
 
+(define-public texlive-fontools
+  (package
+    (name "texlive-fontools")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/afm2afm.1"
+                   "doc/man/man1/afm2afm.man1.pdf"
+                   "doc/man/man1/autoinst.1"
+                   "doc/man/man1/autoinst.man1.pdf"
+                   "doc/man/man1/ot2kpx.1"
+                   "doc/man/man1/ot2kpx.man1.pdf"
+                   "doc/support/fontools/"
+                   "fonts/enc/dvips/fontools/"
+                   "scripts/fontools/")
+             (base32
+              "0jfqwhj2i9x9bzq723ch5z3sydfkaha4xr0xlp2haav713ll5027")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "afm2afm" "autoinst" "ot2kpx")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/fontools")
+    (synopsis "Tools to simplify using fonts (especially TT/OTF ones)")
+    (description
+     "This package provides tools to simplify using OpenType fonts with LaTeX.
+By far the most important program in this bundle is @command{autoinst},
+a wrapper script around Eddie Kohler's LCDF TypeTools.  Autoinst aims to
+automate the installation of OpenType fonts in LaTeX by calling the LCDF
+TypeTools (with the correct options) for all fonts you wish to install, and
+generating the necessary @file{.fd} and @file{.sty} files.
+
+In addition, this bundle contains a few other, less important utilities:
+@itemize
+@item @command{afm2afm}: re-encodes @file{.afm} files,
+@item @command{ot2kpx}: extract kerning pairs from OpenType fonts,
+@item @command{splitttc}: split an OpenType Collection file (ttc or
+otc) into individual fonts.
+@end itemize")
+    (license license:gpl2)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From f5fec06954586af3dc14838b854be13a4e65d0a2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:31:28 +0200
Subject: gnu: Add texlive-fontware.

* gnu/packages/tex.scm (texlive-fontware): New variable.
---
 gnu/packages/tex.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e351854f3d..608db1fa67 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1150,6 +1150,35 @@ otc) into individual fonts.
 @end itemize")
     (license license:gpl2)))
 
+(define-public texlive-fontware
+  (package
+    (name "texlive-fontware")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/pltotf.1"
+                   "doc/man/man1/pltotf.man1.pdf"
+                   "doc/man/man1/tftopl.1"
+                   "doc/man/man1/tftopl.man1.pdf"
+                   "doc/man/man1/vftovp.1"
+                   "doc/man/man1/vftovp.man1.pdf"
+                   "doc/man/man1/vptovf.1"
+                   "doc/man/man1/vptovf.man1.pdf")
+             (base32
+              "0ng27m6cz92aa52z99gnw5i8s8fbkxq4354mygwnchchgxndcba0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/vfware")
+    (synopsis "Tools for virtual font metrics")
+    (description
+     "Virtual font metrics are usually created in a textual form, the Virtual
+Property List, but programs that use them need to use binary files (the
+Virtual Font and the TeX Font Metric).  The two programs provided in this
+package translate between the two forms: @command{vptovf} takes a VPL file and
+generates a VF file and a TFM file; @command{vftovp} takes a VF file and a TFM
+file and generates a VPL file.")
+    (license license:knuth)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From f7b3450c624c0a204c8877d2052dcf4525bf5cc1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:31:44 +0200
Subject: gnu: Add texlive-lcdftypetools.

* gnu/packages/tex.scm (texlive-lcdftypetools): New variable.
---
 gnu/packages/tex.scm | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 608db1fa67..8592f1ca8a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1216,6 +1216,74 @@ Knuth's TeX book; this source is there to read, as an example of writing TeX ;
 it should not be processed without Knuth's direct permission.")
     (license license:knuth)))
 
+
+(define-public texlive-lcdftypetools
+  (package
+    (name "texlive-lcdftypetools")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/cfftot1.1"
+                   "doc/man/man1/cfftot1.man1.pdf"
+                   "doc/man/man1/mmafm.1"
+                   "doc/man/man1/mmafm.man1.pdf"
+                   "doc/man/man1/mmpfb.1"
+                   "doc/man/man1/mmpfb.man1.pdf"
+                   "doc/man/man1/otfinfo.1"
+                   "doc/man/man1/otfinfo.man1.pdf"
+                   "doc/man/man1/otftotfm.1"
+                   "doc/man/man1/otftotfm.man1.pdf"
+                   "doc/man/man1/t1dotlessj.1"
+                   "doc/man/man1/t1dotlessj.man1.pdf"
+                   "doc/man/man1/t1lint.1"
+                   "doc/man/man1/t1lint.man1.pdf"
+                   "doc/man/man1/t1rawafm.1"
+                   "doc/man/man1/t1rawafm.man1.pdf"
+                   "doc/man/man1/t1reencode.1"
+                   "doc/man/man1/t1reencode.man1.pdf"
+                   "doc/man/man1/t1testpage.1"
+                   "doc/man/man1/t1testpage.man1.pdf"
+                   "doc/man/man1/ttftotype42.1"
+                   "doc/man/man1/ttftotype42.man1.pdf")
+             (base32
+              "0yjbc6rsf8c62qa1lyi9kjyjy2p0xlps19llnvly3xyhla08j76f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-glyphlist))
+    (home-page "https://ctan.org/pkg/lcdf-typetools")
+    (synopsis "Bundle of outline font manipulation tools")
+    (description
+     "This bundle of tools comprises:
+@itemize
+@item @command{cfftot1}, which translates a Compact Font Format
+(CFF) font, or a PostScript-flavored OpenType font, into PostScript
+Type 1 format.  It correctly handles subroutines and hints;
+
+@item @command{mmafm} and @command{mmpfb}, which create instances of
+multiple-master fonts;
+
+@item @command{otfinfo}, which reports information about OpenType
+fonts, such as the features they support and the contents of their
+size optical size features;
+
+@item @command{otftotfm}, which creates TeX font metrics and encodings
+that correspond to a PostScript-flavored OpenType font.  It will
+interpret glyph positionings, substitutions, and ligatures as far as
+it is able.  You can say which OpenType features should be activated;
+
+@item @command{t1dotlessj}, which creates a Type 1 font whose only
+character is a dotless j matching the input font's design;
+
+@item @command{t1lint}, which checks a Type 1 font for correctness;
+
+@item @command{t1reencode}, which replaces a font's internal encoding
+with one you specify;
+
+@item @command{t1testpage}, which creates a PostScript proof for
+a Type 1 font.
+@end itemize")
+    (license license:gpl3+)))
+
 (define-public texlive-latex
   (package
     (name "texlive-latex")
-- 
cgit 1.4.1


From 390dadbc15f4593d097119a6259a4749bf89d03d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:32:18 +0200
Subject: gnu: Add texlive-luafindfont.

* gnu/packages/tex.scm (texlive-luafindfont): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8592f1ca8a..69a2f19efd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1344,6 +1344,26 @@ 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-luafindfont
+  (package
+    (name "texlive-luafindfont")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/luafindfont.1"
+                   "doc/man/man1/luafindfont.man1.pdf"
+                   "doc/support/luafindfont/"
+                   "scripts/luafindfont/")
+             (base32
+              "1xyqlbwgsbb5al2ss9w40wsigsmlj97rf6ck3rih41s0js7yz4aj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "luafindfont.lua")))
+    (home-page "https://ctan.org/pkg/luafindfont")
+    (synopsis "Search fonts in the LuaTeX font database")
+    (description "This Lua script searches for fonts in the font database.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-bidi
   (package
     (name "texlive-bidi")
-- 
cgit 1.4.1


From a32c0b61ce6747e6a4cf010b889aaf4e30adac71 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:32:42 +0200
Subject: gnu: Add texlive-metatype1.

* gnu/packages/tex.scm (texlive-metatype1): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 69a2f19efd..34412ab2b3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1917,6 +1917,26 @@ build fonts using the Metafont system.")
 
 (define-deprecated-package texlive-metafont-base texlive-metafont)
 
+(define-public texlive-metatype1
+  (package
+    (name "texlive-metatype1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "source/metapost/metatype1/")
+             (base32
+              "1nhbsn33w6zbzbvi3a32ng6ib5dbh0vll9g2c5ssiv1ysxqrg6yq")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/metatype1")
+    (synopsis "Generate Type 1 fonts from MetaPost")
+    (description
+     "The system employs scripts, common utility programs, and a set of
+MetaPost macros to provide a means of expressing the details outline fonts
+directly in the MetaPost language.  The system was employed to generate the
+Latin Modern fonts, and the distribution includes an example development of
+Knuth's logo fonts.")
+    (license license:public-domain)))
+
 (define-public texlive-mfirstuc
   (package
     (name "texlive-mfirstuc")
-- 
cgit 1.4.1


From 2fc6ae43b5f0eb30795cdf559456398b6c5f8bf4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:33:10 +0200
Subject: gnu: Add texlive-mf2pt1.

* gnu/packages/tex.scm (texlive-mf2pt1): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 34412ab2b3..626b44392e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1937,6 +1937,33 @@ Latin Modern fonts, and the distribution includes an example development of
 Knuth's logo fonts.")
     (license license:public-domain)))
 
+(define-public texlive-mf2pt1
+  (package
+    (name "texlive-mf2pt1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/info/mf2pt1.info" "doc/support/mf2pt1/"
+                   "metapost/mf2pt1/" "scripts/mf2pt1/")
+             (base32
+              "17dq4csl10j89rrxgyqjp3fjqkd9q6djgz9yi33y72w5ymjgiaik")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "mf2pt1.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/mf2pt1")
+    (synopsis "Convert stylized Metafont to PostScript Type 1")
+    (description
+     "@command{mf2pt1} is a Perl script that facilitates producing PostScript
+Type 1 fonts from a Metafont source file.  It is not, as the name may imply,
+an automatic converter of arbitrary Metafont fonts to Type 1 format.
+@command{mf2pt1} imposes a number of restrictions on the Metafont input.  If
+these restrictions are met, it will produce valid Type 1 output with more
+accurate control points than can be reverse-engineered by TeXtrace,
+@command{mftrace}, and other programs which convert bitmaps to outline
+fonts.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-mfirstuc
   (package
     (name "texlive-mfirstuc")
-- 
cgit 1.4.1


From 251b8ba0bec97d98a13c21bdd1e8868feb997b62 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:33:42 +0200
Subject: gnu: Add texlive-ps2eps.

* gnu/packages/tex.scm (texlive-ps2eps): New variable.
---
 gnu/packages/tex.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 626b44392e..9859ac5fbe 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3862,6 +3862,37 @@ and glued together.  This will lead to a physical product box.")
      (list
       (license:fsf-free "https://tug.ctan.org/macros/latex/contrib/gene/productbox/productbox.ins")))))
 
+(define-public texlive-ps2eps
+  (package
+    (name "texlive-ps2eps")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/bbox.1"
+                   "doc/man/man1/bbox.man1.pdf"
+                   "doc/man/man1/ps2eps.1"
+                   "doc/man/man1/ps2eps.man1.pdf"
+                   "scripts/ps2eps/")
+             (base32
+              "1anrvgs0hd3790dwpxqal0c2drjmvh93vnyqap40rvp8axwi0a6n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "ps2eps.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/ps2eps")
+    (synopsis "Produce Encapsulated PostScript from PostScript")
+    (description
+     "@command{ps2eps} produces Encapsulated PostScript Files (EPS/EPSF) from
+a one-page PostScript document, or any PostScript document.  A correct
+bounding box is calculated for the EPS files and some PostScript command
+sequences that can produce errorneous results on printers are filtered.  The
+input is cropped to include just the image contained in the PostScript file.
+The EPS files can then be included into TeX documents.
+
+Included in the distribution is the @command{bbox} program, an application to
+produce bounding box values for Rawppm or Rawpbm format files.")
+    (license license:gpl3+)))
+
 (define-public texlive-ptolemaicastronomy
   (package
     (name "texlive-ptolemaicastronomy")
-- 
cgit 1.4.1


From 57eccae3e0b356b6d52cd6f7ec1705cd8fbd0b9a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:34:43 +0200
Subject: gnu: Add texlive-ps2pk.

* gnu/packages/tex.scm (texlive-ps2pk): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9859ac5fbe..4fd5f8a49c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3893,6 +3893,32 @@ Included in the distribution is the @command{bbox} program, an application to
 produce bounding box values for Rawppm or Rawpbm format files.")
     (license license:gpl3+)))
 
+(define-public texlive-ps2pk
+  (package
+    (name "texlive-ps2pk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/mag.1"
+                   "doc/man/man1/mag.man1.pdf"
+                   "doc/man/man1/pfb2pfa.1"
+                   "doc/man/man1/pfb2pfa.man1.pdf"
+                   "doc/man/man1/pk2bm.1"
+                   "doc/man/man1/pk2bm.man1.pdf"
+                   "doc/man/man1/ps2pk.1"
+                   "doc/man/man1/ps2pk.man1.pdf")
+             (base32
+              "14xq9x5rf15ibzr41cm5rm4v3rpmj50rfsqp4zzvyhmpmyw4dsx3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ps2pk")
+    (synopsis "Generate a PK font from an Adobe Type 1 font")
+    (description
+     "This package provides tools to generate a PK file from an Adobe Type
+1 font.  PK fonts are (or used to be) valuable in enabling previewers to view
+documents generated that use Type 1 fonts.")
+    (license license:isc)))
+
 (define-public texlive-ptolemaicastronomy
   (package
     (name "texlive-ptolemaicastronomy")
-- 
cgit 1.4.1


From 92844e485d9363c4200a251999d693ec46efdbdb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:35:10 +0200
Subject: gnu: Add texlive-psutils.

* gnu/packages/tex.scm (texlive-psutils): New variable.
---
 gnu/packages/tex.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4fd5f8a49c..bf2595009b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3919,6 +3919,55 @@ produce bounding box values for Rawppm or Rawpbm format files.")
 documents generated that use Type 1 fonts.")
     (license license:isc)))
 
+(define-public texlive-psutils
+  (package
+    (name "texlive-psutils")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/epsffit.1"
+                   "doc/man/man1/epsffit.man1.pdf"
+                   "doc/man/man1/extractres.1"
+                   "doc/man/man1/extractres.man1.pdf"
+                   "doc/man/man1/includeres.1"
+                   "doc/man/man1/includeres.man1.pdf"
+                   "doc/man/man1/psbook.1"
+                   "doc/man/man1/psbook.man1.pdf"
+                   "doc/man/man1/psjoin.1"
+                   "doc/man/man1/psjoin.man1.pdf"
+                   "doc/man/man1/psnup.1"
+                   "doc/man/man1/psnup.man1.pdf"
+                   "doc/man/man1/psresize.1"
+                   "doc/man/man1/psresize.man1.pdf"
+                   "doc/man/man1/psselect.1"
+                   "doc/man/man1/psselect.man1.pdf"
+                   "doc/man/man1/pstops.1"
+                   "doc/man/man1/pstops.man1.pdf"
+                   "doc/man/man1/psutils.1"
+                   "doc/man/man1/psutils.man1.pdf"
+                   "dvips/getafm/"
+                   "psutils/"
+                   "scripts/psutils/")
+             (base32
+              "0ba514lz3pc03ll0kb9apdx62mi2yiyd7bnargkp2bbf62dq79cc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts #~(list "extractres.pl" "includeres.pl" "psjoin.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/psutils")
+    (synopsis "PostScript utilities")
+    (description
+     "This package provides a bundle of utilities for manipulating PostScript
+documents, including page selection and rearrangement, resizing the page,
+arrangement into signatures for booklet printing, and page merging for N-up
+printing.  Utilities include @command{psbook}, @command{psselect},
+@command{pstops}, @command{psnup}, @command{psresize}, @command{epsffit}.")
+    (license
+     (list license:lgpl2.1+
+           (license:fsf-free
+            "https://tug.org/svn/texlive/trunk/Build/source/texk/psutils/psutils-src/LICENSE?revision=57915&view=markup")))))
+
 (define-public texlive-ptolemaicastronomy
   (package
     (name "texlive-ptolemaicastronomy")
-- 
cgit 1.4.1


From 16a99693646002839bee50a39f0ffb9bede8a8da Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:35:35 +0200
Subject: gnu: Add texlive-t1utils.

* gnu/packages/tex.scm (texlive-t1utils): New variable.
---
 gnu/packages/tex.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bf2595009b..984d6797e2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4559,6 +4559,45 @@ Files of current world and Canadian records are included.")
 known as railroad diagrams.")
     (license license:lppl1.3+)))
 
+(define-public texlive-t1utils
+  (package
+    (name "texlive-t1utils")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/t1ascii.1"
+                   "doc/man/man1/t1ascii.man1.pdf"
+                   "doc/man/man1/t1asm.1"
+                   "doc/man/man1/t1asm.man1.pdf"
+                   "doc/man/man1/t1binary.1"
+                   "doc/man/man1/t1binary.man1.pdf"
+                   "doc/man/man1/t1disasm.1"
+                   "doc/man/man1/t1disasm.man1.pdf"
+                   "doc/man/man1/t1mac.1"
+                   "doc/man/man1/t1mac.man1.pdf"
+                   "doc/man/man1/t1unmac.1"
+                   "doc/man/man1/t1unmac.man1.pdf")
+             (base32
+              "0hdk57179nn57wnmvr3jasjavkvmrn6ryph6jvjhsfqprn7bhf1y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/t1utils")
+    (synopsis "Simple Type 1 font manipulation programs")
+    (description
+     "This package provides a collection of simple programs for manipulating
+Adobe Type 1 fonts, comprising:
+
+@itemize
+@item @command{t1ascii}: convert PFB (binary) to PFA (ASCII) fonts;
+@item @command{t1binary}: convert PFA to PFB fonts;
+@item @command{t1disasm}: convert PFA or PFB fonts to human-readable
+and -editable format;
+@item @command{t1asm}: reassemble such editable formats to a font;
+@item @command{t1unmac}: extract font resources from a Macintosh font file;
+@item @command{t1mac}: generate a Macintosh font from a Type 1 font.
+@end itemize")
+    (license license:public-domain)))
+
 (define-public texlive-table-fct
   (package
     (name "texlive-table-fct")
-- 
cgit 1.4.1


From b42c197a515f4ab266623306937ea713d5f4d01f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:36:16 +0200
Subject: gnu: Add texlive-ttfutils.

* gnu/packages/tex.scm (texlive-ttfutils): New variable.
---
 gnu/packages/tex.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 984d6797e2..0059a0c8eb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6070,6 +6070,36 @@ which produced lines at an arbitrary orientation.  The present package
 emulates the macro, using TikZ.")
     (license license:public-domain)))
 
+(define-public texlive-ttfutils
+  (package
+    (name "texlive-ttfutils")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/ttf2afm.1"
+                   "doc/man/man1/ttf2afm.man1.pdf"
+                   "doc/man/man1/ttf2pk.1"
+                   "doc/man/man1/ttf2pk.man1.pdf"
+                   "doc/man/man1/ttf2tfm.1"
+                   "doc/man/man1/ttf2tfm.man1.pdf"
+                   "doc/man/man1/ttfdump.1"
+                   "doc/man/man1/ttfdump.man1.pdf"
+                   "doc/ttf2pk/"
+                   "fonts/enc/ttf2pk/base/"
+                   "fonts/sfd/ttf2pk/"
+                   "ttf2pk/")
+             (base32
+              "1yfr3yic0bx73imxhmxhnhjc1mpwy9f55sh3p430p2f2yvxwm0cs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ttfutils")
+    (synopsis "Convert TrueType to TFM and PK fonts")
+    (description
+     "This package provides utilities to convert TrueType to TFM and PK fonts:
+@command{ttf2afm}, @command{ttf2pk}, @command{ttf2tfm}, and
+@command{ttfdump}.")
+    (license license:gpl2+)))
+
 (define-public texlive-twemojis
   (package
     (name "texlive-twemojis")
-- 
cgit 1.4.1


From c335c5f661947c84c26532dfe73631c27aaf5b6d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:36:57 +0200
Subject: gnu: Add texlive-collection-fontutils.

* gnu/packages/tex.scm (texlive-collection-fontutils): New variable.
---
 gnu/packages/tex.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0059a0c8eb..6a067a0dc6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -19366,6 +19366,42 @@ PostScript fonts, Latin Modern, TeX Gyre, and T1 and other encoding support
 for Computer Modern, in outline form.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-collection-fontutils
+  (package
+    (name "texlive-collection-fontutils")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-accfonts
+           texlive-afm2pl
+           texlive-albatross
+           texlive-collection-basic
+           texlive-dosepsbin
+           texlive-dvipsconfig
+           texlive-epstopdf
+           texlive-fontinst
+           texlive-fontools
+           texlive-fontware
+           texlive-lcdftypetools
+           texlive-luafindfont
+           texlive-metatype1
+           texlive-mf2pt1
+           texlive-ps2eps
+           texlive-ps2pk
+           texlive-psutils
+           texlive-t1utils
+           texlive-ttfutils))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Graphics and font utilities")
+    (description
+     "This collection of packages provides programs for conversion between
+font formats, testing fonts, virtual fonts, @file{.gf} and @file{.pk}
+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-latex
   (package
     (name "texlive-collection-latex")
-- 
cgit 1.4.1


From dddcc12038638045789c334479845408c5079be3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:37:37 +0200
Subject: gnu: texlive-collection-luatex: Improve description.

* gnu/packages/tex.scm (texlive-collection-luatex)[description]: Use complete sentences.
---
 gnu/packages/tex.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6a067a0dc6..7265dacb15 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -19668,10 +19668,10 @@ LaTeX which have widespread use.")
     (home-page "https://www.tug.org/texlive/")
     (synopsis "LuaTeX packages")
     (description
-     "Packages for LuaTeX, a TeX engine using Lua as an embedded scripting and
-extension language, with native support for Unicode, OpenType/TrueType fonts,
-and both PDF and DVI output.  The LuaTeX engine itself, and plain formats, are
-in @code{collection-basic}.")
+     "This is a collection of packages for LuaTeX, a TeX engine using Lua as
+an embedded scripting and extension language, with native support for Unicode,
+OpenType/TrueType fonts, and both PDF and DVI output.  The LuaTeX engine
+itself, and plain formats, are in @code{collection-basic}.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
 (define-public texlive-collection-metapost
-- 
cgit 1.4.1


From 1b04e72fd682afa0473940080e3e36c2038f9654 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:53:13 +0200
Subject: gnu: Add texlive-babel-basque.

* gnu/packages/tex.scm (texlive-babel-basque): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7265dacb15..da44536a3f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8899,6 +8899,24 @@ The OPmac macros can generate a bibliography without any external program.")
 right-aligned table and (multiple-)figure floats, with footnotes.")
     (license license:lppl)))
 
+(define-public texlive-babel-basque
+  (package
+    (name "texlive-babel-basque")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-basque/"
+                   "source/generic/babel-basque/"
+                   "tex/generic/babel-basque/")
+             (base32
+              "16bcy5wlkwh8cwvcff1sc3m4rq4a7fzzawpl158kscp7fmw7i7k4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-basque")
+    (synopsis "Babel contributed support for Basque")
+    (description "The package establishes Basque conventions in a document.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-english
   (package
     (name "texlive-babel-english")
-- 
cgit 1.4.1


From 1a077b7ad933e6412f5abb3009f2ca3dd8bec2d9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:53:38 +0200
Subject: gnu: Add texlive-babel-hungarian.

* gnu/packages/tex.scm (texlive-babel-hungarian): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index da44536a3f..ff96fa3bd7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8988,6 +8988,25 @@ German.")
 
 (define-deprecated-package texlive-generic-babel-german texlive-babel-german)
 
+(define-public texlive-babel-hungarian
+  (package
+    (name "texlive-babel-hungarian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-hungarian/"
+                   "tex/generic/babel-hungarian/")
+             (base32
+              "1x54clczgvkq9slq5331hvp1rzlv4jm4g9gnpflz8y72jbqmcm24")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-hungarian")
+    (synopsis "Babel support for Hungarian (Magyar)")
+    (description
+     "The package provides a language definition file that enables support of
+Magyar (Hungarian) with Babel.")
+    (license license:lppl)))
+
 (define-public texlive-babel-swedish
   (package
     (name "texlive-babel-swedish")
-- 
cgit 1.4.1


From d6aeac8ca55190a4348bbc0fa32a37aee30f0d38 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:53:52 +0200
Subject: gnu: Add texlive-babel-italian.

* gnu/packages/tex.scm (texlive-babel-italian): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ff96fa3bd7..391a168312 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9007,6 +9007,25 @@ German.")
 Magyar (Hungarian) with Babel.")
     (license license:lppl)))
 
+(define-public texlive-babel-italian
+  (package
+    (name "texlive-babel-italian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-italian/"
+                   "source/generic/babel-italian/"
+                   "tex/generic/babel-italian/")
+             (base32
+              "04bj2igc4m59nsax2563dzkzk3f4rvfc8aph35x663a8rf70bvjy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-italian")
+    (synopsis "Babel support for Italian text")
+    (description "The package provides language definitions for use in
+Babel.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-swedish
   (package
     (name "texlive-babel-swedish")
-- 
cgit 1.4.1


From cad37ff3b3031f0d758b656d8e448e1adc0f591d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:54:07 +0200
Subject: gnu: Add texlive-babel-portuges.

* gnu/packages/tex.scm (texlive-babel-portuges): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 391a168312..e0ef0efd7d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9026,6 +9026,27 @@ Magyar (Hungarian) with Babel.")
 Babel.")
     (license license:lppl1.3c)))
 
+(define-public texlive-babel-portuges
+  (package
+    (name "texlive-babel-portuges")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-portuges/"
+                   "source/generic/babel-portuges/"
+                   "tex/generic/babel-portuges/")
+             (base32
+              "0619ygyjz5vz3a6khx7yvsa059x59r54fgyxb0p8k196lss07lq2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-portuges")
+    (synopsis "Babel support for Portuges")
+    (description
+     "The package provides the language definition file for support of
+Portuguese and Brazilian Portuguese in Babel.  Some shortcuts are defined, as
+well as translations to Portuguese of standard LaTeX names.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-swedish
   (package
     (name "texlive-babel-swedish")
-- 
cgit 1.4.1


From c24e6ae84c6cd1a4cf7b4b47695277af40fa9d11 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:54:19 +0200
Subject: gnu: Add texlive-babel-spanish.

* gnu/packages/tex.scm (texlive-babel-spanish): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e0ef0efd7d..6933a37d80 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9047,6 +9047,27 @@ Portuguese and Brazilian Portuguese in Babel.  Some shortcuts are defined, as
 well as translations to Portuguese of standard LaTeX names.")
     (license license:lppl1.3+)))
 
+(define-public texlive-babel-spanish
+  (package
+    (name "texlive-babel-spanish")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-spanish/"
+                   "source/generic/babel-spanish/"
+                   "tex/generic/babel-spanish/")
+             (base32
+              "0nzc4hs91a901cjy2vhpamdw3gyxp7k2lmag9ni8zmy180zncm5g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-spanish")
+    (synopsis "Babel support for Spanish")
+    (description
+     "This bundle provides the means to typeset Spanish text, with the support
+provided by the LaTeX standard package Babel.  Note that separate support is
+provided for those who wish to typeset Spanish as written in Mexico.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-swedish
   (package
     (name "texlive-babel-swedish")
-- 
cgit 1.4.1


From bc64ba55c987e037651f867f04a6532165a8d506 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:54:40 +0200
Subject: gnu: Add texlive-revtex.

* gnu/packages/tex.scm (texlive-revtex): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6933a37d80..0d7e88e7f8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10981,6 +10981,26 @@ functions (curves, tangents, integrals, sequences) statistic diagrams plane
 geometry (polygons, circles), arrays and game boards.")
     (license license:lppl1.3c)))
 
+(define-public texlive-revtex
+  (package
+    (name "texlive-revtex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/revtex/" "doc/latex/revtex/"
+                   "source/latex/revtex/" "tex/latex/revtex/")
+             (base32
+              "0w4vmrghnhs8bgpbdp2rzsh4b7hgvldyzkd870wa27k9wk2lk6a1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/revtex")
+    (synopsis "Styles for various Physics Journals")
+    (description
+     "This package includes styles for American Physical Society, American
+Institute of Physics, and Optical Society of America.  The distribution
+consists of the RevTeX class itself, and several support packages.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-roex
   (package
     (name "texlive-roex")
-- 
cgit 1.4.1


From c7d9f162a12082921e60c1c37018cc0d94881119 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:55:01 +0200
Subject: gnu: Add texlive-synctex.

* gnu/packages/tex.scm (texlive-synctex): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0d7e88e7f8..56dfd0acb1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11352,6 +11352,28 @@ of which make use of the @code{stackengine} core.")
      "The package provides macros for drawing Chinese and Japanese abaci.")
     (license license:lppl)))
 
+(define-public texlive-synctex
+  (package
+    (name "texlive-synctex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/synctex.1"
+                   "doc/man/man1/synctex.man1.pdf"
+                   "doc/man/man5/synctex.5"
+                   "doc/man/man5/synctex.man5.pdf")
+             (base32
+              "1a2nlmbib8723jjhf6xxh5rpmnd5jv3cd69br4ihchbq5ipzircp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/synctex")
+    (synopsis "Engine-level feature synchronizing output and source")
+    (description
+     "SyncTeX allows navigating between the TeX source and (usually PDF)
+output, in both directions, given a SyncTeX-aware front end.  It is compiled
+into most engines and can be enabled with the @samp{--synctex=1} option.")
+    (license license:expat)))
+
 (define-public texlive-tetragonos
   (package
     (name "texlive-tetragonos")
-- 
cgit 1.4.1


From e2807eddc5d016491422a81cccde041bdd971b0e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 16:55:37 +0200
Subject: gnu: Add texlive-scheme-small.

* gnu/packages/tex.scm (texlive-scheme-small): New variable.
---
 gnu/packages/tex.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 56dfd0acb1..aeb7c5ccfa 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -917,6 +917,55 @@ Live infrastructure.  This scheme corresponds exactly to
 @code{collection-basic}.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-scheme-small
+  (package
+    (name "texlive-scheme-small")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-babel-basque
+           texlive-babel-czech
+           texlive-babel-danish
+           texlive-babel-dutch
+           texlive-babel-english
+           texlive-babel-finnish
+           texlive-babel-french
+           texlive-babel-german
+           texlive-babel-hungarian
+           texlive-babel-italian
+           texlive-babel-norsk
+           texlive-babel-polish
+           texlive-babel-portuges
+           texlive-babel-spanish
+           texlive-babel-swedish
+           texlive-collection-basic
+           texlive-collection-latex
+           texlive-collection-latexrecommended
+           texlive-collection-metapost
+           texlive-collection-xetex
+           texlive-ec
+           texlive-eurosym
+           texlive-hyphen-complete
+           texlive-lm
+           texlive-lualibs
+           texlive-luaotfload
+           texlive-luatexbase
+           texlive-revtex
+           texlive-synctex
+           texlive-times
+           texlive-tipa
+           texlive-ulem
+           texlive-upquote
+           texlive-zapfding))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Small scheme (basic, XeTeX, Metapost, and a few languages)")
+    (description
+     "This is a small TeX Live scheme, corresponding to MacTeX's BasicTeX
+variant.  It adds XeTeX, MetaPost, and some recommended packages to
+@code{scheme-basic}.")
+    (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.
-- 
cgit 1.4.1


From e7274a98d5f5732ca276c0b47048d70869957ebf Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 23:49:34 +0200
Subject: guix: licenses: Add Academic Free License 2.1.

* guix/licenses.scm (afl2.1): New variable.
---
 guix/licenses.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/guix/licenses.scm b/guix/licenses.scm
index e7e6ef3545..10f36b02f9 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -39,6 +39,7 @@
 (define-module (guix licenses)
   #:use-module (srfi srfi-9)
   #:export (license? license-name license-uri license-comment
+            afl2.1
             agpl1 agpl3 agpl3+
             apsl2
             asl1.1 asl2.0
@@ -171,6 +172,11 @@ cases, reduces to #t at macro-expansion time."
 
 (begin-license-definitions license?
 
+(define afl2.1
+  (license "AFL 2.1"
+           "https://spdx.org/licenses/AFL-2.1.html"
+           "https://www.gnu.org/licenses/license-list#AcademicFreeLicense"))
+
 (define agpl1
   (license "AGPL 1"
            "https://gnu.org/licenses/agpl.html"
-- 
cgit 1.4.1


From b5d9ae22f5177778b6af28fc7848358e31cc828f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 03:07:29 +0200
Subject: guix: texlive importer ignores Asymptote package.

Asymptote is provided in `asymptote' Guix package.  OTOH, asy executable is
not built from TeX Live tree.  Therefore, Asymptote package from TeX Live can be ignored.

* guix/import/texlive.scm (translate-depends): Ignore Asymptote package.
---
 guix/import/texlive.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index de08981d46..e7229b47d1 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -160,6 +160,8 @@ When TEXLIVE-ONLY is true, only TeX Live packages are returned."
                  ;; And also development packages, which should inherit from
                  ;; the current package anyway.
                  ((? (cut string-suffix? "-dev" <>)) #f)
+                 ;; Guix does not use Asymptote from TeX Live.  Ignore it.
+                 ("asymptote" #f)
                  ;; Others.
                  (name name))
                depends)))
-- 
cgit 1.4.1


From 985cf777b9aa394d4469205d6fea98d367a2ef32 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 09:54:29 +0200
Subject: guix: texlive import ignores TeXworks.

* guix/import/texlive.scm (translate-depends): Ignore TeXworks files from TeX
Live, since they are Windows-only.
---
 guix/import/texlive.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index e7229b47d1..bddd9f1c5a 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -162,6 +162,8 @@ When TEXLIVE-ONLY is true, only TeX Live packages are returned."
                  ((? (cut string-suffix? "-dev" <>)) #f)
                  ;; Guix does not use Asymptote from TeX Live.  Ignore it.
                  ("asymptote" #f)
+                 ;; TeXworks in TeX Live is only for Windows.  Don't bother.
+                 ((or "texworks" "collection-texworks") #f)
                  ;; Others.
                  (name name))
                depends)))
-- 
cgit 1.4.1


From 1dc79714296c5931c61ae0a70b786ce3b7591e28 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 10:46:53 +0200
Subject: guix: texlive importer handles scripts with ".texlua" extension.

* guix/import/texlive.scm (linked-scripts): Also offer to link scripts with
a ".texlua" extension.
---
 guix/import/texlive.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index bddd9f1c5a..29c2ba4dd1 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -298,8 +298,8 @@ 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\", \".tlu\" extensions, and files
-without extension."
+\".lua\", \".pl\", \".py\", \".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.
              (depend (assoc-ref data 'depend))
@@ -317,7 +317,7 @@ without extension."
     (filter-map (lambda (script)
                   (and (any (lambda (ext)
                               (member (basename script ext) binaries))
-                            '(".lua" ".pl" ".py" ".sh" ".tcl" ".tlu"))
+                            '(".lua" ".pl" ".py" ".sh" ".tcl" ".texlua" ".tlu"))
                        (basename script)))
                 ;; Get the right (alphabetic) order.
                 (reverse scripts))))
-- 
cgit 1.4.1


From 6f48c2b28a73d4e255ab652685d6dff6992ba8ad Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 17 Jul 2023 12:08:05 +0200
Subject: gnu: texlive-xindy: Fix package.

This change reverts 81718f27fd0153c8637b0ce13fe5540c0085988c.

* gnu/packages/tex.scm (texlive-xindy)[build-system]: Use GNU-BUILD-SYSTEM.
[arguments]: Derive from texlive-libkpathsea's.  Add a custom install phase.
---
 gnu/packages/tex.scm | 61 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index aeb7c5ccfa..6b1c45a699 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -22442,40 +22442,51 @@ handle complex tests.")
 
 (define-public texlive-xindy
   (package
+    ;; Texmf tree in TeX Live is incomplete, as it doesn't include
+    ;; "xindy.mem", so it is not possible to use `texlive-origin'.  This file
+    ;; isn't build by default by `texlive-bin' either.  Build it specially
+    ;; from `texlive-bin' source instead.
+    (inherit texlive-libkpathsea)
     (name "texlive-xindy")
     (version (number->string %texlive-revision))
-    (source (texlive-origin
-             name version
-             (list "doc/man/man1/tex2xindy.1"
-                   "doc/man/man1/tex2xindy.man1.pdf"
-                   "doc/man/man1/texindy.1"
-                   "doc/man/man1/texindy.man1.pdf"
-                   "doc/man/man1/xindy.1"
-                   "doc/man/man1/xindy.man1.pdf"
-                   "doc/xindy/"
-                   "scripts/xindy/"
-                   "xindy/")
-             (base32
-              "12j2bi0wwp1hyxr1427hhigqmhsd1fyg90bvghxkm1qck85r24vf")))
     (outputs '("out" "doc"))
-    (build-system texlive-build-system)
+    (build-system gnu-build-system)
     (arguments
-     (list
-      #:link-scripts #~(list "texindy.pl" "xindy.pl")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-inputs
-            (lambda* (#:key inputs #:allow-other-keys)
-              (with-directory-excursion "scripts/xindy/"
+     (substitute-keyword-arguments (package-arguments texlive-libkpathsea)
+       ((#:out-of-source? _ #t) #t)
+       ((#:configure-flags flags)
+        #~(cons "--enable-xindy" (delete "--enable-kpathsea" #$flags)))
+       ((#:phases _)
+        #~(modify-phases %standard-phases
+            (replace 'install
+              (lambda _
+                (with-directory-excursion "utils/xindy/"
+                  (invoke "make")
+                  (mkdir-p (string-append #$output "/bin"))
+                  (invoke "make" "install")
+                  (let ((out (string-append #$output "/share"))
+                        (doc (string-append #$output:doc "/share/texmf-dist")))
+                    (mkdir-p doc)
+                    (with-directory-excursion doc
+                      (rename-file (string-append out "/texmf-dist/doc") "doc")
+                      (rename-file (string-append out "/man") "doc/man"))))))
+            (add-after 'install 'patch-clisp-location
+              (lambda* (#:key inputs #:allow-other-keys)
                 ;; The scripts are encoded in ISO-8859-1 (or iso-latin-1).
                 (with-fluids ((%default-port-encoding "ISO-8859-1"))
-                  (substitute* (list "texindy.pl" "xindy.pl")
+                  (substitute* (find-files #$output "xindy\\.pl$")
                     (("our \\$clisp = .*")
                      (format #f "our $clisp = ~s;~%"
-                             (search-input-file inputs "/bin/clisp")))
-                    (("/usr/bin/env perl")
-                     (search-input-file inputs "/bin/perl"))))))))))
+                             (search-input-file inputs "/bin/clisp")))))))))))
+    (native-inputs
+     (list clisp
+           (texlive-updmap.cfg
+            (list texlive-cbfonts-fd
+                  texlive-cyrillic
+                  texlive-greek-fontenc
+                  texlive-lh))))
     (inputs (list clisp perl))
+    (native-search-paths '())
     (home-page "https://ctan.org/pkg/xindy")
     (synopsis "General-purpose index processor")
     (description
-- 
cgit 1.4.1


From e7f082503079847e8a0bc28bb4c9726172ef6483 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 23:50:44 +0200
Subject: gnu: Add texlive-a2ping.

* gnu/packages/tex.scm (texlive-a2ping): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6b1c45a699..edb64d413c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1037,6 +1037,32 @@ ones.")
 (define-deprecated/alias texlive-union texlive-updmap.cfg)
 (export texlive-union)
 
+(define-public texlive-a2ping
+  (package
+    (name "texlive-a2ping")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/a2ping.1"
+                   "doc/man/man1/a2ping.man1.pdf"
+                   "doc/support/a2ping/" "scripts/a2ping/")
+             (base32
+              "1lhmh1rnykmi6i5mklj7fwhndw1xxmwy2xsy8j1px8ishf5czhvq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "a2ping.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/a2ping")
+    (synopsis "Advanced PS, PDF, EPS converter")
+    (description
+     "@command{a2ping} is a Perl script command line utility written for Unix
+that converts many raster image and vector graphics formats to EPS or PDF and
+other page description formats.  Accepted input file formats are:
+PS (PostScript), EPS, PDF, PNG, JPEG, TIFF, PNM, BMP, GIF, LBM, XPM, PCX,
+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-accfonts
   (package
     (name "texlive-accfonts")
-- 
cgit 1.4.1


From 54af21813440010ef441c5dbcbc45e887871551e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 23:51:13 +0200
Subject: gnu: Add texlive-adhocfilelist.

* gnu/packages/tex.scm (texlive-adhocfilelist): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index edb64d413c..b66f3c386e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1087,6 +1087,29 @@ works on TeX virtual fonts and @command{vpl2ovp} transforms a TeX font to an
 Omega one.")
     (license license:gpl3+)))
 
+(define-public texlive-adhocfilelist
+  (package
+    (name "texlive-adhocfilelist")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/adhocfilelist/"
+                   "scripts/adhocfilelist/"
+                   "source/support/adhocfilelist/"
+                   "tex/support/adhocfilelist/")
+             (base32
+              "097yy38571fa2hzp4s3p125xknqgjmkhv1vgi0q9vz83b6175hc4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "adhocfilelist.sh")))
+    (home-page "https://ctan.org/pkg/adhocfilelist")
+    (synopsis "@code{\\listfiles} entries from the command line")
+    (description
+     "The package provides a Unix shell script to display a list of LaTeX
+@code{\\Provides}...-command contexts on screen.  Provision is made for
+controlling the searches that the package does.")
+    (license license:lppl)))
+
 (define-public texlive-afm2pl
   (package
     (name "texlive-afm2pl")
-- 
cgit 1.4.1


From fbae0395fd6d07059637dc38804331bb88098c1e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 23:51:39 +0200
Subject: gnu: Add texlive-arara.

* gnu/packages/tex.scm (texlive-arara): New variable.
---
 gnu/packages/tex.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b66f3c386e..de7bca00ad 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -81,6 +81,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages java)
   #:use-module (gnu packages libreoffice)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages multiprecision)
@@ -1156,6 +1157,40 @@ ligatures, but also offers additional control over them.")
 a given (Unicode) glyph.  It relies on Fontconfig.")
     (license license:bsd-3)))
 
+(define-public texlive-arara
+  (package
+    (name "texlive-arara")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/arara.1"
+                   "doc/man/man1/arara.man1.pdf"
+                   "doc/support/arara/" "scripts/arara/"
+                   "source/support/arara/")
+             (base32
+              "0sshjaxz1ar24mr7dny0lp9l0bggyfsb0868s4b1k00w6jyzh1i8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:link-scripts #~(list "arara.sh")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'locate-java
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "scripts/arara/arara.sh"
+                (("java") (search-input-file inputs "/bin/java"))))))))
+    (inputs (list icedtea))
+    (home-page "https://ctan.org/pkg/arara")
+    (synopsis "Automation of LaTeX compilation")
+    (description
+     "Arara is comparable with other well-known compilation tools like
+@command{latexmk} and @command{rubber}.  The key difference is that Arara
+determines its actions from metadata in the source code, rather than relying
+on indirect resources, such as log file analysis.  Arara requires a Java
+virtual machine.")
+    (license license:bsd-3)))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From 4dd849645c4fd3135c6388c90228440e9d07b2f3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 23:51:56 +0200
Subject: gnu: Add texlive-bibtex8.

* gnu/packages/tex.scm (texlive-bibtex8): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index de7bca00ad..221fe806c2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1221,6 +1221,28 @@ 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-bibtex8
+  (package
+    (name "texlive-bibtex8")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/csf/base/" "bibtex/csf/polish-csf/"
+                   "doc/bibtex8/" "doc/man/man1/bibtex8.1"
+                   "doc/man/man1/bibtex8.man1.pdf")
+             (base32
+              "1ywv5rdk08dnrqr09pnjzff37x2c9m5i1wjzfsjnvm068is58c7s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bibtex8")
+    (synopsis "BibTeX variant supporting 8-bit encodings")
+    (description
+     "BibTeX8 is an enhanced, portable C version of BibTeX.  It is enhanced by
+conversion to larger (32-bit) capacity, addition of run-time selectable
+capacity and 8-bit support extensions.  National character set and sorting
+order are controlled by an external configuration file.")
+    (license license:gpl3+)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From a75bad1b83e0bf22b17b582a4cf1a6a277a5941f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 23:52:07 +0200
Subject: gnu: Add texlive-bibtexu.

* gnu/packages/tex.scm (texlive-bibtexu): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 221fe806c2..764a408900 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1243,6 +1243,25 @@ capacity and 8-bit support extensions.  National character set and sorting
 order are controlled by an external configuration file.")
     (license license:gpl3+)))
 
+(define-public texlive-bibtexu
+  (package
+    (name "texlive-bibtexu")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/bibtexu/" "doc/man/man1/bibtexu.1"
+                   "doc/man/man1/bibtexu.man1.pdf")
+             (base32
+              "19bp8wn0ssz7gczxp0imbpgi1zwz9x3ya67f072rjzg2zmfpphqg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bibtexu")
+    (synopsis "BibTeX variant supporting Unicode (UTF-8), via ICU")
+    (description
+     "BibTeXu is an enhanced, portable C version of BibTeX.  Unicode is
+supported via the ICU library.")
+    (license license:gpl3+)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From 409d963ab93350c2831a62ef26b73a6c821a829e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 23:52:27 +0200
Subject: gnu: Add texlive-bundledoc.

* gnu/packages/tex.scm (texlive-bundledoc): New variable.
---
 gnu/packages/tex.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 764a408900..d10defafa6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1262,6 +1262,39 @@ order are controlled by an external configuration file.")
 supported via the ICU library.")
     (license license:gpl3+)))
 
+(define-public texlive-bundledoc
+  (package
+    (name "texlive-bundledoc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/arlatex.1"
+                   "doc/man/man1/arlatex.man1.pdf"
+                   "doc/man/man1/bundledoc.1"
+                   "doc/man/man1/bundledoc.man1.pdf"
+                   "doc/support/bundledoc/"
+                   "scripts/bundledoc/"
+                   "tex/latex/bundledoc/")
+             (base32
+              "1drgwqgkhr6ba4c21kyykl5y92x7dp6971if2hfcxsqk6kqy3ip1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "arlatex" "bundledoc")))
+    (home-page "https://ctan.org/pkg/bundledoc")
+    (synopsis "Bundle together all the files needed to build a LaTeX document")
+    (description
+     "The @code{bundledoc} package is a post-processor for the snapshot
+package that bundles together all the classes, packages and files needed to
+build a given LaTeX document.  It reads the @file{.dep} file that snapshot
+produces, finds each of the files mentioned therein, and archives them into
+a single @file{.tar.gz} (or @file{.zip}, or whatever) file, suitable for
+moving across systems, transmitting to a colleague, etc.  A script,
+@command{arlatex}, provides an alternative archiving mechanism, creating
+a single LaTeX file that contains all of the ancillary files of a LaTeX
+document, together with the document itself, using the @code{filecontents*}
+environment.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From ca177406f77c02ce6d0424384c9cbc399e9e1b57 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 23:52:39 +0200
Subject: gnu: Add texlive-checklistings.

* gnu/packages/tex.scm (texlive-checklistings): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d10defafa6..109a2ae1ab 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1295,6 +1295,33 @@ document, together with the document itself, using the @code{filecontents*}
 environment.")
     (license license:lppl1.3c)))
 
+(define-public texlive-checklistings
+  (package
+    (name "texlive-checklistings")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/checklistings/"
+                   "scripts/checklistings/"
+                   "source/latex/checklistings/"
+                   "tex/latex/checklistings/")
+             (base32
+              "1ggq4i7nfx6ijqikgr48qgaaf7rd9h4a834gwsz8dv5f0zmgg1za")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "checklistings.sh")))
+    (home-page "https://ctan.org/pkg/checklistings")
+    (synopsis
+     "Pass verbatim contents through a compiler and reincorporate the resulting output")
+    (description
+     "This package augments the @code{fancyvrb} and @code{listings} packages
+to allow the source code they contain to be checked by an external tool (like
+a compiler).  The external tool's messages can be automatically reincorporated
+into the original document.  The package does not focus on a specific
+programming language, but it is designed to work well with languages and
+compilers in the ML family.")
+    (license license:lppl1.2+)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From 8787605c5ecb28b9ffa5eaa2f2f5fa998ccfd12a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 23:52:53 +0200
Subject: gnu: Add texlive-chklref.

* gnu/packages/tex.scm (texlive-chklref): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 109a2ae1ab..2121caad40 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1322,6 +1322,31 @@ programming language, but it is designed to work well with languages and
 compilers in the ML family.")
     (license license:lppl1.2+)))
 
+(define-public texlive-chklref
+  (package
+    (name "texlive-chklref")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/chklref.1"
+                   "doc/man/man1/chklref.man1.pdf"
+                   "doc/support/chklref/" "scripts/chklref/"
+                   "tex/latex/chklref/")
+             (base32
+              "1namyi035gqhvldplj0yzfkgxq91zrifqxhsf32jgxhjgcbbal6g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "chklref.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/chklref")
+    (synopsis "Check for problems with labels in LaTeX")
+    (description
+     "It is quite common that after modifying a TeX file, many unused labels
+remain in it.  The purpose of chklref is to automatically find these useless
+labels.  It also looks for non starred mathematical environments with no
+labels and advises the user to use a starred version instead.")
+    (license license:gpl3)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From 270c474bd7f9d643c58eee62f2205faa17720aa1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 23:53:05 +0200
Subject: gnu: Add texlive-chktex.

* gnu/packages/tex.scm (texlive-chktex): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2121caad40..a42b123a63 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1347,6 +1347,34 @@ labels.  It also looks for non starred mathematical environments with no
 labels and advises the user to use a starred version instead.")
     (license license:gpl3)))
 
+(define-public texlive-chktex
+  (package
+    (name "texlive-chktex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "chktex/"
+                   "doc/chktex/"
+                   "doc/man/man1/chktex.1"
+                   "doc/man/man1/chktex.man1.pdf"
+                   "doc/man/man1/chkweb.1"
+                   "doc/man/man1/chkweb.man1.pdf"
+                   "doc/man/man1/deweb.1"
+                   "doc/man/man1/deweb.man1.pdf"
+                   "scripts/chktex/")
+             (base32
+              "0qyrllxvcymmr1a4sq9c88fw5zchcx0n6yac69s61fg6xypk18bq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "chkweb.sh" "deweb.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/chktex")
+    (synopsis "Check for errors in LaTeX documents")
+    (description
+     "The program reports typographic and other errors in LaTeX documents.
+Filters are also provided for checking the LaTeX parts of CWEB documents.")
+    (license license:gpl2+)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From d30975067aee0f9de13c29b7ae0daaa8d02c6119 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 23:53:27 +0200
Subject: gnu: Add texlive-clojure-pamphlet.

* gnu/packages/tex.scm (texlive-clojure-pamphlet): New variable.
---
 gnu/packages/tex.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a42b123a63..9235d8de7a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1375,6 +1375,37 @@ labels and advises the user to use a starred version instead.")
 Filters are also provided for checking the LaTeX parts of CWEB documents.")
     (license license:gpl2+)))
 
+(define-public texlive-clojure-pamphlet
+  (package
+    (name "texlive-clojure-pamphlet")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/pamphletangler.1"
+                   "doc/man/man1/pamphletangler.man1.pdf"
+                   "doc/support/clojure-pamphlet/"
+                   "scripts/clojure-pamphlet/"
+                   "source/support/clojure-pamphlet/"
+                   "tex/latex/clojure-pamphlet/")
+             (base32
+              "0dadr9wg7fa2vb6qkzqghrwmnns8jf4la1gb837a59jz2lh8955h")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "pamphletangler")))
+    (home-page "https://ctan.org/pkg/clojure-pamphlet")
+    (synopsis "Literate programming tool based on Clojure's Pamphlet system")
+    (description
+     "The Clojure pamphlet system is a system based on the Clojure literate
+system.  In the Clojure's pamphlet system you have your main LaTeX file, which
+can be compiled regularly.  This file contains documentation and source
+code (just like in other forms of literate programming).  These code snippets
+are wrapped in the @code{chunk} environment, hence they can be recognized by
+the tangler in order to extract them.  Chunks can be included inside each
+other by the @code{getchunk} command (which will be typesetted accordingly).
+Finally, the LaTeX file will be run through the tangler to get the desired
+chunk of code.")
+    (license license:gpl3+)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From ecd6935a0941ee57dbcf586655ce3d20ea068249 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 23:53:44 +0200
Subject: gnu: Add texlive-cluttex.

* gnu/packages/tex.scm (texlive-cluttex): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9235d8de7a..04863cb744 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1406,6 +1406,31 @@ Finally, the LaTeX file will be run through the tangler to get the desired
 chunk of code.")
     (license license:gpl3+)))
 
+(define-public texlive-cluttex
+  (package
+    (name "texlive-cluttex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/cluttex/" "scripts/cluttex/")
+             (base32
+              "06i59jxanssx0hngnzkvmigg4gh0szm8n11095wlpdqrma1d162c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "cluttex.lua")))
+    (home-page "https://ctan.org/pkg/cluttex")
+    (synopsis "Automation tool for running LaTeX")
+    (description
+     "This is another tool for the automation of LaTeX document processing,
+like @command{latexmk} or @command{arara}.  The main feature of this tool is
+that it does not clutter your working directory with @file{.aux} or
+@file{.log} or other auxiliary files.  It has of course the usual features of
+automation tools.  It automatically re-runs (La)TeX for cross-references.
+MakeIndex, BibTeX, Biber, or @command{makeglossaries} will be executed if
+a corresponding option is set.  Furthermore, @command{cluttex} can watch input
+files for changes (using an external program).")
+    (license license:gpl3+)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From efe1112548dae8efb0dd4b23241790955138ee1b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 23:53:59 +0200
Subject: gnu: Add texlive-ctan-o-mat.

* gnu/packages/tex.scm (texlive-ctan-o-mat): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 04863cb744..3cc8c0880d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1431,6 +1431,34 @@ a corresponding option is set.  Furthermore, @command{cluttex} can watch input
 files for changes (using an external program).")
     (license license:gpl3+)))
 
+(define-public texlive-ctan-o-mat
+  (package
+    (name "texlive-ctan-o-mat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin name version
+                            (list "doc/man/man1/ctan-o-mat.1"
+                                  "doc/man/man1/ctan-o-mat.man1.pdf"
+                                  "doc/support/ctan-o-mat/"
+                                  "scripts/ctan-o-mat/")
+                            (base32
+                             "1pm95xh3ji2sgdy243nbnzxsg2p4xpl3pymkm5yg2fn3nzgwgnaf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "ctan-o-mat.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/ctan-o-mat")
+    (synopsis "Upload or validate a package for CTAN")
+    (description
+     "This program can be used to automate the upload of a package to CTAN.
+The description of the package is contained in a configuration file.  The
+provided information is validated in any case.  If the validation succeeds and
+not only the validation is requested, then the provided archive file will be
+placed in the incoming area of the CTAN for further processing by the CTAN
+team.  In any case any finding during the validation is reported at the end of
+the processing.  Note that the validation is the default and an official
+submission has to be requested by an appropriate command line option.")
+    (license license:bsd-3)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From 8b495d5f775106b3c5630862bcb5801273e35fee Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 15 Jul 2023 23:54:14 +0200
Subject: gnu: Add texlive-ctan-chk.

* gnu/packages/tex.scm (texlive-ctan-chk): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3cc8c0880d..87d947514d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1459,6 +1459,26 @@ the processing.  Note that the validation is the default and an official
 submission has to be requested by an appropriate command line option.")
     (license license:bsd-3)))
 
+(define-public texlive-ctan-chk
+  (package
+    (name "texlive-ctan-chk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/ctan_chk/")
+             (base32
+              "09ngqgs08q8bld334jrzhnd558lv7fajfppmfrkp4kv9hc5iyz9a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ctan_chk")
+    (synopsis "CTAN guidelines verifier and corrector for uploading projects")
+    (description
+     "@code{ctan_chk} is a basic Gawk program that uses CTAN's published
+guidelines for authors to help eliminate sloppiness in uploaded
+files/projects.  It is completely open for users to program additional
+guidelines as well as CTAN's future adjustments.")
+    (license license:gpl3)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From ead4e6b7b84dfa75cb568a3b95e5605dfdc7b1bd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 09:56:22 +0200
Subject: gnu: Add texlive-ctanbib.

* gnu/packages/tex.scm (texlive-ctanbib): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 87d947514d..40d4917ced 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1479,6 +1479,28 @@ files/projects.  It is completely open for users to program additional
 guidelines as well as CTAN's future adjustments.")
     (license license:gpl3)))
 
+(define-public texlive-ctanbib
+  (package
+    (name "texlive-ctanbib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/ctanbib.1"
+                   "doc/man/man1/ctanbib.man1.pdf"
+                   "doc/support/ctanbib/" "scripts/ctanbib/")
+             (base32
+              "0vlx37g8mp8rqb744bngykzh8yszscw2vlv7n78c8ymagx2c1xpf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "ctanbib")))
+    (home-page "https://ctan.org/pkg/ctanbib")
+    (synopsis "Export CTAN entries to bib format")
+    (description
+     "This package provides a Lua script which can be used for retrieving
+bibliographic information in BibLaTeX format for packages hosted on CTAN.  The
+@command{ctanbib} script depends only on LuaXML.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From b193df530c4736fb1972e79754b022f676427c4d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 09:56:48 +0200
Subject: gnu: Add texlive-ctanify.

* gnu/packages/tex.scm (texlive-ctanify): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 40d4917ced..e7d2c0a422 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1501,6 +1501,33 @@ bibliographic information in BibLaTeX format for packages hosted on CTAN.  The
 @command{ctanbib} script depends only on LuaXML.")
     (license license:lppl1.3+)))
 
+(define-public texlive-ctanify
+  (package
+    (name "texlive-ctanify")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ctanify/"
+                   "doc/man/man1/ctanify.1"
+                   "doc/man/man1/ctanify.man1.pdf"
+                   "scripts/ctanify/")
+             (base32
+              "1m6gldzm0sm4j7v2kkrpqikx004sqdq0f2gw13gc8ccqzl745cjw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "ctanify")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/ctanify")
+    (synopsis "Prepare a package for upload to CTAN")
+    (description
+     "Given a list of filenames, @command{ctanify} creates a tarball (a
+@file{.tar.gz} file) with the files laid out in CTAN's preferred structure.
+By default this tarball additionally contains a ZIP file with copies of all
+files laid out in the standard TeX Directory Structure (TDS), which may be
+used by those intending to install the package, or by those who need to
+incorporate it in a distribution.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From 6481cd3bda3cdfffe1946580e3a8b326d70c2199 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 09:57:04 +0200
Subject: gnu: Add texlive-ctanupload.

* gnu/packages/tex.scm (texlive-ctanupload): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e7d2c0a422..3e77197453 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1528,6 +1528,29 @@ used by those intending to install the package, or by those who need to
 incorporate it in a distribution.")
     (license license:lppl1.3c)))
 
+(define-public texlive-ctanupload
+  (package
+    (name "texlive-ctanupload")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/ctanupload/"
+                   "scripts/ctanupload/")
+             (base32
+              "0w4k9sslhnpn5l90wbr7cr7pv8fhiiabasbi6l6gw3w3nrfmarh4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "ctanupload.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/ctanupload")
+    (synopsis "Support for users uploading to CTAN")
+    (description
+     "The package provides a Perl script that allows the uploads of
+a contribution to CTAN from the command line.  The aim is to simplify the
+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-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From 3222883eca43e332d75af2ac7a89780817b2b0c2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 09:58:14 +0200
Subject: gnu: Add texlive-ctie.

* gnu/packages/tex.scm (texlive-ctie): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3e77197453..42003e5ce8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1551,6 +1551,25 @@ 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-ctie
+  (package
+    (name "texlive-ctie")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/ctie.1"
+                   "doc/man/man1/ctie.man1.pdf")
+             (base32
+              "1avhvyv70jds5xzwp7p1km6d8yha84ckqdw1r1vkgfb959wd3yi1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-kpathsea))
+    (home-page "https://ctan.org/pkg/ctie")
+    (synopsis "C version of @code{tie} (merging Web change files)")
+    (description
+     "This is a version of @code{tie} converted for use with Cweb.")
+    (license license:gpl3+)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From cef8d620b35d1881989e9972e19f0fd6d3ae21c0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 09:58:38 +0200
Subject: gnu: Add texlive-de-macro.

* gnu/packages/tex.scm (texlive-de-macro): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 42003e5ce8..cb5f161ddb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1570,6 +1570,30 @@ team (2015-02-05): It seems that this script is currently not working.")
      "This is a version of @code{tie} converted for use with Cweb.")
     (license license:gpl3+)))
 
+(define-public texlive-de-macro
+  (package
+    (name "texlive-de-macro")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/de-macro/" "scripts/de-macro/")
+             (base32
+              "1lrrgdmzr6k2v6brz8w1s9v77c7pm7vmcvwga3d0pfndb39bh49j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "de-macro")))
+    (inputs (list python))
+    (home-page "https://ctan.org/pkg/de-macro")
+    (synopsis "Expand private macros in a document")
+    (description
+     "De-macro is a Python script that helps authors who like to use private
+LaTeX macros (for example, as abbreviations).  A technical editor or
+a cooperating author may balk at such a manuscript; you can avoid manuscript
+rejection misery by running de-macro on it.  De-macro will expand macros
+defined in @code{\\(re)newcommand} or @code{\\(re)newenvironment} commands,
+within the document, or in the document's private package file.")
+    (license license:afl2.1)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From 73d99c2c0a78e05bd8d6f82c419c3ccda2368a60 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 09:58:56 +0200
Subject: gnu: Add texlive-detex.

* gnu/packages/tex.scm (texlive-detex): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cb5f161ddb..e6a2c1c65f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1594,6 +1594,29 @@ defined in @code{\\(re)newcommand} or @code{\\(re)newenvironment} commands,
 within the document, or in the document's private package file.")
     (license license:afl2.1)))
 
+(define-public texlive-detex
+  (package
+    (name "texlive-detex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/detex.1"
+                   "doc/man/man1/detex.man1.pdf")
+             (base32
+              "08d017wn7a67pmp9b5yhnfg1x2q6f48qaa5ma4bplz9a782icwjy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/detex")
+    (synopsis "Strip TeX from a source file")
+    (description
+     "Detex is a program to remove TeX constructs from a text file.  It
+recognizes the @code{\\input} command.  The program assumes it is dealing with
+LaTeX input if it sees the string @code{\\begin@{document@}} in the text.  In
+this case, it also recognizes the @code{\\include} and @code{\\includeonly}
+commands.  The author now considers this program to be obsolete and Piotr
+Kubowicz's OpenDetex as its successor.")
+    (license license:bsd-3)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From c14dc4090987d71341cd3306d8b0f58d38fb62e0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 09:59:13 +0200
Subject: gnu: Add texlive-digestif.

* gnu/packages/tex.scm (texlive-digestif): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e6a2c1c65f..484152f583 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1617,6 +1617,27 @@ commands.  The author now considers this program to be obsolete and Piotr
 Kubowicz's OpenDetex as its successor.")
     (license license:bsd-3)))
 
+(define-public texlive-digestif
+  (package
+    (name "texlive-digestif")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/digestif/" "scripts/digestif/")
+             (base32
+              "1s7nmbjxpa6klmh0cc6g4s6vd9wmlv4dxp51xb4b872hrj510zbi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "digestif.texlua")))
+    (home-page "https://ctan.org/pkg/digestif")
+    (synopsis "Editor plugin for LaTeX, ConTeXt etc.")
+    (description
+     "Digestif is a code analyzer, and a language server, for LaTeX, plain TeX,
+ConTeXt and Texinfo.  It provides context-sensitive completion, documentation,
+code navigation, and related functionality to any text editor that speaks the
+LSP protocol.")
+    (license (list license:gpl3+ license:lppl1.3+ license:fdl1.3+))))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From 87029a6031dc3bb3ffa436509fd91acbc95d242e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:10:16 +0200
Subject: gnu: Add texlive-hook-pre-commit-pkg.

* gnu/packages/tex.scm (texlive-hook-pre-commit-pkg): New variable.
---
 gnu/packages/tex.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 484152f583..4fd56bfa13 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2220,6 +2220,50 @@ bookmark-enabled, so that every logo becomes available in bookmarks without
 further work.")
     (license license:lppl1.3c)))
 
+(define-public texlive-hook-pre-commit-pkg
+  (package
+    (name "texlive-hook-pre-commit-pkg")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/hook-pre-commit-pkg/")
+             (base32
+              "0mikg4p9wxb28vgwh1acgdhwa2fqnc8rw3jg355d6s137m40awc6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hook-pre-commit-pkg")
+    (synopsis "Pre-commit git hook for LaTeX package developpers")
+    (description
+     "This package provides a pre-commit git hook to check basic LaTeX
+syntax for the use of package developers.  It is installed by copying
+it into the @file{.git/.hooks} file.  It then checks the following
+file types: @file{.sty}, @file{.dtx}, @file{.bbx}, @file{.cbx}, and
+@file{.lbx}.  It performs the following checks:
+
+@itemize
+
+@item each line must be terminated by @samp{%}, without a space before it;
+
+@item empty lines are allowed, but not lines with nothing but spaces in them;
+
+@item @code{\\begin@{macro@}} and @code{\\end@{macro@}} must be paired;
+
+@item @code{\\begin@{macrocode@}} and @code{\\end@{macrocode@}} must be
+paired;
+
+@item @code{\\begin@{macro@}} must have a second argument;
+
+@item one space must be printed between @samp{%} and @code{\\begin@{macro@}}
+or @code{\\end@{macro@}}. @samp{%} must be the first character in the line;
+
+@item four spaces must be printed between @samp{%} and
+@code{\\begin@{macrocode@}} or @code{\\end@{macrocode@}};
+
+@item @code{\\cs} argument must not start with a backslash.
+
+@end itemize")
+    (license license:gpl3)))
+
 (define-public texlive-hopatch
   (package
     (name "texlive-hopatch")
-- 
cgit 1.4.1


From bb0a714271f72b91f9f3745b0cbf8c73a1a998c0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:10:48 +0200
Subject: gnu: Add texlive-installfont.

* gnu/packages/tex.scm (texlive-installfont): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4fd56bfa13..c1c30cef44 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2355,6 +2355,32 @@ support for indexing.  For example, it supports multiple indexes in a single
 document and provides a more robust @code{\\index} command.")
     (license license:lppl1.2+)))        ;from "index.dtx"
 
+(define-public texlive-installfont
+  (package
+    (name "texlive-installfont")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/installfont/"
+                   "scripts/installfont/")
+             (base32
+              "0wgksqg88hdzfvrywrv91al9skpj2vly09ly7qmzahqsyvdgmb9p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "installfont-tl")))
+    (home-page "https://ctan.org/pkg/installfont")
+    (synopsis "Bash script for installing a LaTeX font family")
+    (description
+     "With this script you can install a LaTeX font family (PostScript Type 1,
+TrueType and OpenType formats are supported).  Font series from light to ultra
+bold, and (faked) small caps and (faked) slanted shapes are supported, but not
+expert fonts.  The script will rename the fonts automatically (optional) or
+will otherwise expect the @file{.afm} files and the font files (in PostScript
+Type1 format) named in the Karl Berry scheme (e.g., @file{5bbr8a.pfb}).  After
+running the script, you should have a working font installation in your local
+TeX tree.")
+    (license license:lppl)))
+
 (define-public texlive-dvipdfmx
   (package
     (name "texlive-dvipdfmx")
-- 
cgit 1.4.1


From f5cb25f11379256534b6ce24bc733b5ff64f2452 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:11:44 +0200
Subject: gnu: Add texlive-ketcindy.

* gnu/packages/tex.scm (texlive-ketcindy): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c1c30cef44..2fd021410f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2455,6 +2455,29 @@ does pdfTeX.")
 PostScript.")
     (license license:lppl)))
 
+(define-public texlive-ketcindy
+  (package
+    (name "texlive-ketcindy")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/ketcindy/" "scripts/ketcindy/"
+                   "tex/latex/ketcindy/")
+             (base32
+              "0jy8fzfqwbmnza43j70c22wr0nvx9km8g4n5vcgnjvc6js2nyxas")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "ketcindy.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/ketcindy")
+    (synopsis "Macros for graphic generation and Cinderella plugin")
+    (description
+     "KETpic is a macro package designed for computer algebra systems (CAS) to
+generate LaTeX source codes for high-quality mathematical artwork.  KETcindy
+is a plugin for Cinderella that allows to generate graphics using KETpic.  The
+generated code can be included in any LaTeX document.")
+    (license license:gpl3+)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 7b9dbd67173ed8fa8b4f4ecdc325ed6bcebe5b94 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:12:03 +0200
Subject: gnu: Add texlive-lacheck.

* gnu/packages/tex.scm (texlive-lacheck): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2fd021410f..cc50961351 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2478,6 +2478,24 @@ is a plugin for Cinderella that allows to generate graphics using KETpic.  The
 generated code can be included in any LaTeX document.")
     (license license:gpl3+)))
 
+(define-public texlive-lacheck
+  (package
+    (name "texlive-lacheck")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/lacheck.1"
+                   "doc/man/man1/lacheck.man1.pdf")
+             (base32
+              "1hhx65yd800bl3y2sq20lix60wd2b2j3k7n9s788mlsn8b0p7yq3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lacheck")
+    (synopsis "LaTeX checker")
+    (description
+     "Lacheck is a tool for finding common mistakes in LaTeX documents.")
+    (license license:gpl3+)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From ce34e05b3c9ec84effdb8105cc0893f1220fc4a3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:12:41 +0200
Subject: gnu: Add texlive-latex-git-log.

* gnu/packages/tex.scm (texlive-latex-git-log): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cc50961351..3fb5276988 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2496,6 +2496,30 @@ generated code can be included in any LaTeX document.")
      "Lacheck is a tool for finding common mistakes in LaTeX documents.")
     (license license:gpl3+)))
 
+(define-public texlive-latex-git-log
+  (package
+    (name "texlive-latex-git-log")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/latex-git-log.1"
+                   "doc/man/man1/latex-git-log.man1.pdf"
+                   "doc/support/latex-git-log/"
+                   "scripts/latex-git-log/")
+             (base32
+              "01v6frspg1zrs976bwsdz6qczg0h5z6by90hmlyy4z6l5shscpix")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "latex-git-log")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/latex-git-log")
+    (synopsis "Typeset @samp{git log} information")
+    (description
+     "The program is run within a Git repository, and outputs the entire
+version history, as a LaTeX table.  That output will typically be redirected
+to a file; the author recommends typesetting in landscape orientation.")
+    (license license:gpl3+)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 5763c204de777e8b9b8fac3d5fb2327157f1e13d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:12:55 +0200
Subject: gnu: Add texlive-latex-papersize.

* gnu/packages/tex.scm (texlive-latex-papersize): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3fb5276988..442b3ba61a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2520,6 +2520,29 @@ version history, as a LaTeX table.  That output will typically be redirected
 to a file; the author recommends typesetting in landscape orientation.")
     (license license:gpl3+)))
 
+(define-public texlive-latex-papersize
+  (package
+    (name "texlive-latex-papersize")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/latex-papersize/"
+                   "scripts/latex-papersize/")
+             (base32
+              "19nich5n4prd3g4lqm9iwn9h27h54mnycd6p4g5p18jc0b56l3n8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "latex-papersize.py")))
+    (inputs (list python))
+    (home-page "https://ctan.org/pkg/latex-papersize")
+    (synopsis "Calculate LaTeX settings for any font and paper size")
+    (description
+     "The package is a Python script, whose typical use is when preparing
+printed material for users with low vision.  The most effective way of doing
+this is to print on (notional) small paper, and then to magnify the result;
+the script calculates the settings for various font and paper sizes.")
+    (license license:asl2.0)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 2b628008ac3ac686f9d50cc2b8d67a534567f385 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:13:06 +0200
Subject: gnu: Add texlive-latex2man.

* gnu/packages/tex.scm (texlive-latex2man): New variable.
---
 gnu/packages/tex.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 442b3ba61a..df0993016a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2543,6 +2543,36 @@ this is to print on (notional) small paper, and then to magnify the result;
 the script calculates the settings for various font and paper sizes.")
     (license license:asl2.0)))
 
+(define-public texlive-latex2man
+  (package
+    (name "texlive-latex2man")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/info/latex2man.info"
+                   "doc/man/man1/latex2man.1"
+                   "doc/man/man1/latex2man.man1.pdf"
+                   "doc/support/latex2man/"
+                   "scripts/latex2man/"
+                   "tex/latex/latex2man/")
+             (base32
+              "0c5pfnhw80fh132k2dmj3qdjgvl9dm6xzv55f54g2wlswpzlinis")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "latex2man")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/latex2man")
+    (synopsis "Translate LaTeX-based manual pages into Unix man format")
+    (description
+     "Latex2man is a tool to translate UNIX manual pages written with LaTeX
+into the troff format understood by the UNIX man(1) command.  Alternatively
+HTML, TexInfo, or LaTeX code can be produced too.  Output of parts of the text
+may be supressed using the conditional text feature (for this, LaTeX
+generation may be used).  There is a LaTeX package (@file{latex2man.sty}) for
+writing the man page and a Perl script, @command{latex2man} that does the
+actual translation.")
+    (license license:lppl1.0+)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From bc9bcea942f10dcb8d4dd70ff97fae803159481c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:13:23 +0200
Subject: gnu: Add texlive-latex2nemeth.

* gnu/packages/tex.scm (texlive-latex2nemeth): New variable.
---
 gnu/packages/tex.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index df0993016a..6211544bb6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2573,6 +2573,39 @@ writing the man page and a Perl script, @command{latex2man} that does the
 actual translation.")
     (license license:lppl1.0+)))
 
+(define-public texlive-latex2nemeth
+  (package
+    (name "texlive-latex2nemeth")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/latex2nemeth/"
+                   "scripts/latex2nemeth/")
+             (base32
+              "04l3pnzwnh86ixlj7pjy6wgkzqm5i3ka332yfkl5f6cw48dw6xw5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:link-scripts #~(list "latex2nemeth")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'locate-java
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "scripts/latex2nemeth/latex2nemeth"
+                (("java") (search-input-file inputs "/bin/java"))))))))
+    (inputs (list icedtea))
+    (home-page "https://ctan.org/pkg/latex2nemeth")
+    (synopsis "Convert LaTeX source to Braille with math in Nemeth")
+    (description
+     "This package provides a program that converts LaTeX source to
+Braille/Nemeth.  It supports the Greek language, which is only Braille level
+1, but also English at level 1.  Simple pictures in PSTricks are also
+supported in order to produce tactile graphics with specialized equipment.
+Note that embossing will need LibreOffice and @code{odt2braille} as this
+project does not deal with embossers drivers.")
+    (license license:gpl3)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From cd54081a19f839134ca757301a0e785b672ba633 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:13:39 +0200
Subject: gnu: Add texlive-latexdiff.

* gnu/packages/tex.scm (texlive-latexdiff): New variable.
---
 gnu/packages/tex.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6211544bb6..29da870f97 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2606,6 +2606,43 @@ Note that embossing will need LibreOffice and @code{odt2braille} as this
 project does not deal with embossers drivers.")
     (license license:gpl3)))
 
+(define-public texlive-latexdiff
+  (package
+    (name "texlive-latexdiff")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/latexdiff-vc.1"
+                   "doc/man/man1/latexdiff-vc.man1.pdf"
+                   "doc/man/man1/latexdiff.1"
+                   "doc/man/man1/latexdiff.man1.pdf"
+                   "doc/man/man1/latexrevise.1"
+                   "doc/man/man1/latexrevise.man1.pdf"
+                   "doc/support/latexdiff/"
+                   "scripts/latexdiff/")
+             (base32
+              "03fnz7gilzwzgsqij10npfy8k2imhk5glfjijr52qgmg28r3xvi1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts
+           #~(list "latexdiff-vc.pl" "latexdiff.pl" "latexrevise.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/latexdiff")
+    (synopsis
+     "Determine and mark up significant differences between LaTeX files")
+    (description
+     "Latexdiff is a Perl script for visual mark up and revision of
+significant differences between two LaTeX files.  Various options are
+available for visual markup using standard LaTeX packages such as color.
+Changes not directly affecting visible text, for example in formatting
+commands, are still marked in the LaTeX source.  A rudimentary revision
+facilility is provided by another Perl script, @command{latexrevise}, which
+accepts or rejects all changes.  Manual editing of the difference file can be
+used to override this default behaviour and accept or reject selected changes
+only.")
+    (license license:gpl3)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 31db747769a36127eb47c3ba4ebaef3315f1856f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:15:34 +0200
Subject: gnu: Add texlive-latexfileversion.

* gnu/packages/tex.scm (texlive-latexfileversion): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 29da870f97..758248786f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2643,6 +2643,26 @@ used to override this default behaviour and accept or reject selected changes
 only.")
     (license license:gpl3)))
 
+(define-public texlive-latexfileversion
+  (package
+    (name "texlive-latexfileversion")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/latexfileversion/"
+                   "scripts/latexfileversion/")
+             (base32
+              "12kw9s415dnlaadx6yn2jddvflvbs754rkz30xhr3di2ldpvp2jj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "latexfileversion")))
+    (home-page "https://ctan.org/pkg/latexfileversion")
+    (synopsis "Prints the version and date of a LaTeX class or style file")
+    (description
+     "This simple shell script prints the version and date of a LaTeX class or
+style file.")
+    (license license:lppl)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From d642554212195a3d0a5db4d99ce8674e29770457 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:15:46 +0200
Subject: gnu: Add texlive-latexindent.

* gnu/packages/tex.scm (texlive-latexindent): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 758248786f..71ecb72138 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2663,6 +2663,27 @@ only.")
 style file.")
     (license license:lppl)))
 
+(define-public texlive-latexindent
+  (package
+    (name "texlive-latexindent")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/latexindent/"
+                   "scripts/latexindent/")
+             (base32
+              "1k2d09z2my38nhxhzdq53jg4alzg5jzirdsb1qa7szm3dya46xgm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "latexindent.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/latexindent")
+    (synopsis "Indent a LaTeX document, highlighting the programming structure")
+    (description
+     "The Perl script processes a LaTeX file, indenting parts so as to
+highlight the structure for the reader.")
+    (license license:gpl3)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 2b6dd12aeed14538e4e84eaa6a95548202a14f0b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:16:09 +0200
Subject: gnu: Add texlive-latexpand.

* gnu/packages/tex.scm (texlive-latexpand): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 71ecb72138..7c1e80e9c6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2684,6 +2684,28 @@ style file.")
 highlight the structure for the reader.")
     (license license:gpl3)))
 
+(define-public texlive-latexpand
+  (package
+    (name "texlive-latexpand")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/latexpand/"
+                   "scripts/latexpand/")
+             (base32
+              "0v0yn4n6v0kgxwh00ryfkrx7a4sxhkm0pbgnylvi8jfg24gz89ls")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "latexpand")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/latexpand")
+    (synopsis "Expand @code{\\input} and @code{\\include} in a LaTeX document")
+    (description
+     "Latexpand is a Perl script that simply replaces @code{\\input} and
+@code{\\include} commands with the content of the input or included file.  The
+script does not deal with @code{\\includeonly} commands.")
+    (license license:bsd-3)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From ea0e12487a636e561022d43bbe807edcf43c5eec Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:16:29 +0200
Subject: gnu: Add texlive-light-latex-make.

* gnu/packages/tex.scm (texlive-light-latex-make): New variable.
---
 gnu/packages/tex.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7c1e80e9c6..23d44bed2b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2706,6 +2706,37 @@ highlight the structure for the reader.")
 script does not deal with @code{\\includeonly} commands.")
     (license license:bsd-3)))
 
+(define-public texlive-light-latex-make
+  (package
+    (name "texlive-light-latex-make")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/llmk.1"
+                   "doc/man/man1/llmk.man1.pdf"
+                   "doc/support/light-latex-make/"
+                   "scripts/light-latex-make/")
+             (base32
+              "0g5xc2cna1fdgksw0w56idkmfw5rfqifimg8picm4478vlq2srp4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "llmk.lua")))
+    (home-page "https://ctan.org/pkg/light-latex-make")
+    (synopsis "Build tool for LaTeX documents")
+    (description
+     "Light LaTeX Make (llmk) is yet another build tool specific for LaTeX
+documents.  Its aim is to provide a simple way to specify a workflow of
+processing LaTeX documents and encourage people to always explicitly show the
+right workflow for each document.  You can describe the workflows either in an
+external file @file{llmk.toml} or in a LaTeX document source in the form of
+magic comments.  It provides a uniform way to describe the workflows available
+for nearly all TeX environments, and behaves exactly the same in any
+environment.  At this point, @command{llmk} intentionally does not provide any
+method for user configuration.  Therefore one can guarantee that for a LaTeX
+document with an llmk setup, the process of typesetting the document will be
+reproduced in any TeX environment with the program.")
+    (license license:expat)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From da9b0b0b56750f4d657e65188a5cce9052477388 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:16:41 +0200
Subject: gnu: Add texlive-listings-ext.

* gnu/packages/tex.scm (texlive-listings-ext): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 23d44bed2b..47d75c16f4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2737,6 +2737,33 @@ document with an llmk setup, the process of typesetting the document will be
 reproduced in any TeX environment with the program.")
     (license license:expat)))
 
+(define-public texlive-listings-ext
+  (package
+    (name "texlive-listings-ext")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/listings-ext/"
+                   "scripts/listings-ext/"
+                   "source/latex/listings-ext/"
+                   "tex/latex/listings-ext/")
+             (base32
+              "044d93vdlw1amkpm8nv50390a5ba7x7d2w1y3mfg5bfvfb5cci6r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts #~(list "listings-ext.sh")))
+    (home-page "https://ctan.org/pkg/listings-ext")
+    (synopsis "Automated input of source")
+    (description
+     "The package provides a means of marking a source, so that samples of it
+may be included in a document (by means of the @code{listings} package) in
+a stable fashion, regardless of any change to the source.  The markup in the
+source text defines tags for blocks of source.  These tags are processed by
+a shell script to make a steering file that is used by the package when LaTeX
+is being run.")
+    (license license:lppl1.2+)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 85a118b7e14621e5dcf263f7549fea6d0fc32739 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:16:54 +0200
Subject: gnu: Add texlive-ltxfileinfo.

* gnu/packages/tex.scm (texlive-ltxfileinfo): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 47d75c16f4..f1f17bc067 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2764,6 +2764,27 @@ a shell script to make a steering file that is used by the package when LaTeX
 is being run.")
     (license license:lppl1.2+)))
 
+(define-public texlive-ltxfileinfo
+  (package
+    (name "texlive-ltxfileinfo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/ltxfileinfo/"
+                   "scripts/ltxfileinfo/")
+             (base32
+              "1nbcplq48cw768pjyg832ymqmjr9rlrcpl6jmkq8mrvvydgy8nai")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "ltxfileinfo")))
+    (home-page "https://ctan.org/pkg/ltxfileinfo")
+    (synopsis "Print version information for a LaTeX file")
+    (description
+     "@command{ltxfileinfo} displays version information for LaTeX files.
+If no path information is given, the file is searched using
+@command{kpsewhich}.")
+    (license license:gpl3+)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From fa16e8fe36637b03257d09f48b9691984078b84f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:17:21 +0200
Subject: gnu: Add texlive-ltximg.

* gnu/packages/tex.scm (texlive-ltximg): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f1f17bc067..202175ddd0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2785,6 +2785,32 @@ If no path information is given, the file is searched using
 @command{kpsewhich}.")
     (license license:gpl3+)))
 
+(define-public texlive-ltximg
+  (package
+    (name "texlive-ltximg")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/ltximg.1"
+                   "doc/man/man1/ltximg.man1.pdf"
+                   "doc/support/ltximg/" "scripts/ltximg/")
+             (base32
+              "1pxyh0w7jkdapzfjgp6fmvfq1hs6mz6qbpykd33r4c5ghyks4cwb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "ltximg.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/ltximg")
+    (synopsis "Extract LaTeX environments into separate image files")
+    (description
+     "@command{ltximg} is a Perl script that automates the process of
+extracting and converting environments provided by TikZ, PStricks and other
+packages from input file to image formats and standalone files using
+Ghostscript and @code{poppler-utils}.  It generates a file with only extracted
+environments and another with all extracted environments converted to
+@code{\\includegraphics}.")
+    (license license:gpl3+)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From bac5097052326660735bdb6613fdf268c9b6c7bc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:17:35 +0200
Subject: gnu: Add texlive-luajittex.

* gnu/packages/tex.scm (texlive-luajittex): New variable.
---
 gnu/packages/tex.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 202175ddd0..8c5b800d54 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2811,6 +2811,37 @@ environments and another with all extracted environments converted to
 @code{\\includegraphics}.")
     (license license:gpl3+)))
 
+(define-public texlive-luajittex
+  (package
+    (name "texlive-luajittex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/luajithbtex.1"
+                   "doc/man/man1/luajithbtex.man1.pdf"
+                   "doc/man/man1/luajittex.1"
+                   "doc/man/man1/luajittex.man1.pdf")
+             (base32
+              "1qfbg0r6gsncgymh00yc83kcayd4m7bvryap8f63sm9s9bzfl6yv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:create-formats #~(list "luajithbtex" "luajittex")))
+    (propagated-inputs
+     (list texlive-cm
+           texlive-etex
+           texlive-hyphen-complete
+           texlive-knuth-lib
+           texlive-luatex
+           texlive-plain
+           texlive-tex-ini-files
+           texlive-unicode-data))
+    (home-page "https://ctan.org/pkg/luajittex")
+    (synopsis "LuaTeX with JIT compiler, with and without HarfBuzz")
+    (description
+     "This package provides LuaTeX with just-in-time (JIT) compiler, with and
+without HarfBuzz.")
+    (license license:gpl2)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 4f802695146082ee1e6065201fd144f49a0c6d83 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:17:49 +0200
Subject: gnu: Add texlive-match-parens.

* gnu/packages/tex.scm (texlive-match-parens): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8c5b800d54..a5b2fac38d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2842,6 +2842,31 @@ environments and another with all extracted environments converted to
 without HarfBuzz.")
     (license license:gpl2)))
 
+(define-public texlive-match-parens
+  (package
+    (name "texlive-match-parens")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/match_parens/"
+                   "scripts/match_parens/")
+             (base32
+              "0qqxbh3h1xkggs5p2gnis4z8h3s0mwknszyjzs2fslnq16yyqi27")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "match_parens")))
+    (inputs (list ruby))
+    (home-page "https://ctan.org/pkg/match_parens")
+    (synopsis
+     "Find mismatches of parentheses, braces, (angle) brackets, in texts")
+    (description
+     "Mismatches of parentheses, braces, (angle) brackets, especially in TeX
+sources which may be rich in those, may be difficult to trace.  This little
+Ruby script helps you by writing your text to standard output, after adding
+a left margin to your text, which will normally be almost empty, but will
+clearly show any mismatches.")
+    (license license:gpl3+)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 8e560c3a81f053b1c59fdbaa0740d2b6be2fb221 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:18:05 +0200
Subject: gnu: Add texlive-mflua.

* gnu/packages/tex.scm (texlive-mflua): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a5b2fac38d..d8b9996eb5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2867,6 +2867,31 @@ a left margin to your text, which will normally be almost empty, but will
 clearly show any mismatches.")
     (license license:gpl3+)))
 
+(define-public texlive-mflua
+  (package
+    (name "texlive-mflua")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "metafont/mflua/" "scripts/mflua/")
+             (base32
+              "0ngbhdh8hgpjfqnrjlnp27x3qziks3yf2zp1qq7r4bjfa5jx9gr6")))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:link-scripts #~(list "mflua.lua")
+      #:create-formats #~(list "mflua")))
+    (propagated-inputs (list texlive-luatex texlive-metafont))
+    (home-page "https://ctan.org/pkg/mflua")
+    (synopsis "Configuration and base files for MFLua")
+    (description
+     "MFLua is an extension of Metafont which embeds a Lua interpreter.  It
+doesn’t introduce any new primitives, so a Metafont file can be used with
+MFLua without any modification to produce exactly the same result.")
+    ;; The license is the same as Metafont's, with a couple of files
+    ;; released under Public Domain terms.
+    (license (list license:knuth license:public-domain))))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From abc76749d335a0726a89febfc4ff1898b1737957 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:18:19 +0200
Subject: gnu: Add texlive-mkjobtexmf.

* gnu/packages/tex.scm (texlive-mkjobtexmf): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d8b9996eb5..2a7cbb7acf 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2892,6 +2892,34 @@ MFLua without any modification to produce exactly the same result.")
     ;; released under Public Domain terms.
     (license (list license:knuth license:public-domain))))
 
+(define-public texlive-mkjobtexmf
+  (package
+    (name "texlive-mkjobtexmf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/mkjobtexmf/"
+                   "doc/man/man1/mkjobtexmf.1"
+                   "doc/man/man1/mkjobtexmf.man1.pdf"
+                   "scripts/mkjobtexmf/"
+                   "source/generic/mkjobtexmf/")
+             (base32
+              "04wzq2260my5894kc8qhl954h6hri77vvg5kx8mf03kdlf3rvww6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "mkjobtexmf.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/mkjobtexmf")
+    (synopsis "Generate a texmf tree for a particular job")
+    (description
+     "The package provides a Perl script, which runs a program and tries to
+find the names of file used.  Two methods are available, option
+@samp{-recorder} of (Web2C) TeX and the program strace.  Then it generates
+a directory with a texmf tree.  It checks the found files and tries sort them
+in this texmf tree.  The script may be used for archiving purposes or to speed
+up later TeX runs.")
+    (license license:artistic2.0)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From dc887a8c1f7702c73c43a0c851a560207e692006 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:18:31 +0200
Subject: gnu: Add texlive-optexcount.

* gnu/packages/tex.scm (texlive-optexcount): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2a7cbb7acf..82085c496c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2920,6 +2920,32 @@ in this texmf tree.  The script may be used for archiving purposes or to speed
 up later TeX runs.")
     (license license:artistic2.0)))
 
+(define-public texlive-optexcount
+  (package
+    (name "texlive-optexcount")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/optexcount/"
+                   "scripts/optexcount/"
+                   "source/support/optexcount/")
+             (base32
+              "0rjyhyirkx11v04c8b0kjjz8745kdnj190vzkyyzafwnzfcbd754")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "optexcount")))
+    (inputs (list python))
+    (home-page "https://ctan.org/pkg/optexcount")
+    (synopsis "Python script for counting words in OpTeX documents")
+    (description
+     "OpTeXcount is a basic Python utility that analyzes OpTeX source code.
+It is inspired by already existing TeXcount for LaTeX. The functionality is
+really lightweight and basic.  It counts words and other elements of OpTeX
+document and sorts them out into individual categories.  Users can print the
+source code with highlighted words using several colors, so they see what is
+considered as word, header etc.")
+    (license license:expat)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From d536011e0b726888da745598d1afbdb8ff147010 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:18:41 +0200
Subject: gnu: Add texlive-patgen.

* gnu/packages/tex.scm (texlive-patgen): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 82085c496c..4d34f1d1f7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2946,6 +2946,26 @@ source code with highlighted words using several colors, so they see what is
 considered as word, header etc.")
     (license license:expat)))
 
+(define-public texlive-patgen
+  (package
+    (name "texlive-patgen")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/patgen.1"
+                   "doc/man/man1/patgen.man1.pdf")
+             (base32
+              "03y05mv0n04hyj0lcq54grx7w5wv95h61j6xlx2jc9v0ib9akq4y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-kpathsea))
+    (home-page "https://ctan.org/pkg/patgen")
+    (synopsis "Generate hyphenation patterns")
+    (description
+     "Patgen takes a list of hyphenated words and generates a set of patterns
+that can be used by the TeX 82 hyphenation algorithm.")
+    (license license:public-domain)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 7ee92aca622e50113e5de4ef4bfbdb1a1103dd3f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:18:59 +0200
Subject: gnu: Add texlive-pdfbook2.

* gnu/packages/tex.scm (texlive-pdfbook2): New variable.
---
 gnu/packages/tex.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4d34f1d1f7..c0eb87ae3a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2966,6 +2966,35 @@ considered as word, header etc.")
 that can be used by the TeX 82 hyphenation algorithm.")
     (license license:public-domain)))
 
+(define-public texlive-pdfbook2
+  (package
+    (name "texlive-pdfbook2")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/pdfbook2.1"
+                   "doc/man/man1/pdfbook2.man1.pdf"
+                   "doc/support/pdfbook2/" "scripts/pdfbook2/")
+             (base32
+              "1cw0xw2dmcgmkms8d94pchbbg17lfvvbnzbagaqpy2fzxi2kb4w8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "pdfbook2")))
+    (inputs (list python))
+    (home-page "https://ctan.org/pkg/pdfbook2")
+    (synopsis "Create booklets from PDF files")
+    (description
+     "This Python program creates print-ready PDF files from some input PDF
+files for booklet printing.  The resulting files need to be printed in
+landscape/long edge double sided printing.  The default paper format depends
+on the locale and is chosen by @code{pdfjam}.  It can be chosen using the
+@code{--paper} option.  Before the PDF is composed, the input file is cropped
+to the relevant area in order to discard unnecessary white spaces.  In this
+process, all pages are cropped to the same dimensions.  Extra margins can be
+defined at the edges of the booklet and in the middle where the binding
+occurs.")
+    (license license:gpl3)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From ffd119b290c5a14d630621d960f8b926688dfa4d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:19:10 +0200
Subject: gnu: Add texlive-pdfcrop.

* gnu/packages/tex.scm (texlive-pdfcrop): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c0eb87ae3a..4c13f1abcd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2995,6 +2995,26 @@ defined at the edges of the booklet and in the middle where the binding
 occurs.")
     (license license:gpl3)))
 
+(define-public texlive-pdfcrop
+  (package
+    (name "texlive-pdfcrop")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/pdfcrop/" "scripts/pdfcrop/")
+             (base32
+              "0wb67hsfasxvl1b484hyxvghhm9nkxwgs6m8ygzshr0m874hsl01")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "pdfcrop.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/pdfcrop")
+    (synopsis "Crop PDF graphics")
+    (description
+     "This package provides a Perl script that can either trim pages of any
+whitespace border, or trim them of a fixed border.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 6398d47a95f61647f5e912c28f0b1ae712c02bb6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:19:24 +0200
Subject: gnu: Add texlive-pdfjam.

* gnu/packages/tex.scm (texlive-pdfjam): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4c13f1abcd..8b97c3a08e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3015,6 +3015,31 @@ occurs.")
 whitespace border, or trim them of a fixed border.")
     (license license:lppl1.3c)))
 
+(define-public texlive-pdfjam
+  (package
+    (name "texlive-pdfjam")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/pdfjam.1"
+                   "doc/man/man1/pdfjam.man1.pdf"
+                   "doc/support/pdfjam/" "scripts/pdfjam/")
+             (base32
+              "1wkxvbnri1lxyd4fbvsv0zzw6c8y3v33hzlv6y86jwil6r3p0338")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "pdfjam")))
+    (home-page "https://ctan.org/pkg/pdfjam")
+    (synopsis "Shell scripts interfacing to @code{pdfpages}")
+    (description
+     "The package makes available the @command{pdfjam} shell script that
+provides a simple interface to much of the functionality of the excellent
+@code{pdfpages} package for LaTeX. The @command{pdfjam} script takes one or
+more PDF files (and/or JPG/PNG graphics files) as input, and produces one or
+more PDF files as output.  It is useful for joining files together, selecting
+pages, reducing several source pages onto one output page, etc.")
+    (license license:gpl2+)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From a3e175e9d2bccdafa7054c76ee13d73ca43daf95 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:19:36 +0200
Subject: gnu: Add texlive-pdflatexpicscale.

* gnu/packages/tex.scm (texlive-pdflatexpicscale): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8b97c3a08e..5e0afa74ae 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3040,6 +3040,28 @@ more PDF files as output.  It is useful for joining files together, selecting
 pages, reducing several source pages onto one output page, etc.")
     (license license:gpl2+)))
 
+(define-public texlive-pdflatexpicscale
+  (package
+    (name "texlive-pdflatexpicscale")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/pdflatexpicscale/"
+                   "scripts/pdflatexpicscale/")
+             (base32
+              "089n7r17c9kj1hhgm0hkfjhrqp2bhwjrj1czb3qllz7rm2x230h1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "pdflatexpicscale.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/pdflatexpicscale")
+    (synopsis
+     "Support software for downscaling graphics to be included by pdfLaTeX")
+    (description
+     "The package provides a script to scale pictures down to a target
+resolution before creating a PDF document with pdfLaTeX.")
+    (license license:lppl)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 5a5d128e30b3fef6b9c2e793494628fcb1852b13 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:19:47 +0200
Subject: gnu: Add texlive-pdftex-quiet.

* gnu/packages/tex.scm (texlive-pdftex-quiet): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5e0afa74ae..4b9a0095a4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3062,6 +3062,26 @@ pages, reducing several source pages onto one output page, etc.")
 resolution before creating a PDF document with pdfLaTeX.")
     (license license:lppl)))
 
+(define-public texlive-pdftex-quiet
+  (package
+    (name "texlive-pdftex-quiet")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/pdftex-quiet/"
+                   "scripts/pdftex-quiet/")
+             (base32
+              "0gpxwiiiq05m24ahx9mnhn7i6rldqkmx041p1bnnddswajs9wgm3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "pdftex-quiet")))
+    (home-page "https://ctan.org/pkg/pdftex-quiet")
+    (synopsis "Bash wrapper for pdfTeX limiting its output to relevant errors")
+    (description
+     "This package provides a Bash script aiming at reducing pdfTeX's output
+to relevant errors, which are displayed in a red bold font.")
+    (license license:gpl3)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From c7316e85bd2bbf13fad3442caec5f608994fe40f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:19:58 +0200
Subject: gnu: Add texlive-pdftosrc.

* gnu/packages/tex.scm (texlive-pdftosrc): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4b9a0095a4..64ab695b92 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3082,6 +3082,25 @@ resolution before creating a PDF document with pdfLaTeX.")
 to relevant errors, which are displayed in a red bold font.")
     (license license:gpl3)))
 
+(define-public texlive-pdftosrc
+  (package
+    (name "texlive-pdftosrc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/pdftosrc.1"
+                   "doc/man/man1/pdftosrc.man1.pdf")
+             (base32
+              "0mnz5id6fywhlay6r38nvii0a2ks5gdb15i7s7wkq1ay9k5k6fq3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pdftosrc")
+    (synopsis "Extract source file or stream from PDF file")
+    (description
+     "@command{pdftosrc} extracts an embedded source file, or extracts and
+uncompresses a PDF stream given by object number.")
+    (license license:gpl2+)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From cbe40e50921ca06254f09d75c4c0b8c1b1624ee2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:20:12 +0200
Subject: gnu: Add texlive-pdfxup.

* gnu/packages/tex.scm (texlive-pdfxup): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 64ab695b92..68e199fa97 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3101,6 +3101,29 @@ to relevant errors, which are displayed in a red bold font.")
 uncompresses a PDF stream given by object number.")
     (license license:gpl2+)))
 
+(define-public texlive-pdfxup
+  (package
+    (name "texlive-pdfxup")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/pdfxup.1"
+                   "doc/man/man1/pdfxup.man1.pdf"
+                   "doc/support/pdfxup/" "scripts/pdfxup/"
+                   "tex/latex/pdfxup/")
+             (base32
+              "1zk4nw1acqz77cy17l8mzi06f0aag16ikp8ymjsl110iw8p8my98")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "pdfxup")))
+    (home-page "https://ctan.org/pkg/pdfxup")
+    (synopsis "Create N-up PDF pages with minimal margins")
+    (description
+     "@command{pdfxup} is a shell script that creates a PDF document where
+each page is obtained by combining several pages of a PDF file given as
+output.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 43883eb82b4b83726d814ee24a4d4055f62c976c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:20:24 +0200
Subject: gnu: Add texlive-pfarrei.

* gnu/packages/tex.scm (texlive-pfarrei): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 68e199fa97..13accf6911 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3124,6 +3124,30 @@ each page is obtained by combining several pages of a PDF file given as
 output.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pfarrei
+  (package
+    (name "texlive-pfarrei")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pfarrei/" "scripts/pfarrei/"
+                   "source/latex/pfarrei/" "tex/latex/pfarrei/")
+             (base32
+              "1clfaxfk7js8yl6cy6dwihmgi51n3rmk0zfmxacmpsbhawj1wrw4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "a5toa4.tlu" "pfarrei.tlu")))
+    (home-page "https://ctan.org/pkg/pfarrei")
+    (synopsis "LaTeX support of pastors' and priests' work")
+    (description
+     "In @emph{Die TeXnische Komodie} (issue 1/2013) Christian Justen
+described his use of LaTeX in his work as priest (similar requirements may be
+encountered in the work of pastors and other ministers of religion).  One
+point was to arrange A5 pages onto A4 landscape paper, either side-by-side or
+as a booklet.  Justen made two Bash scripts for this job; the package provides
+one Texlua script for both requirements.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 4061203dd560fc670b2dd9518e05116c57f3ce0e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:20:44 +0200
Subject: gnu: Add texlive-pkfix.

* gnu/packages/tex.scm (texlive-pkfix): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 13accf6911..f54aae9029 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3148,6 +3148,27 @@ as a booklet.  Justen made two Bash scripts for this job; the package provides
 one Texlua script for both requirements.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pkfix
+  (package
+    (name "texlive-pkfix")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/pkfix/" "scripts/pkfix/")
+             (base32
+              "173l1qaydv29va9cgip9p3i3vf27x6ndsqjm4nvdpliblai6fkwf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "pkfix.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/pkfix")
+    (synopsis "Replace PK fonts in PostScript with Type 1 fonts")
+    (description
+     "The Perl script @command{pkfix} looks for DVIPSBitmapFont comments in
+PostScript files, generated by not too old dvips, and replaces them by type
+1 versions of the fonts, if possible.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From bb5263af7c3fc597da4b88ca5cef783403681921 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:21:24 +0200
Subject: gnu: Add texlive-pkfix-helper.

* gnu/packages/tex.scm (texlive-pkfix-helper): New variable.
---
 gnu/packages/tex.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f54aae9029..4cda7c7159 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3169,6 +3169,37 @@ PostScript files, generated by not too old dvips, and replaces them by type
 1 versions of the fonts, if possible.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pkfix-helper
+  (package
+    (name "texlive-pkfix-helper")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/pkfix-helper.1"
+                   "doc/man/man1/pkfix-helper.man1.pdf"
+                   "doc/support/pkfix-helper/"
+                   "scripts/pkfix-helper/")
+             (base32
+              "0vq52g65an1v9g0kdhsy0xpsf1hj69gl4cr5aq1m816i8ahhzxxy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "pkfix-helper")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/pkfix-helper")
+    (synopsis "Make PostScript files accessible to pkfix")
+    (description
+     "Pkfix is a useful utility for replacing resolution-dependent bitmapped
+fonts in a dvips-produced PostScript file with the corresponding
+resolution-independent vector fonts.  Unfortunately, @command{pkfix} needs to
+parse certain PostScript comments that appear only in files produced by dvips
+versions later than 5.58 (circa 1996); it fails to work on PostScript files
+produced by older versions of dvips.  Pkfix-helper is a program that attempts
+to insert newer-dvips comments into an older-dvips PostScript file, thereby
+making the file suitable for processing by @command{pkfix}.
+@command{pkfix-helper} can sometimes process documents fully autonomously but
+does require the user to verify and, if needed, correct its decisions.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 6fdc79c1210cb21179073e3d297cb73dc90c9c65 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:21:49 +0200
Subject: gnu: Add texlive-purifyeps.

* gnu/packages/tex.scm (texlive-purifyeps): New variable.
---
 gnu/packages/tex.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4cda7c7159..c1ac7d3093 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3200,6 +3200,36 @@ making the file suitable for processing by @command{pkfix}.
 does require the user to verify and, if needed, correct its decisions.")
     (license license:lppl1.3c)))
 
+(define-public texlive-purifyeps
+  (package
+    (name "texlive-purifyeps")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/purifyeps.1"
+                   "doc/man/man1/purifyeps.man1.pdf"
+                   "doc/support/purifyeps/"
+                   "scripts/purifyeps/")
+             (base32
+              "0523kgilwd142a43fw1r406rn8ck67hp78aqhsws931glf7j9y8p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "purifyeps")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/purifyeps")
+    (synopsis "Make EPS work with both LaTeX/dvips and pdfLaTeX")
+    (description
+     "While pdfLaTeX has a number of nice features, its primary shortcoming
+relative to standard LaTeX+dvips is that it is unable to read ordinary
+Encapsulated PostScript (EPS) files, the most common graphics format in the
+LaTeX world.  Purifyeps converts EPS files into a purified form that can be
+read by both LaTeX+dvips and pdfLaTeX.  The trick is that the standard LaTeX2e
+graphics packages can parse Metapost-produced EPS directly.  Hence,
+@command{purifyeps} need only convert an arbitrary EPS file into the same
+stylized format that Metapost outputs.")
+    (license license:lppl)))
+
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From db4c351f1c7d229360965045201079c58991ea9b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:22:11 +0200
Subject: gnu: Add texlive-seetexk.

* gnu/packages/tex.scm (texlive-seetexk): New variable.
---
 gnu/packages/tex.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c1ac7d3093..a92f940d2b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3229,6 +3229,48 @@ graphics packages can parse Metapost-produced EPS directly.  Hence,
 stylized format that Metapost outputs.")
     (license license:lppl)))
 
+(define-public texlive-seetexk
+  (package
+    (name "texlive-seetexk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/dvibook.1"
+                   "doc/man/man1/dvibook.man1.pdf"
+                   "doc/man/man1/dviconcat.1"
+                   "doc/man/man1/dviconcat.man1.pdf"
+                   "doc/man/man1/dviselect.1"
+                   "doc/man/man1/dviselect.man1.pdf"
+                   "doc/man/man1/dvitodvi.1"
+                   "doc/man/man1/dvitodvi.man1.pdf")
+             (base32
+              "1bhv5xgv8jpam5apdybd0cggnvcizk2r6zs7lim1hmhzafpqqlcx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dvibook")
+    (synopsis "Utilities for manipulating DVI files")
+    (description
+     "The package provides a collection of utilities for manipulating DVI
+files:
+
+@itemize
+
+@item @command{dvibook}, which will rearrange the pages of a DVI file into
+signatures as used when printing a book;
+
+@item @command{dviconcat}, for concatenating pages of DVI file(s);
+
+@item @command{dviselect}, which will select pages from one DVI file to create
+a new DVI file;
+
+@item @command{dvitodvi}, which will rearrange the pages of a DVI file to
+create a new file;
+
+@item @command{libtex}, a library for manipulating the files, from the old
+SeeTeX project.
+
+@end itemize")
+    (license license:expat)))
 
 (define-public texlive-tex-ini-files
   (package
-- 
cgit 1.4.1


From 71a4228b9c29cabd8bf93468ea1fb1adb0401337 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:22:27 +0200
Subject: gnu: Add texlive-spix.

* gnu/packages/tex.scm (texlive-spix): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a92f940d2b..d40e0ed144 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3272,6 +3272,32 @@ SeeTeX project.
 @end itemize")
     (license license:expat)))
 
+(define-public texlive-spix
+  (package
+    (name "texlive-spix")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/spix.1"
+                   "doc/man/man1/spix.man1.pdf"
+                   "doc/support/spix/" "scripts/spix/")
+             (base32
+              "0k1vkkrn14svqarbqpfccw3qqiz1slngngrwgs4fj5y0ilrym0bf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "spix.py")))
+    (inputs (list python))
+    (home-page "https://ctan.org/pkg/spix")
+    (synopsis "Yet another TeX compilation tool")
+    (description
+     "SpiX offers a way to store information about the compilation process for
+a TeX file inside the TeX file itself.  Just write the commands as comments in
+the TeX files, and SpiX will extract and run those commands.  Everything is
+stored in the TeX file (so that you are not missing some piece of information
+that is located somewhere else), in a human-readable format (no need to know
+SpiX to understand it).")
+    (license license:gpl3+)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From dbc2a2dd1251d73cb7af3d4266fbcd7255e73a9e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:22:43 +0200
Subject: gnu: Add texlive-srcredact.

* gnu/packages/tex.scm (texlive-srcredact): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d40e0ed144..04af306fa5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3298,6 +3298,31 @@ that is located somewhere else), in a human-readable format (no need to know
 SpiX to understand it).")
     (license license:gpl3+)))
 
+(define-public texlive-srcredact
+  (package
+    (name "texlive-srcredact")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/srcredact.1"
+                   "doc/man/man1/srcredact.man1.pdf"
+                   "doc/support/srcredact/"
+                   "scripts/srcredact/")
+             (base32
+              "1a0mmr3ggxxv69zfwlrlagbczy83ngy2kxzw437n0iksz6bgrvpx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "srcredact.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/srcredact")
+    (synopsis "Tool for redacting sources")
+    (description
+     "This package provides a tool to keep a master source, consisting of
+different chunks intended for different audiences.  The tool allows to extract
+the versions intended for different audiences and to incorporate the changes
+made in any of these versions into the master document.")
+    (license license:gpl2)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 91864110ad4993455246fd26040d100bbb6c6419 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:23:03 +0200
Subject: gnu: Add texlive-sty2dtx.

* gnu/packages/tex.scm (texlive-sty2dtx): New variable.
---
 gnu/packages/tex.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 04af306fa5..2b867b9069 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3323,6 +3323,38 @@ the versions intended for different audiences and to incorporate the changes
 made in any of these versions into the master document.")
     (license license:gpl2)))
 
+(define-public texlive-sty2dtx
+  (package
+    (name "texlive-sty2dtx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/sty2dtx.1"
+                   "doc/man/man1/sty2dtx.man1.pdf"
+                   "doc/support/sty2dtx/" "scripts/sty2dtx/")
+             (base32
+              "06930x3c52f3x9rqcmsif7y6rw11g1myya3wp77p20vfi7whxhsv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "sty2dtx.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/sty2dtx")
+    (synopsis "Create a @file{.dtx} file from a @file{.sty} file")
+    (description
+     "The package provides a Perl script that converts a @file{.sty}
+file (LaTeX package) to @file{.dtx} format (documented LaTeX source), by
+surrounding macro definitions with macro and macrocode environments.  The
+macro name is automatically inserted as an argument to the macro environment.
+Code lines outside macro definitions are wrapped only in macrocode
+environments.  Empty lines are removed.  The script should not be thought to
+be fool proof and 100% accurate but rather as a good start to the business of
+making a @file{.dtx} file from an undocumented style file.  Full @file{.dtx}
+files are generated.  A template based on the skeleton file from @code{dtxtut}
+is used.  User level macros are added automatically to the Usage section of
+the @file{.dtx} file.  A corresponding @file{.ins} file can be generated as
+well.")
+    (license license:gpl3)))
+
 (define-public texlive-tex-ini-files
   (package
     (name "texlive-tex-ini-files")
-- 
cgit 1.4.1


From 7b1743d407ca744070469b0cda2583bbe1c7c6e3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:23:27 +0200
Subject: gnu: Add texlive-make4ht.

* gnu/packages/tex.scm (texlive-make4ht): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2b867b9069..4d04cf4aa5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2920,6 +2920,28 @@ in this texmf tree.  The script may be used for archiving purposes or to speed
 up later TeX runs.")
     (license license:artistic2.0)))
 
+(define-public texlive-make4ht
+  (package
+    (name "texlive-make4ht")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/make4ht/" "scripts/make4ht/")
+             (base32
+              "0ayqs8i1za14krrgqyncv8ahs70pg5pnfs2m0aqcavfnd79qx2cj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "make4ht")))
+    (propagated-inputs (list texlive-tex4ht))
+    (home-page "https://ctan.org/pkg/make4ht")
+    (synopsis "Build system for TeX4ht")
+    (description
+     "@code{make4ht} is a simple build system for TeX4ht, a TeX to XML
+converter.  It provides a command line tool that drives the conversion
+process.  It also provides a library which can be used to create customized
+conversion tools.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-optexcount
   (package
     (name "texlive-optexcount")
-- 
cgit 1.4.1


From 4cd398c8b521610488b6ae21f3d7864def674382 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:24:13 +0200
Subject: gnu: Add texlive-tex4ht.

* gnu/packages/tex.scm (texlive-tex4ht): New variable.
---
 gnu/packages/tex.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4d04cf4aa5..9b89085384 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6160,6 +6160,48 @@ and -editable format;
 a function and a convexity table of its graph.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tex4ht
+  (package
+    (name "texlive-tex4ht")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/tex4ht/"
+                   "scripts/tex4ht/"
+                   "source/generic/tex4ht/"
+                   "tex/generic/tex4ht/"
+                   "tex4ht/")
+             (base32
+              "1svmivc272xj9fzy5p055lp7g9vcqs75jp4x54682yrq0qizv03c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts
+           #~(list "ht.sh"
+                   "htcontext.sh"
+                   "htlatex.sh"
+                   "htmex.sh"
+                   "httex.sh"
+                   "httexi.sh"
+                   "htxelatex.sh"
+                   "htxetex.sh"
+                   "mk4ht.pl"
+                   "xhlatex.sh")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/tex4ht")
+    (synopsis "Convert (La)TeX to HTML/XML")
+    (description
+     "This package provides a converter from TeX and LaTeX to SGML-based
+formats such as (X)HTML, MathML, OpenDocument, and Docbook, providing
+a configurable (La)TeX-based authoring system for hypertext.  TeX4ht does not
+independently parse (La)TeX source (so it avoids the difficulties encountered
+by many other converters, arising from the irregularity of (La)TeX syntax).
+Instead, TeX4ht uses (La)TeX itself (with myriad macro modifications) to
+produce a helper DVI file that it can then process.  This technique allows
+TeX4ht to approach the robustness characteristic of restricted-syntax systems
+such as @code{gellmu}.")
+    (license license:lppl)))
+
 (define-public texlive-texdraw
   (package
     (name "texlive-texdraw")
-- 
cgit 1.4.1


From a9ea71d9f6ca017ebe92c282e5e6e2da7bd2c77f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:24:26 +0200
Subject: gnu: Add texlive-tex4ebook.

* gnu/packages/tex.scm (texlive-tex4ebook): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9b89085384..65d68defed 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6202,6 +6202,28 @@ TeX4ht to approach the robustness characteristic of restricted-syntax systems
 such as @code{gellmu}.")
     (license license:lppl)))
 
+(define-public texlive-tex4ebook
+  (package
+    (name "texlive-tex4ebook")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/tex4ebook/"
+                   "scripts/tex4ebook/" "tex/latex/tex4ebook/")
+             (base32
+              "0907df4hb9y7nh5bz450qb1ljixk5li8hp6r9ajx8d0c47ac5a8v")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "tex4ebook")))
+    (propagated-inputs (list texlive-make4ht texlive-tex4ht))
+    (home-page "https://ctan.org/pkg/tex4ebook")
+    (synopsis "Converter from LaTeX to EBook formats")
+    (description
+     "This is a bundle of Lua scripts and LaTeX packages for conversion of
+LaTeX files to EBook formats such as EPUB, MOBI and EPUB3.  TeX4ht is used as
+the conversion engine.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-texdraw
   (package
     (name "texlive-texdraw")
-- 
cgit 1.4.1


From 7490ea97d5b20957bc67da956b58a845b67195f4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:24:38 +0200
Subject: gnu: Add texlive-texaccents.

* gnu/packages/tex.scm (texlive-texaccents): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 65d68defed..36823c197c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6224,6 +6224,28 @@ LaTeX files to EBook formats such as EPUB, MOBI and EPUB3.  TeX4ht is used as
 the conversion engine.")
     (license license:lppl1.3+)))
 
+(define-public texlive-texaccents
+  (package
+    (name "texlive-texaccents")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/texaccents.1"
+                   "doc/man/man1/texaccents.man1.pdf"
+                   "doc/support/texaccents/"
+                   "scripts/texaccents/"
+                   "source/support/texaccents/")
+             (base32
+              "1kh4cpvrxgcvnmzxgb3my4jawyqd4348cy6h195346pvdb5xsphh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/texaccents")
+    (synopsis "Convert composite accented characters to Unicode")
+    (description
+     "This small utility, written in SNOBOL, converts the composition of
+special characters to Unicode.")
+    (license license:expat)))
+
 (define-public texlive-texdraw
   (package
     (name "texlive-texdraw")
-- 
cgit 1.4.1


From b29fd45b6a4bacbfe3c0509af30c665343610910 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:24:50 +0200
Subject: gnu: Add texlive-texcount.

* gnu/packages/tex.scm (texlive-texcount): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 36823c197c..9ee6b6c1aa 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6246,6 +6246,27 @@ the conversion engine.")
 special characters to Unicode.")
     (license license:expat)))
 
+(define-public texlive-texcount
+  (package
+    (name "texlive-texcount")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/texcount/" "scripts/texcount/")
+             (base32
+              "0ab1kp0zh2r65x1v42sc5bwxmlifa8splrakq589fgd0aap0l8n1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "texcount.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/texcount")
+    (synopsis "Count words in a LaTeX document")
+    (description
+     "TeXcount is a Perl script that counts words in the text of LaTeX files.
+It has rules for handling most of the common macros, and can provide
+colour-coded output showing which parts of the text have been counted.")
+    (license license:lppl)))
+
 (define-public texlive-texdraw
   (package
     (name "texlive-texdraw")
-- 
cgit 1.4.1


From 2736be1a577b5d6b59590ace4ead07cba6bf19fa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:25:07 +0200
Subject: gnu: Add texlive-texdef.

* gnu/packages/tex.scm (texlive-texdef): New variable.
---
 gnu/packages/tex.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9ee6b6c1aa..0c85a270f3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6267,6 +6267,47 @@ It has rules for handling most of the common macros, and can provide
 colour-coded output showing which parts of the text have been counted.")
     (license license:lppl)))
 
+(define-public texlive-texdef
+  (package
+    (name "texlive-texdef")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/texdef/" "scripts/texdef/"
+                   "source/support/texdef/")
+             (base32
+              "0jkc6c4nvzp228d7dcmp0gv2q5qassjq1p40fz4pmbxiyias7zw3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:link-scripts #~(list "texdef.pl")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'link-scripts 'add-symlink
+            (lambda _
+              (with-directory-excursion (string-append #$output "/bin")
+                (symlink "texdef" "latexdef")))))))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/texdef")
+    (synopsis "Display the definitions of TeX commands")
+    (description
+     "This (Perl) script displays the definitions of (La)TeX command
+sequences/macros.  Various options allow the selection of the used class as
+well as package files and other factors that may influence the
+definition (before/after the preamble, inside an environment, ...).  The
+script creates a temporary TeX file which is then compiled using (La)TeX to
+find the @code{\\meaning} of the command sequence.  The result is formatted
+and presented to the user.  Length or number command sequences (dimensions,
+@code{\\char}..., count registers, ...)  are recognized and the contained
+value is also shown (using @code{\\the}).  Special definitions like protected
+macros are also recognized and the underlying macros are shown as well.  The
+script will show plain TeX definitions by default.  LaTeX and ConTeXt are
+supported, including flavours (pdf(La)TeX, Lua(La)TeX, Xe(La)TeX, ...).  The
+flavour can be selected using a command line option, or via the script name:
+@command{latexdef} will use LaTeX as default, etc.")
+    (license license:gpl3)))
+
 (define-public texlive-texdraw
   (package
     (name "texlive-texdraw")
-- 
cgit 1.4.1


From e2b7940ca683c75b19aa262ecb88846b93303fe2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:25:18 +0200
Subject: gnu: Add texlive-texdiff.

* gnu/packages/tex.scm (texlive-texdiff): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0c85a270f3..28381e3ce8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6308,6 +6308,29 @@ flavour can be selected using a command line option, or via the script name:
 @command{latexdef} will use LaTeX as default, etc.")
     (license license:gpl3)))
 
+(define-public texlive-texdiff
+  (package
+    (name "texlive-texdiff")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/texdiff.1"
+                   "doc/man/man1/texdiff.man1.pdf"
+                   "doc/support/texdiff/" "scripts/texdiff/")
+             (base32
+              "1cp2k217ziwdgh5c7lg22p58ajv7j410ncag620lkdwajc5jqx1d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "texdiff")))
+    (home-page "https://ctan.org/pkg/texdiff")
+    (synopsis "Compare documents and produce tagged merge")
+    (description
+     "Two files are compared and a new TeX file is output.  When the output
+file is processed with (La)TeX it marks new changes with blue and old text
+with red with a strike-through line.  Furthermore, passages with changes are
+marked at the margin with grey bars by the LaTeX @code{changebar} package.")
+    (license license:artistic2.0)))
+
 (define-public texlive-texdraw
   (package
     (name "texlive-texdraw")
-- 
cgit 1.4.1


From c3a49731f637d46c891c5b0b17056197438097dd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:25:29 +0200
Subject: gnu: Add texlive-texdirflatten.

* gnu/packages/tex.scm (texlive-texdirflatten): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 28381e3ce8..a824a0b702 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6331,6 +6331,30 @@ with red with a strike-through line.  Furthermore, passages with changes are
 marked at the margin with grey bars by the LaTeX @code{changebar} package.")
     (license license:artistic2.0)))
 
+(define-public texlive-texdirflatten
+  (package
+    (name "texlive-texdirflatten")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/texdirflatten.1"
+                   "doc/man/man1/texdirflatten.man1.pdf"
+                   "doc/support/texdirflatten/"
+                   "scripts/texdirflatten/")
+             (base32
+              "0f2h9qlqfml9p83znxh81i7cmwfbsr0zrladrf3486v4aja859kx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "texdirflatten")))
+    (home-page "https://ctan.org/pkg/texdirflatten")
+    (synopsis "Collect files related to a LaTeX job in a single directory")
+    (description
+     "The Perl script parses a LaTeX file recursively, scanning all child
+files, and collects details of any included and other data files.  These
+component files, are then all put into a single directory (thus flattening the
+document's directory tree).")
+    (license license:artistic2.0)))
+
 (define-public texlive-texdraw
   (package
     (name "texlive-texdraw")
-- 
cgit 1.4.1


From 5ba584fddda7fa8fd17e7f7fb07c0f4b3a9923a0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:25:44 +0200
Subject: gnu: Add texlive-texdoc.

* gnu/packages/tex.scm (texlive-texdoc): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a824a0b702..25a9577bc4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6355,6 +6355,30 @@ component files, are then all put into a single directory (thus flattening the
 document's directory tree).")
     (license license:artistic2.0)))
 
+(define-public texlive-texdoc
+  (package
+    (name "texlive-texdoc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/texdoc.1"
+                   "doc/man/man1/texdoc.man1.pdf"
+                   "doc/support/texdoc/" "scripts/texdoc/"
+                   "texdoc/")
+             (base32
+              "19mvh7pm2332f6c8nzgcbscm9vcz0apwfgm0m55ycibssc2fb3ww")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "texdoc.tlu")))
+    (propagated-inputs (list texlive-kpathsea))
+    (home-page "https://ctan.org/pkg/texdoc")
+    (synopsis "Documentation access for TeX Live")
+    (description
+     "@command{texdoc} is a Lua script providing easy access to the
+documentation in TeX Live: PDF, DVI, plain text files, and more.  Viewing and
+other configuration can be extensively customized.")
+    (license license:gpl3+)))
+
 (define-public texlive-texdraw
   (package
     (name "texlive-texdraw")
-- 
cgit 1.4.1


From 1e9bf77acc382cb8b64e651af31ef301db6f27df Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:25:56 +0200
Subject: gnu: Add texlive-texdoctk.

* gnu/packages/tex.scm (texlive-texdoctk): New variable.
---
 gnu/packages/tex.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 25a9577bc4..49e38e051c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6379,6 +6379,35 @@ documentation in TeX Live: PDF, DVI, plain text files, and more.  Viewing and
 other configuration can be extensively customized.")
     (license license:gpl3+)))
 
+(define-public texlive-texdoctk
+  (package
+    (name "texlive-texdoctk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/texdoctk.1"
+                   "doc/man/man1/texdoctk.man1.pdf"
+                   "scripts/texdoctk/" "texdoctk/")
+             (base32
+              "18xxivpgjdh8v6kg0b45zjv18sm9a4ljpwk6a4cghg5l5yggrjcx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "texdoctk.pl")))
+    (inputs (list perl))
+    (propagated-inputs (list texlive-kpathsea))
+    (home-page "https://ctan.org/pkg/texdoctk")
+    (synopsis "Easy access to package documentation")
+    (description
+     "This package provides a Perl/Tk-based GUI for easy access to package
+documentation for TeX on Unix platforms; the databases it uses are based on
+the texmf/doc subtrees of teTeX, but database files for local configurations
+with modified/extended directories can be derived from them.  Note that
+@command{texdoctk} is not a viewer itself, but an interface for finding
+documentation files and opening them with the appropriate viewer; so it relies
+on appropriate programs to be installed on the system.  However, the choice of
+these programs can be configured by the sysadmin or user.")
+    (license license:gpl3+)))
+
 (define-public texlive-texdraw
   (package
     (name "texlive-texdraw")
-- 
cgit 1.4.1


From d87cb08dd3594bcf4bad5a0d3579fcbd90f99b1c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:26:16 +0200
Subject: gnu: Add texlive-texfot.

* gnu/packages/tex.scm (texlive-texfot): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 49e38e051c..b03c3417e5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6434,6 +6434,29 @@ definition capability, new drawing commands can be constructed from drawing
 segments.")
     (license license:cc-by4.0)))
 
+(define-public texlive-texfot
+  (package
+    (name "texlive-texfot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/texfot.1"
+                   "doc/man/man1/texfot.man1.pdf"
+                   "doc/support/texfot/" "scripts/texfot/")
+             (base32
+              "0cy1fz265ch13cn0jwfg7rlspqlxv8swnv6ljjvqqg8hbl390npd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "texfot.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/texfot")
+    (synopsis "Filter clutter from the output of a TeX run")
+    (description
+     "The package provides a small Perl script to filter the online output
+from a TeX run, attempting to show only those messages which probably deserve
+some change in the source.  The TeX invocation itself need not change.")
+    (license license:public-domain)))
+
 (define-public texlive-ticollege
   (package
     (name "texlive-ticollege")
-- 
cgit 1.4.1


From d033c4b77afec5c0c592e88a48171fa4fd6471af Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:26:32 +0200
Subject: gnu: Add texlive-texliveonfly.

* gnu/packages/tex.scm (texlive-texliveonfly): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b03c3417e5..650417f265 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6457,6 +6457,29 @@ from a TeX run, attempting to show only those messages which probably deserve
 some change in the source.  The TeX invocation itself need not change.")
     (license license:public-domain)))
 
+(define-public texlive-texliveonfly
+  (package
+    (name "texlive-texliveonfly")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/texliveonfly/"
+                   "scripts/texliveonfly/")
+             (base32
+              "15nrgkh9wkaccbyd8jgcyw5xjjhqj3jyy3spbfd679fywq14l8c2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "texliveonfly.py")))
+    (inputs (list python))
+    (home-page "https://ctan.org/pkg/texliveonfly")
+    (synopsis "On-the-fly download of missing TeX live packages")
+    (description
+     "The package provides a script that performs on the fly downloads of
+missing packages, while a document is being compiled.  To use the script,
+replace your (LaTeX) compilation command with @samp{texliveonfly.py
+file.tex}.")
+    (license license:gpl3)))
+
 (define-public texlive-ticollege
   (package
     (name "texlive-ticollege")
-- 
cgit 1.4.1


From 88205e3e04f6772a64ba49ff25527e3b7a3afebb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:26:43 +0200
Subject: gnu: Add texlive-texloganalyser.

* gnu/packages/tex.scm (texlive-texloganalyser): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 650417f265..b888161a0c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6480,6 +6480,27 @@ replace your (LaTeX) compilation command with @samp{texliveonfly.py
 file.tex}.")
     (license license:gpl3)))
 
+(define-public texlive-texloganalyser
+  (package
+    (name "texlive-texloganalyser")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/texloganalyser/"
+                   "scripts/texloganalyser/")
+             (base32
+              "0qlrpqwfyakhh163ckznw5z8jwm5frp3krpi7fxnf9pz03c7shhr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "texloganalyser")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/texloganalyser")
+    (synopsis "Analyse TeX logs")
+    (description
+     "This Perl script allows the user to extract (and display) elements of
+the log file.")
+    (license license:bsd-2)))
+
 (define-public texlive-ticollege
   (package
     (name "texlive-ticollege")
-- 
cgit 1.4.1


From bebd522580fdb187c18eaa645ed4105756aa193d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:26:55 +0200
Subject: gnu: Add texlive-texlogfilter.

* gnu/packages/tex.scm (texlive-texlogfilter): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b888161a0c..d1da411b62 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6501,6 +6501,33 @@ file.tex}.")
 the log file.")
     (license license:bsd-2)))
 
+(define-public texlive-texlogfilter
+  (package
+    (name "texlive-texlogfilter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/texlogfilter.1"
+                   "doc/man/man1/texlogfilter.man1.pdf"
+                   "doc/support/texlogfilter/"
+                   "scripts/texlogfilter/")
+             (base32
+              "0w2cxkgzalx083hh4kyk10ampy1dx50iv44z9s2gks224p3rlyps")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "texlogfilter")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/texlogfilter")
+    (synopsis "Filter LaTeX engines output or log file")
+    (description
+     "@command{texlogfilter} is a Perl script designed to filter LaTeX engines
+output or log file (LaTeX, pdfLaTeX, LuaLaTeX or XeLaTeX).  It reduces the
+LaTeX output or log to keep only warnings and errors.  The result is
+colorised.  Options allow to mask specific warnings, such as box or
+references/citations warnings.  It's also possible to add custom filter
+patterns.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-ticollege
   (package
     (name "texlive-ticollege")
-- 
cgit 1.4.1


From 04e7983502e54916161641315ac26581ed86e912 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:28:00 +0200
Subject: gnu: Add texlive-texlogsieve.

* gnu/packages/tex.scm (texlive-texlogsieve): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d1da411b62..e64048dcab 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6528,6 +6528,29 @@ references/citations warnings.  It's also possible to add custom filter
 patterns.")
     (license license:lppl1.3+)))
 
+(define-public texlive-texlogsieve
+  (package
+    (name "texlive-texlogsieve")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/texlogsieve.1"
+                   "doc/man/man1/texlogsieve.man1.pdf"
+                   "doc/support/texlogsieve/"
+                   "scripts/texlogsieve/")
+             (base32
+              "0pssh34f2263qfpirmv1np9ncjw9d9zyjqbxpin12px2hmvjvip6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "texlogsieve")))
+    (home-page "https://ctan.org/pkg/texlogsieve")
+    (synopsis "Filter and summarize LaTeX log files")
+    (description
+     "@command{texlogsieve} reads a LaTeX log file (or the standard input if
+no file is specified), filters out less relevant messages, and displays
+a summary report.")
+    (license license:gpl3+)))
+
 (define-public texlive-ticollege
   (package
     (name "texlive-ticollege")
-- 
cgit 1.4.1


From 8619d89e2aa921f623bd61cac7fa723e1a9d4b40 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:28:57 +0200
Subject: gnu: Add texlive-texosquery.

* gnu/packages/tex.scm (texlive-texosquery): New variable.
---
 gnu/packages/tex.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e64048dcab..2a4377385b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6551,6 +6551,55 @@ no file is specified), filters out less relevant messages, and displays
 a summary report.")
     (license license:gpl3+)))
 
+(define-public texlive-texosquery
+  (package
+    (name "texlive-texosquery")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/texosquery/"
+                   "scripts/texosquery/"
+                   "source/support/texosquery/"
+                   "tex/latex/texosquery/")
+             (base32
+              "17s947p011qar5aaz11ysby3nqqrnk0qv4m26hsl5y6divqb2dan")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts
+           #~(list "texosquery-jre5.sh" "texosquery-jre8.sh" "texosquery.sh")))
+    (home-page "https://ctan.org/pkg/texosquery")
+    (synopsis "Java application to query OS information")
+    (description
+     "This package provides a Java application to query OS information
+designed for use in TeX's shell escape mechanism.  The application can query
+the following:
+
+@itemize
+@item locale and codeset,
+@item current working directory,
+@item user home directory
+@item temporary directory,
+@item OS name, arch and version,
+@item current date and time in PDF format (for TeX formats that don't provide
+@code{\\pdfcreationdate}),
+@item date-time stamp of a file in PDF format (for TeX formats that don't
+provide @code{\\pdffilemoddate}),
+@item size of a file in bytes (for TeX formats that don't provide
+@code{\\pdffilesize}),
+@item contents of a directory (captured as a list),
+@item directory contents filtered by regular expression (captured as a list),
+@item URI or canonical path of a file.  All paths use a forward slash as
+directory divider so results can be used, for example, in commands like
+@code{\\includegraphics}.
+@end itemize
+
+There are files provided for easy access in TeX documents.
+@file{texosquery.tex} provides generic TeX code, whereas @file{texosquery.sty}
+is a LaTeX package, which provides commands to run @command{texosquery} using
+TeX's shell escape mechanism and capture the result in a control sequence.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-ticollege
   (package
     (name "texlive-ticollege")
-- 
cgit 1.4.1


From a34c51d73b848d18ba2284fe185d0ff5f65c4c6a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:30:28 +0200
Subject: gnu: Add texlive-texplate.

* gnu/packages/tex.scm (texlive-texplate): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2a4377385b..0eeb46297f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6600,6 +6600,31 @@ is a LaTeX package, which provides commands to run @command{texosquery} using
 TeX's shell escape mechanism and capture the result in a control sequence.")
     (license license:lppl1.3+)))
 
+(define-public texlive-texplate
+  (package
+    (name "texlive-texplate")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/texplate/" "scripts/texplate/"
+                   "source/support/texplate/")
+             (base32
+              "027vfbqm95ysp7sqlcz3p5b2107mcjg540x73nsf2d1g83k4ps4r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "texplate.sh")))
+    (home-page "https://ctan.org/pkg/texplate")
+    (synopsis "Tool for creating document structures based on templates")
+    (description
+     "TeXplate is a tool for creating document structures based on templates.
+The application name is a word play on TeX and template, so the purpose seems
+quite obvious: we want to provide an easy and straightforward framework for
+reducing the typical code boilerplate when writing TeX documents.  Also note
+that one can easily extrapolate the use beyond articles and theses: the
+application is powerful enough to generate any text-based structure, given
+that a corresponding template exists.")
+    (license license:bsd-3)))
+
 (define-public texlive-ticollege
   (package
     (name "texlive-ticollege")
-- 
cgit 1.4.1


From e31843cdbf8295aeb3a0d1376231781b3e2abb09 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:30:49 +0200
Subject: gnu: Add texlive-texware.

* gnu/packages/tex.scm (texlive-texware): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0eeb46297f..a48d463b40 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6625,6 +6625,31 @@ application is powerful enough to generate any text-based structure, given
 that a corresponding template exists.")
     (license license:bsd-3)))
 
+(define-public texlive-texware
+  (package
+    (name "texlive-texware")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/dvitype.1"
+                   "doc/man/man1/dvitype.man1.pdf"
+                   "doc/man/man1/pooltype.1"
+                   "doc/man/man1/pooltype.man1.pdf")
+             (base32
+              "122r0aq02vwx6irsnapnfbvhgy5d09x90rc8zc7a0bi7b25bxnd1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/texware")
+    (synopsis "Utility programs for use with TeX")
+    (description
+     "This package provides basic utility programs, comprising:
+@command{dvitype}, which converts a TeX output (DVI) file to a plain text
+file; @command{pooltype}, which converts a TeX-suite program's pool (string)
+file into human-readable form; @command{tftopl} and @command{pltotf}, which
+convert TeX Font Metric (TFM) file to human readable Property List (PL) files
+and vice versa.")
+    (license license:public-domain)))
+
 (define-public texlive-ticollege
   (package
     (name "texlive-ticollege")
-- 
cgit 1.4.1


From ef724f3067ca880bbc4c48e062a00701667680c4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:32:39 +0200
Subject: gnu: Add texlive-tie.

* gnu/packages/tex.scm (texlive-tie): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a48d463b40..ebe69efc48 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6671,6 +6671,29 @@ the help of TikZ.  It also provides commands to draw the content of screens
 and of menu items.")
     (license license:lppl)))
 
+(define-public texlive-tie
+  (package
+    (name "texlive-tie")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/tie.1"
+                   "doc/man/man1/tie.man1.pdf")
+             (base32
+              "17z5ik7bbf0v5ylq2v1rda6z64iz386vp56z7yrr6h1dl488kr93")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-kpathsea))
+    (home-page "https://ctan.org/pkg/tie")
+    (synopsis "Allow multiple web change files")
+    (description
+     "Tie was originally developed to allow web programmers to apply more than
+one change file to their source.  The program may also be used to create a new
+version of a @file{.web} file that incorporates existing changes.")
+    ;; The license, provided as the "tie.w" source file, is morally equivalent
+    ;; to CC BY-SA.
+    (license (license:fsf-free "file://tie.w"))))
+
 (define-public texlive-tikz-3dplot
   (package
     (name "texlive-tikz-3dplot")
-- 
cgit 1.4.1


From 902eaa8104296768c1ad244f53a066625ae29414 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:33:30 +0200
Subject: gnu: Add texlive-tlcockpit.

* gnu/packages/tex.scm (texlive-tlcockpit): New variable.
---
 gnu/packages/tex.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ebe69efc48..a71d812f8b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8038,6 +8038,40 @@ of circulation to give the author time to investigate some problems.")
 packages (like @code{tkz-euclide}).")
     (license license:lppl1.3+)))
 
+(define-public texlive-tlcockpit
+  (package
+    (name "texlive-tlcockpit")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/tlcockpit.1"
+                   "doc/man/man1/tlcockpit.man1.pdf"
+                   "doc/support/tlcockpit/"
+                   "scripts/tlcockpit/"
+                   "source/support/tlcockpit/")
+             (base32
+              "1nv0wx21x022isw8rycvqdqwiz4ay6ws36bbcpqfqkjmvz5qr76w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:link-scripts #~(list "tlcockpit.sh")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'locate-java
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((java (search-input-file inputs "/bin/java")))
+                (substitute* "scripts/tlcockpit/tlcockpit.sh"
+                  (("java -") (string-append java " -")))))))))
+    ;; FIXME: missing EventTarget.class.
+    (inputs (list icedtea))
+    (home-page "https://ctan.org/pkg/tlcockpit")
+    (synopsis "GUI frontend to TeX Live Manager")
+    (description
+     "This package aims at being a GUI for @command{tlmgr}, the TeX Live
+Manager, with a modern look and feel.")
+    (license license:gpl3+)))
+
 (define-public texlive-tonevalue
   (package
     (name "texlive-tonevalue")
-- 
cgit 1.4.1


From fe8505c9c4f97360571f8a009a0ec6bb90859d36 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:33:51 +0200
Subject: gnu: Add texlive-tpic2pdftex.

* gnu/packages/tex.scm (texlive-tpic2pdftex): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a71d812f8b..9e45fd241a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8093,6 +8093,26 @@ tone values.  Currently, unt's model is implemented.  Support for more models
 is planned.")
     (license license:asl2.0)))
 
+(define-public texlive-tpic2pdftex
+  (package
+    (name "texlive-tpic2pdftex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/tpic2pdftex.1"
+                   "doc/man/man1/tpic2pdftex.man1.pdf"
+                   "doc/tpic2pdftex/")
+             (base32
+              "02nf2fg4xzh8lbbddvm44qyvcvfn5b7kzcyg729a58l29gd88pbs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tpic2pdftex")
+    (synopsis "Use @code{tpic} commands in pdfTeX")
+    (description
+     "The Awk script converts Pic language, embedded inline (delimited by
+@code{.PS} and @code{.PE} markers), to @code{\\pdfliteral} commands.")
+    (license license:gpl3+)))
+
 (define-public texlive-tqft
   (package
     (name "texlive-tqft")
-- 
cgit 1.4.1


From d4a02c7bd0d684d6ac5773b80eaa99a7dc325462 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:34:10 +0200
Subject: gnu: Add texlive-typeoutfileinfo.

* gnu/packages/tex.scm (texlive-typeoutfileinfo): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9e45fd241a..3f65a8fee0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8204,6 +8204,28 @@ open source emojis through LaTeX commands.  This relies on images, so no fancy
 Unicode font stuff is needed and it should work on every installation.")
     (license (list license:lppl1.3+ license:cc-by4.0))))
 
+(define-public texlive-typeoutfileinfo
+  (package
+    (name "texlive-typeoutfileinfo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/typeoutfileinfo/"
+                   "scripts/typeoutfileinfo/")
+             (base32
+              "19kz79xbr0ri3pbbxv9j2nxdk6vs99nr1ai4xdbjkw2nnx717nxy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "typeoutfileinfo.sh")))
+    (home-page "https://ctan.org/pkg/typeoutfileinfo")
+    (synopsis "Display class/package/file information")
+    (description
+     "The package provides a minimalist shell script, for Unix systems,
+that displays the information content in a @code{\\ProvidesFile},
+@code{\\ProvidesPackage} or @code{\\ProvidesClass} command in a LaTeX source
+file.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-tzplot
   (package
     (name "texlive-tzplot")
-- 
cgit 1.4.1


From 21f2977a5c10e9649ad75e5a104ae7ee506d30ef Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:34:34 +0200
Subject: gnu: Add texlive-upmendex.

* gnu/packages/tex.scm (texlive-upmendex): New variable.
---
 gnu/packages/tex.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3f65a8fee0..14b4bc44f8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8247,6 +8247,44 @@ make drawing easier, especially when drawing repeatedly.  The macros were
 chosen and developed with an emphasis on drawing graphs in economics.")
     (license license:lppl1.3c)))
 
+(define-public texlive-upmendex
+  (package
+    (name "texlive-upmendex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/upmendex.1"
+                   "doc/man/man1/upmendex.man1.pdf"
+                   "doc/support/upmendex/")
+             (base32
+              "0mj8nmqr3z7b802kvjmnkckq89l694an7s639yghf3b9b5v7xihx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/upmendex")
+    (synopsis "Multilingual index processor")
+    (description
+     "The package is a multilingual index processor with the following
+features:
+@itemize
+
+@item mostly compatible with @command{makeindex} and upper compatible with
+@command{mendex};
+
+@item supports UTF-8 and works with upLaTeX, XeLaTeX and LuaLaTeX;
+
+@item supports Latin (including non-English), Greek, Cyrillic, Korean Hangul
+and Chinese Han (Hanzi ideographs) scripts, as well as Japanese Kana.
+
+@item supports Devanagari, Thai, Arabic and Hebrew scripts (experimental).
+
+@item supports four kinds of sort orders (Pinyin, Radical-Stroke, Stroke and
+Zhuyin) for Chinese Han scripts (Hanzi ideographs).
+
+@item applies International Components for Unicode (ICU) for sorting process.
+
+@end itemize")
+    (license license:bsd-3)))
+
 (define-public texlive-utfsym
   (package
     (name "texlive-utfsym")
-- 
cgit 1.4.1


From 8713eebf69d7da4e47d3a4cb98839f22646bd5ef Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:35:32 +0200
Subject: gnu: Add texlive-web.

* gnu/packages/tex.scm (texlive-web): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 14b4bc44f8..eb837a4c6e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8341,6 +8341,30 @@ diagrams for lectures or assignment sheets.")
 per command or per parameter.")
     (license license:gpl3+)))
 
+(define-public texlive-web
+  (package
+    (name "texlive-web")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/tangle.1"
+                   "doc/man/man1/tangle.man1.pdf"
+                   "doc/man/man1/weave.1"
+                   "doc/man/man1/weave.man1.pdf")
+             (base32
+              "0iiyzzrgwakw7ipdnwmjwcrqayzq4yn4786zlr9zirmmj34hpamz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-kpathsea))
+    (home-page "https://ctan.org/pkg/web")
+    (synopsis "Original literate programming system")
+    (description
+     "The system processes web files in two ways: firstly to rearrange them to
+produce compilable code (using the program @command{tangle}), and secondly to
+produce a TeX source (using the program @command{weave}) that may be typeset
+for comfortable reading.")
+    (license license:knuth)))
+
 (define-public texlive-wheelchart
   (package
     (name "texlive-wheelchart")
-- 
cgit 1.4.1


From c79b6b6c5f6e4649a11a68143cc484af0c707359 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:36:52 +0200
Subject: gnu: Add texlive-xindex.

* gnu/packages/tex.scm (texlive-xindex): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index eb837a4c6e..57a7488beb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8407,6 +8407,25 @@ 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-xindex
+  (package
+    (name "texlive-xindex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/xindex/" "scripts/xindex/"
+                   "tex/latex/xindex/" "tex/lualatex/xindex/")
+             (base32
+              "1zcfr6vxh49cwpqa594ibmjxs775z08l5pqz36w3013dzh6m3yh1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "xindex.lua")))
+    (home-page "https://ctan.org/pkg/xindex")
+    (synopsis "Unicode compatible index generation")
+    (description
+     "This package provides a Unicode compatible index programm for LaTeX.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-xistercian
   (package
     (name "texlive-xistercian")
-- 
cgit 1.4.1


From d88e2fdd3811142b72478e9728399ea613edc156 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:38:11 +0200
Subject: gnu: Add texlive-xpdfopen.

* gnu/packages/tex.scm (texlive-xpdfopen): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 57a7488beb..0bfb25c175 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8451,6 +8451,29 @@ a Cistercian numeral, and @code{\\cisterciannum@{<integer>@}}, formats the
 integer (given as a string) as a Cistercian numeral.")
     (license license:lppl1.3c)))
 
+(define-public texlive-xpdfopen
+  (package
+    (name "texlive-xpdfopen")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/pdfclose.1"
+                   "doc/man/man1/pdfclose.man1.pdf"
+                   "doc/man/man1/pdfopen.1"
+                   "doc/man/man1/pdfopen.man1.pdf")
+             (base32
+              "130wvaypfrg9sav0pdcdy1g10fll8pqcsqsy70fxlzzr937glsh1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xpdfopen")
+    (synopsis "Commands to control PDF readers, under X11")
+    (description
+     "The command-line programs @command{pdfopen} and @command{pdfclose} allow
+you to control the X Window System version of Adobe's Acrobat Reader from the
+command line or from within a (shell) script.  The programs work with
+@command{xpdf} and @command{evince}.")
+    (license license:public-domain)))
+
 (define-public texlive-xpicture
   (package
     (name "texlive-xpicture")
-- 
cgit 1.4.1


From 2bc85d9380b479b8d5b3dbea7c4ce8d527c0c075 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:41:39 +0200
Subject: gnu: Add texlive-dtl.

* gnu/packages/tex.scm (texlive-dtl): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0bfb25c175..c52903dcbb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1638,6 +1638,29 @@ code navigation, and related functionality to any text editor that speaks the
 LSP protocol.")
     (license (list license:gpl3+ license:lppl1.3+ license:fdl1.3+))))
 
+(define-public texlive-dtl
+  (package
+    (name "texlive-dtl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/dt2dv.1"
+                   "doc/man/man1/dt2dv.man1.pdf"
+                   "doc/man/man1/dv2dt.1"
+                   "doc/man/man1/dv2dt.man1.pdf")
+             (base32
+              "0kvnsr8nxrys99rp74wlxnisfripx6jpjjkqy38d3d4gw13cvb5g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dtl")
+    (synopsis "Tools to dis-assemble and re-assemble DVI files")
+    (description
+     "DTL (DVI Text Language) is a means of expressing the content of a DVI file,
+which is readily readable by humans.  The DTL bundle contains an assembler
+@command{dt2dv}, which produces DVI files from DTL files, and a disassembler
+@command{dv2dt}, which produces DTL files from DVI files.")
+    (license license:public-domain)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From 89e1c9c22e7a4a539ad15ea2adeebfdfdab26517 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:41:50 +0200
Subject: gnu: Add texlive-dtxgen.

* gnu/packages/tex.scm (texlive-dtxgen): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c52903dcbb..db6cb7800e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1661,6 +1661,26 @@ which is readily readable by humans.  The DTL bundle contains an assembler
 @command{dv2dt}, which produces DTL files from DVI files.")
     (license license:public-domain)))
 
+(define-public texlive-dtxgen
+  (package
+    (name "texlive-dtxgen")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/dtxgen/" "scripts/dtxgen/")
+             (base32
+              "1j1j136p4ddjlmwmhwlpmsxqpx2ixhhssfsl8l49lds80ad4y98m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "dtxgen")))
+    (home-page "https://ctan.org/pkg/dtxgen")
+    (synopsis "Creates a template for a self-extracting @file{.dtx} file")
+    (description
+     "The Bash script dtxgen creates a template for a self-extracting
+@file{.dtx} file.  It is useful for those who plan to create a new documented
+LaTeX source (.dtx) file.")
+    (license license:gpl3+)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From 3fbe61197c50c64f7afcc15d3eb547510a1477fa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:42:04 +0200
Subject: gnu: Add texlive-dvi2tty.

* gnu/packages/tex.scm (texlive-dvi2tty): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index db6cb7800e..df86e9f931 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1681,6 +1681,27 @@ which is readily readable by humans.  The DTL bundle contains an assembler
 LaTeX source (.dtx) file.")
     (license license:gpl3+)))
 
+(define-public texlive-dvi2tty
+  (package
+    (name "texlive-dvi2tty")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/disdvi.1"
+                   "doc/man/man1/disdvi.man1.pdf"
+                   "doc/man/man1/dvi2tty.1"
+                   "doc/man/man1/dvi2tty.man1.pdf")
+             (base32
+              "108y0qxh13x0iivgsvkk4370f471p03nyl4x9nn7lng1wrsafp6h")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dvi2tty")
+    (synopsis "Produce ASCII from DVI")
+    (description
+     "This package provides a DVI driver to produce an ASCII representation of
+the document.")
+    (license license:gpl2)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From f1e1ce32c2ac6ce419fe81ed1c49f7d738a7a6ce Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:42:16 +0200
Subject: gnu: Add texlive-dviasm.

* gnu/packages/tex.scm (texlive-dviasm): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index df86e9f931..8121e1c4f8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1702,6 +1702,30 @@ LaTeX source (.dtx) file.")
 the document.")
     (license license:gpl2)))
 
+(define-public texlive-dviasm
+  (package
+    (name "texlive-dviasm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/dviasm/" "doc/man/man1/dviasm.1"
+                   "doc/man/man1/dviasm.man1.pdf"
+                   "scripts/dviasm/")
+             (base32
+              "1hx4j0pmh4h3194xxcvjnh5nr069sysbqxvg4zzmci6gjr7mjg7f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "dviasm.py")))
+    (inputs (list python))
+    (home-page "https://ctan.org/pkg/dviasm")
+    (synopsis "Utility for editing DVI files")
+    (description
+     "This package provides a Python script to support changing or creating
+DVI files via disassembling into text, editing, and then reassembling into
+binary format.  It supports advanced features such as adding a preprint number
+or watermarks.")
+    (license license:gpl3+)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From ad362ba2bf77c645a144a8b18e006174a5cc8fc7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:42:27 +0200
Subject: gnu: Add texlive-dvicopy.

* gnu/packages/tex.scm (texlive-dvicopy): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8121e1c4f8..08bc19a3b7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1726,6 +1726,27 @@ binary format.  It supports advanced features such as adding a preprint number
 or watermarks.")
     (license license:gpl3+)))
 
+(define-public texlive-dvicopy
+  (package
+    (name "texlive-dvicopy")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/dvicopy.1"
+                   "doc/man/man1/dvicopy.man1.pdf")
+             (base32
+              "010bs4iyaja7mq5wy9mz6fzxlxf9472c2zdm93x9i474dzgnh2vl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dvicopy")
+    (synopsis "Copy DVI files, flattening VFs")
+    (description
+     "@command{dvicopy} is a utility program that allows one to take a DVI
+file that references composite fonts (VF) and convert it into a DVI file that
+does not contain such references.  It also serves as a basis for writing DVI
+drivers (much like DVItype).")
+    (license license:gpl3+)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From d5db87ab28e8874a4dfd11dba9cb26aba0cce1cb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:42:41 +0200
Subject: gnu: Add texlive-dvidvi.

* gnu/packages/tex.scm (texlive-dvidvi): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 08bc19a3b7..1eca4acefd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1747,6 +1747,29 @@ does not contain such references.  It also serves as a basis for writing DVI
 drivers (much like DVItype).")
     (license license:gpl3+)))
 
+(define-public texlive-dvidvi
+  (package
+    (name "texlive-dvidvi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/dvidvi.1"
+                   "doc/man/man1/dvidvi.man1.pdf")
+             (base32
+              "1w153rqm7nlmcf6162glxz282nbb6b6hjf5h0p7mbzr0j1357sxj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dvidvi")
+    (synopsis "Convert one DVI file into another")
+    (description
+     "This @command{dvidvi} converts one DVI file into another.  The output
+DVI file's contents are specified by page selection commands; series of pages
+and page number ranges may be specified, as well as inclusions and
+exclusions.")
+    ;; Its author stated the program is to be used under the GPL.  See
+    ;; <https://metadata.ftp-master.debian.org/changelogs//main/d/dvidvi/dvidvi_1.0-8.2_copyright>.
+    (license license:gpl3)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From 80fa1e3ea45146166ceb9287780c32f76e2870bd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:42:52 +0200
Subject: gnu: Add texlive-dviinfox.

* gnu/packages/tex.scm (texlive-dviinfox): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1eca4acefd..0d829c66a7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1770,6 +1770,26 @@ exclusions.")
     ;; <https://metadata.ftp-master.debian.org/changelogs//main/d/dvidvi/dvidvi_1.0-8.2_copyright>.
     (license license:gpl3)))
 
+(define-public texlive-dviinfox
+  (package
+    (name "texlive-dviinfox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/dviinfox/" "scripts/dviinfox/")
+             (base32
+              "1rc662dllanawrlz2r0pnisl6zzc7c3bivsqy72iq87a92cq8kml")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "dviinfox.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/dviinfox")
+    (synopsis "Perl script to print DVI meta information")
+    (description
+     "The package provides a Perl script which prints information about a DVI
+file.  It also supports XeTeX XDV format.")
+    (license license:expat)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From 9f92a955799f45999e5b05d6ee1f83a475e33820 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:43:03 +0200
Subject: gnu: Add texlive-dviljk.

* gnu/packages/tex.scm (texlive-dviljk): New variable.
---
 gnu/packages/tex.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0d829c66a7..1ba7441789 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1790,6 +1790,35 @@ exclusions.")
 file.  It also supports XeTeX XDV format.")
     (license license:expat)))
 
+(define-public texlive-dviljk
+  (package
+    (name "texlive-dviljk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/dvihp.1"
+                   "doc/man/man1/dvihp.man1.pdf"
+                   "doc/man/man1/dvilj.1"
+                   "doc/man/man1/dvilj.man1.pdf"
+                   "doc/man/man1/dvilj2p.1"
+                   "doc/man/man1/dvilj2p.man1.pdf"
+                   "doc/man/man1/dvilj4.1"
+                   "doc/man/man1/dvilj4.man1.pdf"
+                   "doc/man/man1/dvilj4l.1"
+                   "doc/man/man1/dvilj4l.man1.pdf"
+                   "doc/man/man1/dvilj6.1"
+                   "doc/man/man1/dvilj6.man1.pdf")
+             (base32
+              "03pi78c8ghy2gghzk1ffrvf5x7h8c1r0pv5pcspwxz365x2rsbjw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dviljk")
+    (synopsis "DVI to Laserjet output")
+    (description
+     "This package provides a DVI driver for the LaserJet printers, using
+@command{kpathsea} recursive file searching.")
+    (license license:gpl3+)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From ccd3df80c3423ce1fab967b10eb184fd067fdac9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:43:19 +0200
Subject: gnu: Add texlive-dviout-util.

* gnu/packages/tex.scm (texlive-dviout-util): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1ba7441789..b7a9a75432 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1819,6 +1819,29 @@ file.  It also supports XeTeX XDV format.")
 @command{kpathsea} recursive file searching.")
     (license license:gpl3+)))
 
+(define-public texlive-dviout-util
+  (package
+    (name "texlive-dviout-util")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/chkdvifont.1"
+                   "doc/man/man1/chkdvifont.man1.pdf"
+                   "doc/man/man1/dvispc.1"
+                   "doc/man/man1/dvispc.man1.pdf")
+             (base32
+              "098pksgf2iamq96rmzg5fw7i9dlpvdksficsz1bf8k8z4djnbk8n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Utilities from the @code{dviout} package")
+    (description
+     "This package provides two utilities: @command{chkdvifont}, which check
+fonts in DVI/TFM/JFM/FONT files, and @command{dvispc}, which corrects the
+page-independence of DVI file using color specials or tpic specials, and
+transforms between a DVI file and a text file.")
+    (license license:expat)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From 8b53b69bc7163f543435abbd802d883a9bfcfa72 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:43:31 +0200
Subject: gnu: Add texlive-dvipng.

* gnu/packages/tex.scm (texlive-dvipng): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b7a9a75432..4ebdca06f7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1842,6 +1842,32 @@ page-independence of DVI file using color specials or tpic specials, and
 transforms between a DVI file and a text file.")
     (license license:expat)))
 
+(define-public texlive-dvipng
+  (package
+    (name "texlive-dvipng")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/dvipng/"
+                   "doc/info/dvipng.info"
+                   "doc/man/man1/dvigif.1"
+                   "doc/man/man1/dvigif.man1.pdf"
+                   "doc/man/man1/dvipng.1"
+                   "doc/man/man1/dvipng.man1.pdf")
+             (base32
+              "0r001q4p5569dagayds1c56y10ls6f6v7mmywiw81l995q16apxi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dvipng")
+    (synopsis "DVI to PNG/GIF converter")
+    (description
+     "This program makes PNG and/or GIF graphics from DVI files as obtained
+from TeX and its relatives.  It offers very fast rendering of DVI as bitmap
+files, which makes it suitable for generating large amounts of images
+on-the-fly, as needed in @code{preview-latex}, WeBWorK and others.  It does
+not read the postamble, so it can be started before TeX finishes.")
+    (license license:lgpl3)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From 75822fbbfd503b4bd7a098acdb0539ffa29e468b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:43:42 +0200
Subject: gnu: Add texlive-dvipos.

* gnu/packages/tex.scm (texlive-dvipos): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4ebdca06f7..85fa9971fb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1868,6 +1868,27 @@ on-the-fly, as needed in @code{preview-latex}, WeBWorK and others.  It does
 not read the postamble, so it can be started before TeX finishes.")
     (license license:lgpl3)))
 
+(define-public texlive-dvipos
+  (package
+    (name "texlive-dvipos")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/dvipos.1"
+                   "doc/man/man1/dvipos.man1.pdf")
+             (base32
+              "0dmaas4m9y4px53vlg0jr73xviki338fm2n176l8ldwqj0vvq1b8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Support DVI @samp{pos:} specials used by ConTeXt DVI output")
+    (description
+     "@command{dvipos} parses a DVI file looking for @samp{pos:} specials.
+It then outputs the information from those specials along with information
+that only a DVI postprocessor could determine, such as the current @samp{x}
+and @samp{y} location.")
+    (license license:gpl2+)))
+
 (define-public texlive-dvipsconfig
   (package
     (name "texlive-dvipsconfig")
-- 
cgit 1.4.1


From fd2a9e871c98dc06c7a1e9eb7e1b098743cbf437 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:43:58 +0200
Subject: gnu: Add texlive-dvisvgm.

* gnu/packages/tex.scm (texlive-dvisvgm): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 85fa9971fb..fcad13abc5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1911,6 +1911,31 @@ grid underneath the page material--very useful for measuring and eliminating
 paper feed errors!")
     (license license:gpl3+)))
 
+(define-public texlive-dvisvgm
+  (package
+    (name "texlive-dvisvgm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/dvisvgm.1"
+                   "doc/man/man1/dvisvgm.man1.pdf")
+             (base32
+              "1fz3sa7p9wk2g1v0bpy87vz7nxwrh5bsfl4m734n6lhsh1bkj6fb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dvisvgm")
+    (synopsis
+     "Convert DVI, EPS, and PDF files to Scalable Vector Graphics format (SVG)")
+    (description
+     "Dvisvgm is a command line utility that converts TeX DVI as well as EPS
+and PDF files to the XML-based Scalable Vector Graphics (SVG) format.  It
+provides full font support including virtual fonts, font maps, and sub-fonts.
+If necessary, @command{dvisvgm} vectorizes Metafont's bitmap output in order
+to always create lossless scalable output.  The embedded SVG fonts can
+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-fontools
   (package
     (name "texlive-fontools")
-- 
cgit 1.4.1


From d63b8ed17d59dd4b3f7b064c89f31869e9b51367 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:44:14 +0200
Subject: gnu: Add texlive-findhyph.

* gnu/packages/tex.scm (texlive-findhyph): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fcad13abc5..1d91ff377c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1936,6 +1936,30 @@ 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-findhyph
+  (package
+    (name "texlive-findhyph")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/findhyph.1"
+                   "doc/man/man1/findhyph.man1.pdf"
+                   "doc/support/findhyph/" "scripts/findhyph/")
+             (base32
+              "1bxj0li1a9qsvwmp0kmfsal4vsgsqal1lgmp4423z9nvwrwvvlrr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "findhyph")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/findhyph")
+    (synopsis "Find hyphenated words in a document")
+    (description
+     "Findhyph is a Perl script that will analyse the log file from running
+your document with @code{\\tracingparagraphs=1} set.  The output contains
+enough context to enable you to find the hyphenated word that's being
+referenced.")
+    (license license:gpl2)))
+
 (define-public texlive-fontools
   (package
     (name "texlive-fontools")
-- 
cgit 1.4.1


From 9da7433cc7d7919faa03bac7b1bf817c15d1ef22 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:44:28 +0200
Subject: gnu: Add texlive-fragmaster.

* gnu/packages/tex.scm (texlive-fragmaster): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1d91ff377c..d10c5f0291 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2029,6 +2029,28 @@ generates a VF file and a TFM file; @command{vftovp} takes a VF file and a TFM
 file and generates a VPL file.")
     (license license:knuth)))
 
+(define-public texlive-fragmaster
+  (package
+    (name "texlive-fragmaster")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/fragmaster/"
+                   "scripts/fragmaster/")
+             (base32
+              "1vwbkbg96dql73gayb06gs2fdxynljibjkmhliglc9ddggyx4v2m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "fragmaster.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/fragmaster")
+    (synopsis "Using @command{psfrag} with pdfLaTeX")
+    (description
+     "Fragmaster enables you to use @command{psfrag} with pdfLaTeX.  It takes
+EPS files and @command{psfrag} substitution definition files, and produces PDF
+and EPS files with the substitutions included.")
+    (license license:gpl3+)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From f42b48edf45f08691a4bed7468785913ecbf55af Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:44:51 +0200
Subject: gnu: Add texlive-git-latexdiff.

* gnu/packages/tex.scm (texlive-git-latexdiff): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d10c5f0291..e2f2f88b75 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9788,6 +9788,28 @@ files, by @code{\\includegraphics}.  In effect, then package adds support for
 the @file{.tex} extension.")
     (license license:lppl1.3+)))
 
+(define-public texlive-git-latexdiff
+  (package
+    (name "texlive-git-latexdiff")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/git-latexdiff.1"
+                   "doc/man/man1/git-latexdiff.man1.pdf"
+                   "doc/support/git-latexdiff/"
+                   "scripts/git-latexdiff/")
+             (base32
+              "1hblgnjad5qm27ijpynz0x1rxgi07y5apgnv5r2wk3ngxj016pvn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "git-latexdiff")))
+    (home-page "https://ctan.org/pkg/git-latexdiff")
+    (synopsis "Call @command{latexdiff} on two Git revisions of a file")
+    (description
+     "@command{git-latexdiff} is a tool to graphically visualize differences
+between different versions of a LaTeX file.")
+    (license license:bsd-2)))
+
 (define-public texlive-glyphlist
   (package
     (name "texlive-glyphlist")
-- 
cgit 1.4.1


From 6c5f4ab9e9a668bbc649ccc8e2cf7435f9738f2a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:45:44 +0200
Subject: gnu: Add texlive-gsftopk.

* gnu/packages/tex.scm (texlive-gsftopk): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e2f2f88b75..29c5cd1655 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -9917,6 +9917,28 @@ documents.  It comprises the packages @code{color}, @code{graphics},
 definition files for Greek text font encodings for use with @code{fontenc}.")
     (license license:lppl1.3+)))
 
+(define-public texlive-gsftopk
+  (package
+    (name "texlive-gsftopk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/gsftopk.1"
+                   "doc/man/man1/gsftopk.man1.pdf"
+                   "dvips/gsftopk/")
+             (base32
+              "1qlac704qbm7kq762z0b887wfncprpcm8zj2lb4nag0wzdrrjdq5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gsftopk")
+    (synopsis "Convert Ghostscript fonts to PK files")
+    (description
+     "Designed for use with @command{xdvi} and @command{dvips}, this utility
+converts Adobe Type 1 fonts to PK bitmap format.  It should not ordinarily be
+much used nowadays, since both its target applications are now capable of
+dealing with Type 1 fonts, direct.")
+    (license license:gpl3+)))
+
 (define-public texlive-hycolor
   (package
     (name "texlive-hycolor")
-- 
cgit 1.4.1


From 0bc890a5cb9153b27c99df8014f679d478cfd3d3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 16 Jul 2023 17:39:02 +0200
Subject: gnu: Add texlive-collection-binextra.

* gnu/packages/tex.scm (texlive-collection-binextra): New variable.
---
 gnu/packages/tex.scm | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 29c5cd1655..91e61b8545 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -89,6 +89,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages plotutils)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
@@ -21981,6 +21982,127 @@ 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-binextra
+  (package
+    (name "texlive-collection-binextra")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list asymptote
+           texlive-a2ping
+           texlive-adhocfilelist
+           texlive-arara
+           texlive-bibtex8
+           texlive-bibtexu
+           texlive-bundledoc
+           texlive-checklistings
+           texlive-chklref
+           texlive-chktex
+           texlive-clojure-pamphlet
+           texlive-cluttex
+           texlive-collection-basic
+           texlive-ctan-o-mat
+           texlive-ctan-chk
+           texlive-ctanbib
+           texlive-ctanify
+           texlive-ctanupload
+           texlive-ctie
+           texlive-cweb
+           texlive-de-macro
+           texlive-detex
+           texlive-digestif
+           texlive-dtl
+           texlive-dtxgen
+           texlive-dvi2tty
+           texlive-dviasm
+           texlive-dvicopy
+           texlive-dvidvi
+           texlive-dviinfox
+           texlive-dviljk
+           texlive-dviout-util
+           texlive-dvipng
+           texlive-dvipos
+           texlive-dvisvgm
+           texlive-findhyph
+           texlive-fragmaster
+           texlive-git-latexdiff
+           texlive-gsftopk
+           texlive-hook-pre-commit-pkg
+           texlive-installfont
+           texlive-ketcindy
+           texlive-lacheck
+           texlive-latex-git-log
+           texlive-latex-papersize
+           texlive-latex2man
+           texlive-latex2nemeth
+           texlive-latexdiff
+           texlive-latexfileversion
+           texlive-latexindent
+           texlive-latexmk
+           texlive-latexpand
+           texlive-light-latex-make
+           texlive-listings-ext
+           texlive-ltxfileinfo
+           texlive-ltximg
+           texlive-luajittex
+           texlive-make4ht
+           texlive-match-parens
+           texlive-mflua
+           texlive-mkjobtexmf
+           texlive-optexcount
+           texlive-patgen
+           texlive-pdfbook2
+           texlive-pdfcrop
+           texlive-pdfjam
+           texlive-pdflatexpicscale
+           texlive-pdftex-quiet
+           texlive-pdftosrc
+           texlive-pdfxup
+           texlive-pfarrei
+           texlive-pkfix
+           texlive-pkfix-helper
+           texlive-purifyeps
+           texlive-pythontex
+           texlive-seetexk
+           texlive-spix
+           texlive-srcredact
+           texlive-sty2dtx
+           texlive-synctex
+           texlive-tex4ebook
+           texlive-texaccents
+           texlive-texcount
+           texlive-texdef
+           texlive-texdiff
+           texlive-texdirflatten
+           texlive-texdoc
+           texlive-texdoctk
+           texlive-texfot
+           texlive-texliveonfly
+           texlive-texloganalyser
+           texlive-texlogfilter
+           texlive-texlogsieve
+           texlive-texosquery
+           texlive-texplate
+           texlive-texware
+           texlive-tie
+           texlive-tlcockpit
+           texlive-tpic2pdftex
+           texlive-typeoutfileinfo
+           texlive-upmendex
+           texlive-web
+           texlive-xindex
+           texlive-xindy
+           texlive-xpdfopen))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "TeX auxiliary programs")
+    (description
+     "This package provides a myriad of additional TeX-related support
+programs.  It includes programs and macros for DVI file manipulation, literate
+programming, patgen, and plenty more.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-collection-context
   (package
     (name "texlive-collection-context")
-- 
cgit 1.4.1


From f832746ab6b124814ceb6dedc141c9f60f34e082 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 18 Jul 2023 18:06:32 +0200
Subject: guix: Fix license translation in texlive importer.

* guix/import/texlive.scm (string->license): Properly translate "artistic2"
into `artistic2.0'.
---
 guix/import/texlive.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 29c2ba4dd1..b5a812b34e 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -66,7 +66,7 @@
 
 (define string->license
   (match-lambda
-    ("artistic2" 'gpl3+)
+    ("artistic2" 'artistic2.0)
     ("apache2" 'asl2.0)
     ("gpl" 'gpl3+)
     ("gpl1" 'gpl1)
-- 
cgit 1.4.1


From c2057a608e4a8a8f9c2c68609b5b00a3acafdf9d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 18 Jul 2023 18:08:15 +0200
Subject: gnu: texlive-biber: Fix license.

* gnu/packages/tex.scm (texlive-biber)[license]: Set to ARTISTIC2.0.
---
 gnu/packages/tex.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 91e61b8545..b207729919 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -17889,7 +17889,7 @@ This package contains the complete TeX Live distribution.")
      "Biber is a BibTeX replacement for users of BibLaTeX.  It supports full
 UTF-8, can (re)-encode input and output, supports highly configurable sorting,
 dynamic bibliography sets and many other features.")
-    (license license:gpl3+)))
+    (license license:artistic2.0)))
 
 (define-deprecated-package biber texlive-biber)
 
-- 
cgit 1.4.1


From 772eaa69f31457aa19ca4dc4ce755c791d722054 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 8 Jun 2023 08:00:26 +0200
Subject: gnu: emacs: Depend on libc-for-target.

* gnu/packages/emacs.scm (emacs)[inputs]: Change glibc to (libc-for-target).
---
 gnu/packages/emacs.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 437564f6f0..d3689c2474 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2017, 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2017, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2018, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -310,7 +310,7 @@
 
            ;; For native compilation
            binutils
-           glibc
+           (libc-for-target)
            libgccjit
 
            ;; Required for "core" functionality, such as dired and compression.
-- 
cgit 1.4.1


From d5f8b50365533f2713596f59519c48019f6b1f19 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Fri, 3 Mar 2023 21:09:33 -0500
Subject: pack: Move common build code to (guix build pack).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The rationale is to reduce the number of derivations built per pack to ideally
one, to minimize storage requirements.  The number of derivations had gone up
with 68380db4 ("pack: Extract populate-profile-root from
self-contained-tarball/builder.") as a side effect to improving code reuse.

* guix/scripts/pack.scm (guix): Add commentary comment.
(populate-profile-root, self-contained-tarball/builder): Extract to...
* guix/build/pack.scm (populate-profile-root): ... this, and...
(build-self-contained-tarball): ... that, adjusting for use on the build side.
(assert-utf8-locale): New procedure.
(self-contained-tarball, debian-archive, rpm-archive): Adjust accordingly.

Reviewed-by: Ludovic Courtès <ludo@gnu.org>
---
 guix/build/pack.scm   | 111 +++++++++++++++-
 guix/scripts/pack.scm | 355 +++++++++++++++++++-------------------------------
 tests/pack.scm        | 106 +++++++--------
 3 files changed, 293 insertions(+), 279 deletions(-)

diff --git a/guix/build/pack.scm b/guix/build/pack.scm
index 3b73d1b227..fcb1da2a6c 100644
--- a/guix/build/pack.scm
+++ b/guix/build/pack.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -17,8 +17,25 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (guix build pack)
+  #:use-module (gnu build install)
   #:use-module (guix build utils)
-  #:export (tar-base-options))
+  #:use-module (guix build store-copy)
+  #:use-module ((guix build union) #:select (relative-file-name))
+  #:use-module (ice-9 match)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-26)
+  #:export (tar-base-options
+            populate-profile-root
+            build-self-contained-tarball))
+
+;;; Commentary:
+
+;;; This module contains build-side common procedures used by the host-side
+;;; (guix scripts pack) module, mostly to allow for code reuse.  Due to making
+;;; use of the (guix build store-copy) module, it transitively requires the
+;;; sqlite and gcrypt extensions to be available.
+
+;;; Code:
 
 (define* (tar-base-options #:key tar compressor)
   "Return the base GNU tar options required to produce deterministic archives
@@ -52,3 +69,93 @@ the `-I' option."
     ;; process.  Use '--hard-dereference' to eliminate it.
     "--hard-dereference"
     "--check-links"))
+
+(define (assert-utf8-locale)
+  "Verify the current process is using the en_US.utf8 locale."
+  (unless (string=? "unset for tests" (getenv "GUIX_LOCPATH"))
+    (unless (false-if-exception (setlocale LC_ALL "en_US.utf8"))
+      (error "environment not configured for en_US.utf8 locale"))))
+
+(define* (populate-profile-root profile
+                                #:key (profile-name "guix-profile")
+                                localstatedir?
+                                store-database
+                                deduplicate?
+                                (symlinks '()))
+  "Populate the root profile directory with SYMLINKS and a Guix database, when
+LOCALSTATEDIR? is set, and a pre-computed STORE-DATABASE is provided.  The
+directory is created as \"root\" in the current working directory.  When
+DEDUPLICATE? is true, deduplicate the store items, which relies on hard
+links.  It needs to run in an environment where "
+  (define symlink->directives
+    ;; Return "populate directives" to make the given symlink and its
+    ;; parent directories.
+    (match-lambda
+      ((source '-> target)
+       (let ((target (string-append profile "/" target))
+             (parent (dirname source)))
+         ;; Never add a 'directory' directive for "/" so as to
+         ;; preserve its ownership when extracting the archive (see
+         ;; below), and also because this would lead to adding the
+         ;; same entries twice in the tarball.
+         `(,@(if (string=? parent "/")
+                 '()
+                 `((directory ,parent)))
+           ;; Use a relative file name for compatibility with
+           ;; relocatable packs.
+           (,source -> ,(relative-file-name parent target)))))))
+
+  (define directives
+    ;; Fully-qualified symlinks.
+    (append-map symlink->directives symlinks))
+
+  (define %root "root")
+
+  (when localstatedir?
+    (unless store-database
+      (error "missing STORE-DATABASE argument")))
+
+  (assert-utf8-locale)
+
+  ;; Note: there is not much to gain here with deduplication and there
+  ;; is the overhead of the '.links' directory, so turn it off by
+  ;; default.  Furthermore GNU tar < 1.30 sometimes fails to extract
+  ;; tarballs with hard links:
+  ;; <http://lists.gnu.org/archive/html/bug-tar/2017-11/msg00009.html>.
+  (populate-store (list "profile") %root #:deduplicate? deduplicate?)
+
+  (when localstatedir?
+    (install-database-and-gc-roots %root store-database
+                                   profile #:profile-name profile-name))
+
+  ;; Create SYMLINKS.
+  (for-each (cut evaluate-populate-directive <> %root) directives))
+
+(define* (build-self-contained-tarball profile
+                                       tarball-file-name
+                                       #:key (profile-name "guix-profile")
+                                       localstatedir?
+                                       store-database
+                                       deduplicate?
+                                       symlinks
+                                       compressor-command)
+  "Create a self-contained tarball TARBALL-FILE-NAME from PROFILE, optionally
+compressing it with COMPRESSOR-COMMAND, the complete command-line string to
+use for the compressor."
+  (populate-profile-root profile
+                         #:profile-name profile-name
+                         #:localstatedir? localstatedir?
+                         #:store-database store-database
+                         #:deduplicate? deduplicate?
+                         #:symlinks symlinks)
+
+  (assert-utf8-locale)
+
+  ;; GNU Tar recurses directories by default.  Simply add the whole root
+  ;; directory, which contains all the files to be archived.  This avoids
+  ;; creating duplicate files in the archives that would be stored as hard
+  ;; links by GNU Tar.
+  (apply invoke "tar" "-cvf" tarball-file-name "-C" "root" "."
+         (tar-base-options
+          #:tar "tar"
+          #:compressor compressor-command)))
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 0dc9979194..01995c48b7 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -72,6 +72,14 @@
             %formats
             guix-pack))
 
+;;; Commentary:
+
+;;; This module implements the 'guix pack' command and the various supported
+;;; formats.  Where feasible, the builders of the packs should be implemented
+;;; as single derivations to minimize storage requirements.
+
+;;; Code:
+
 ;; This one is only for use in this module, so don't put it in %compressors.
 (define bootstrap-xz
   (compressor "bootstrap-xz" ".xz"
@@ -197,153 +205,18 @@ target the profile's @file{bin/env} file:
   "Configure the environment to use the \"en_US.utf8\" locale provided by the
 GLIBC-UT8-LOCALES package."
   ;; Arrange to not depend on 'glibc-utf8-locales' when using '--bootstrap'.
-  (and (or (not (profile? profile))
-           (profile-locales? profile))
-       #~(begin
-           (setenv "GUIX_LOCPATH"
-                   #+(file-append glibc-utf8-locales "/lib/locale"))
-           (setlocale LC_ALL "en_US.utf8"))))
-
-(define* (populate-profile-root profile
-                                #:key (profile-name "guix-profile")
-                                target
-                                localstatedir?
-                                deduplicate?
-                                (symlinks '()))
-  "Populate the root profile directory with SYMLINKS and a Guix database, when
-LOCALSTATEDIR? is set.  When DEDUPLICATE? is true, deduplicate the store
-items, which relies on hard links."
-  (define database
-    (and localstatedir?
-         (file-append (store-database (list profile))
-                      "/db/db.sqlite")))
-
-  (define bootstrap?
-    ;; Whether a '--bootstrap' environment is needed, for testing purposes.
-    ;; XXX: Infer that from available info.
-    (and (not database) (not (profile-locales? profile))))
-
-  (define (import-module? module)
-    ;; Since we don't use deduplication support in 'populate-store', don't
-    ;; import (guix store deduplication) and its dependencies, which includes
-    ;; Guile-Gcrypt, unless DEDUPLICATE? is #t.  This makes it possible to run
-    ;; tests with '--bootstrap'.
-    (and (not-config? module)
-         (or deduplicate? (not (equal? '(guix store deduplication) module)))))
-
-  (computed-file "profile-directory"
-    (with-imported-modules (source-module-closure
-                            `((guix build pack)
-                              (guix build store-copy)
-                              (guix build utils)
-                              (guix build union)
-                              (gnu build install))
-                            #:select? import-module?)
+  (if (or (not (profile? profile))
+          (profile-locales? profile))
       #~(begin
-          (use-modules (guix build pack)
-                       (guix build store-copy)
-                       (guix build utils)
-                       ((guix build union) #:select (relative-file-name))
-                       (gnu build install)
-                       (srfi srfi-1)
-                       (srfi srfi-26)
-                       (ice-9 match))
-
-          (define symlink->directives
-            ;; Return "populate directives" to make the given symlink and its
-            ;; parent directories.
-            (match-lambda
-              ((source '-> target)
-               (let ((target (string-append #$profile "/" target))
-                     (parent (dirname source)))
-                 ;; Never add a 'directory' directive for "/" so as to
-                 ;; preserve its ownership when extracting the archive (see
-                 ;; below), and also because this would lead to adding the
-                 ;; same entries twice in the tarball.
-                 `(,@(if (string=? parent "/")
-                         '()
-                         `((directory ,parent)))
-                   ;; Use a relative file name for compatibility with
-                   ;; relocatable packs.
-                   (,source -> ,(relative-file-name parent target)))))))
-
-          (define directives
-            ;; Fully-qualified symlinks.
-            (append-map symlink->directives '#$symlinks))
-
-          ;; Make sure non-ASCII file names are properly handled.
-          #+(set-utf8-locale profile)
-
-          ;; Note: there is not much to gain here with deduplication and there
-          ;; is the overhead of the '.links' directory, so turn it off by
-          ;; default.  Furthermore GNU tar < 1.30 sometimes fails to extract
-          ;; tarballs with hard links:
-          ;; <http://lists.gnu.org/archive/html/bug-tar/2017-11/msg00009.html>.
-          (populate-store (list "profile") #$output
-                          #:deduplicate? #$deduplicate?)
-
-          (when #+localstatedir?
-            (install-database-and-gc-roots #$output #+database #$profile
-                                           #:profile-name #$profile-name))
-
-          ;; Create SYMLINKS.
-          (for-each (cut evaluate-populate-directive <> #$output)
-                    directives)))
-    #:local-build? #f
-    #:guile (if bootstrap? %bootstrap-guile (default-guile))
-    #:options (list #:references-graphs `(("profile" ,profile))
-                    #:target target)))
+          (setenv "GUIX_LOCPATH"
+                  #+(file-append glibc-utf8-locales "/lib/locale"))
+          (setlocale LC_ALL "en_US.utf8"))
+      #~(setenv "GUIX_LOCPATH" "unset for tests")))
 
 
 ;;;
 ;;; Tarball format.
 ;;;
-(define* (self-contained-tarball/builder profile
-                                         #:key (profile-name "guix-profile")
-                                         target
-                                         localstatedir?
-                                         deduplicate?
-                                         symlinks
-                                         compressor
-                                         archiver)
-  "Return a GEXP that can build a self-contained tarball."
-
-  (define root (populate-profile-root profile
-                                      #:profile-name profile-name
-                                      #:target target
-                                      #:localstatedir? localstatedir?
-                                      #:deduplicate? deduplicate?
-                                      #:symlinks symlinks))
-
-  (with-imported-modules (source-module-closure '((guix build pack)
-                                                  (guix build utils)))
-    #~(begin
-        (use-modules (guix build pack)
-                     (guix build utils))
-
-        ;; Make sure non-ASCII file names are properly handled.
-        #+(set-utf8-locale profile)
-
-        (define tar #+(file-append archiver "/bin/tar"))
-
-        (define %root (if #$localstatedir? "." #$root))
-
-        (when #$localstatedir?
-          ;; Fix the permission of the Guix database file, which was made
-          ;; read-only when copied to the store in populate-profile-root.
-          (copy-recursively #$root %root)
-          (chmod (string-append %root "/var/guix/db/db.sqlite") #o644))
-
-        (with-directory-excursion %root
-          ;; GNU Tar recurses directories by default.  Simply add the whole
-          ;; current directory, which contains all the files to be archived.
-          ;; This avoids creating duplicate files in the archives that would
-          ;; be stored as hard links by GNU Tar.
-          (apply invoke tar "-cvf" #$output "."
-                 (tar-base-options
-                  #:tar tar
-                  #:compressor #+(and=> compressor compressor-command)))))))
-
 (define* (self-contained-tarball name profile
                                  #:key target
                                  (profile-name "guix-profile")
@@ -365,16 +238,48 @@ added to the pack."
     (warning (G_ "entry point not supported in the '~a' format~%")
              'tarball))
 
-  (gexp->derivation (string-append name ".tar"
-                                   (compressor-extension compressor))
-    (self-contained-tarball/builder profile
-                                    #:profile-name profile-name
-                                    #:target target
-                                    #:localstatedir? localstatedir?
-                                    #:deduplicate? deduplicate?
-                                    #:symlinks symlinks
-                                    #:compressor compressor
-                                    #:archiver archiver)))
+  (define database
+    (and localstatedir?
+         (file-append (store-database (list profile))
+                      "/db/db.sqlite")))
+
+  (gexp->derivation
+   (string-append name ".tar" (compressor-extension compressor))
+   ;; XXX: The conditional around deduplicate? is to allow the test to run
+   ;; without an external store.
+   (with-extensions (if deduplicate? (list guile-gcrypt) '())
+     (with-imported-modules (let ((lst (source-module-closure
+                                        '((guix build pack)
+                                          (guix build utils))
+                                        #:select? not-config?)))
+                              (if deduplicate?
+                                  lst
+                                  (delete '(guix store deduplication) lst)))
+
+       (source-module-closure '((guix build pack)
+                                (guix build utils))
+                              #:select? not-config?)
+       #~(begin
+           (use-modules (guix build pack)
+                        (guix build utils))
+
+           ;; Make sure non-ASCII file names are properly handled.
+           #+(set-utf8-locale profile)
+
+           (setenv "PATH" #+(file-append archiver "/bin"))
+
+           (build-self-contained-tarball #$profile
+                                         #$output
+                                         #:profile-name #$profile-name
+                                         #:localstatedir? #$localstatedir?
+                                         #:store-database #+database
+                                         #:deduplicate? #$deduplicate?
+                                         #:symlinks '#$symlinks
+                                         #:compressor-command
+                                         #+(and=> compressor
+                                                  compressor-command)))))
+   #:target target
+   #:references-graphs `(("profile" ,profile))))
 
 
 ;;;
@@ -719,20 +624,10 @@ Valid compressors are: ~a~%") compressor-name %valid-compressors)))
     (warning (G_ "entry point not supported in the '~a' format~%")
              'deb))
 
-  (define data-tarball
-    (computed-file (string-append "data.tar" (compressor-extension
-                                              compressor))
-      (self-contained-tarball/builder profile
-                                      #:target target
-                                      #:profile-name profile-name
-                                      #:localstatedir? localstatedir?
-                                      #:deduplicate? deduplicate?
-                                      #:symlinks symlinks
-                                      #:compressor compressor
-                                      #:archiver archiver)
-      #:local-build? #f                 ;allow offloading
-      #:options (list #:references-graphs `(("profile" ,profile))
-                      #:target target)))
+  (define database
+    (and localstatedir?
+         (file-append (store-database (list profile))
+                      "/db/db.sqlite")))
 
   (define build
     (with-extensions (list guile-gcrypt)
@@ -750,6 +645,9 @@ Valid compressors are: ~a~%") compressor-name %valid-compressors)))
                          (ice-9 optargs)
                          (srfi srfi-1))
 
+            ;; Make sure non-ASCII file names are properly handled.
+            #+(set-utf8-locale profile)
+
             (define machine-type
               ;; Extract the machine type from the specified target, else from the
               ;; current system.
@@ -803,10 +701,26 @@ Valid compressors are: ~a~%") compressor-name %valid-compressors)))
               (lambda (port)
                 (format port "~a~%" debian-format-version)))
 
-            (define data-tarball-file-name (strip-store-file-name
-                                            #+data-tarball))
+            (define compressor-command
+              #+(and=> compressor compressor-command))
 
-            (copy-file #+data-tarball data-tarball-file-name)
+            (define compressor-extension
+              #+(compressor-extension compressor))
+
+            (define data-tarball-file-name
+              (string-append "data.tar" compressor-extension))
+
+            (setenv "PATH" #+(file-append archiver "/bin"))
+
+            (build-self-contained-tarball #$profile
+                                          data-tarball-file-name
+                                          #:profile-name #$profile-name
+                                          #:localstatedir? #$localstatedir?
+                                          #:store-database #+database
+                                          #:deduplicate? #$deduplicate?
+                                          #:symlinks '#$symlinks
+                                          #:compressor-command
+                                          compressor-command)
 
             ;; Generate the control archive.
             (let-keywords '#$extra-options #f
@@ -815,8 +729,7 @@ Valid compressors are: ~a~%") compressor-name %valid-compressors)))
                            (triggers-file #f))
 
               (define control-tarball-file-name
-                (string-append "control.tar"
-                               #$(compressor-extension compressor)))
+                (string-append "control.tar" compressor-extension))
 
               ;; Write the compressed control tarball.  Only the control file is
               ;; mandatory (see: 'man deb' and 'man deb-control').
@@ -846,7 +759,7 @@ Section: misc
               (apply invoke tar
                      `(,@(tar-base-options
                           #:tar tar
-                          #:compressor #+(and=> compressor compressor-command))
+                          #:compressor compressor-command)
                        "-cvf" ,control-tarball-file-name
                        "control"
                        ,@(if postinst-file '("postinst") '())
@@ -857,7 +770,9 @@ Section: misc
                       "debian-binary"
                       control-tarball-file-name data-tarball-file-name))))))
 
-  (gexp->derivation (string-append name ".deb") build))
+  (gexp->derivation (string-append name ".deb") build
+                    #:target target
+                    #:references-graphs `(("profile" ,profile))))
 
 
 ;;;
@@ -881,66 +796,27 @@ PREUN-FILE and POSTUN-FILE can be provided via EXTRA-OPTIONS."
   (when entry-point
     (warning (G_ "entry point not supported in the '~a' format~%") 'rpm))
 
-  (define root (populate-profile-root profile
-                                      #:profile-name profile-name
-                                      #:target target
-                                      #:localstatedir? localstatedir?
-                                      #:deduplicate? deduplicate?
-                                      #:symlinks symlinks))
-
-  (define payload
-    (let* ((raw-cpio-file-name "payload.cpio")
-           (compressed-cpio-file-name (string-append raw-cpio-file-name
-                                                     (compressor-extension
-                                                      compressor))))
-      (computed-file compressed-cpio-file-name
-        (with-imported-modules (source-module-closure
-                                '((guix build utils)
-                                  (guix cpio)
-                                  (guix rpm)))
-          #~(begin
-              (use-modules (guix build utils)
-                           (guix cpio)
-                           (guix rpm)
-                           (srfi srfi-1))
-
-              ;; Make sure non-ASCII file names are properly handled.
-              #+(set-utf8-locale profile)
-
-              (define %root (if #$localstatedir? "." #$root))
-
-              (when #$localstatedir?
-                ;; Fix the permission of the Guix database file, which was made
-                ;; read-only when copied to the store in populate-profile-root.
-                (copy-recursively #$root %root)
-                (chmod (string-append %root "/var/guix/db/db.sqlite") #o644))
-
-              (call-with-output-file #$raw-cpio-file-name
-                (lambda (port)
-                  (with-directory-excursion %root
-                    ;; The first "." entry is discarded.
-                    (write-cpio-archive
-                     (remove fhs-directory?
-                             (cdr (find-files "." #:directories? #t)))
-                     port))))
-              (when #+(compressor-command compressor)
-                (apply invoke (append #+(compressor-command compressor)
-                                      (list #$raw-cpio-file-name))))
-              (copy-file #$compressed-cpio-file-name #$output)))
-        #:local-build? #f)))            ;allow offloading
+  (define database
+    (and localstatedir?
+         (file-append (store-database (list profile))
+                      "/db/db.sqlite")))
 
   (define build
     (with-extensions (list guile-gcrypt)
       (with-imported-modules `(((guix config) => ,(make-config.scm))
                                ,@(source-module-closure
                                   `((gcrypt hash)
+                                    (guix build pack)
                                     (guix build utils)
+                                    (guix cpio)
                                     (guix profiles)
                                     (guix rpm))
                                   #:select? not-config?))
         #~(begin
             (use-modules (gcrypt hash)
+                         (guix build pack)
                          (guix build utils)
+                         (guix cpio)
                          (guix profiles)
                          (guix rpm)
                          (ice-9 binary-ports)
@@ -952,6 +828,35 @@ PREUN-FILE and POSTUN-FILE can be provided via EXTRA-OPTIONS."
             ;; Make sure non-ASCII file names are properly handled.
             #+(set-utf8-locale profile)
 
+            (define %root "root")
+
+            (populate-profile-root #$profile
+                                   #:profile-name #$profile-name
+                                   #:localstatedir? #$localstatedir?
+                                   #:store-database #+database
+                                   #:deduplicate? #$deduplicate?
+                                   #:symlinks '#$symlinks)
+
+            (define raw-cpio-file-name "payload.cpio")
+
+            ;; Generate CPIO payload.
+            (call-with-output-file raw-cpio-file-name
+              (lambda (port)
+                (with-directory-excursion %root
+                  ;; The first "." entry is discarded.
+                  (write-cpio-archive
+                   (remove fhs-directory?
+                           (cdr (find-files "." #:directories? #t)))
+                   port))))
+
+            (when #+(compressor-command compressor)
+              (apply invoke (append #+(compressor-command compressor)
+                                    (list raw-cpio-file-name))))
+
+            (define cpio-file-name
+              (string-append "payload.cpio"
+                             #$(compressor-extension compressor)))
+
             (define machine-type
               (and=> (or #$target %host-type)
                      (lambda (triplet)
@@ -979,7 +884,7 @@ PREUN-FILE and POSTUN-FILE can be provided via EXTRA-OPTIONS."
                              #:target (or #$target %host-type)))
 
             (define payload-digest
-              (bytevector->hex-string (file-sha256 #$payload)))
+              (bytevector->hex-string (file-sha256 cpio-file-name)))
 
             (let-keywords '#$extra-options #f ((relocatable? #f)
                                                (prein-file #f)
@@ -989,7 +894,7 @@ PREUN-FILE and POSTUN-FILE can be provided via EXTRA-OPTIONS."
 
               (let ((header (generate-header name version
                                              payload-digest
-                                             #$root
+                                             %root
                                              #$(compressor-name compressor)
                                              #:target (or #$target %host-type)
                                              #:relocatable? relocatable?
@@ -1001,7 +906,7 @@ PREUN-FILE and POSTUN-FILE can be provided via EXTRA-OPTIONS."
                 (define header-sha256
                   (bytevector->hex-string (sha256 (u8-list->bytevector header))))
 
-                (define payload-size (stat:size (stat #$payload)))
+                (define payload-size (stat:size (stat cpio-file-name)))
 
                 (define header+compressed-payload-size
                   (+ (length header) payload-size))
@@ -1011,7 +916,7 @@ PREUN-FILE and POSTUN-FILE can be provided via EXTRA-OPTIONS."
                                       header+compressed-payload-size))
 
                 ;; Serialize the archive components to a file.
-                (call-with-input-file #$payload
+                (call-with-input-file cpio-file-name
                   (lambda (in)
                     (call-with-output-file #$output
                       (lambda (out)
@@ -1020,7 +925,9 @@ PREUN-FILE and POSTUN-FILE can be provided via EXTRA-OPTIONS."
                                                                    header))
                         (sendfile out in payload-size)))))))))))
 
-  (gexp->derivation (string-append name ".rpm") build))
+  (gexp->derivation (string-append name ".rpm") build
+                    #:target target
+                    #:references-graphs `(("profile" ,profile))))
 
   
 ;;;
diff --git a/tests/pack.scm b/tests/pack.scm
index ce5a2f8a53..0864a4b78a 100644
--- a/tests/pack.scm
+++ b/tests/pack.scm
@@ -76,65 +76,65 @@
 
 (test-begin "pack")
 
-(unless (network-reachable?) (test-skip 1))
-(test-assertm "self-contained-tarball" %store
-  (mlet* %store-monad
-      ((profile -> (profile
-                    (content (packages->manifest (list %bootstrap-guile)))
-                    (hooks '())
-                    (locales? #f)))
-       (tarball (self-contained-tarball "pack" profile
-                                        #:symlinks '(("/bin/Guile"
-                                                      -> "bin/guile"))
-                                        #:compressor %gzip-compressor
-                                        #:archiver %tar-bootstrap))
-       (check   (gexp->derivation
-                 "check-tarball"
-                 (with-imported-modules '((guix build utils))
-                   #~(begin
-                       (use-modules (guix build utils)
-                                    (srfi srfi-1))
-
-                       (define store
-                         ;; The unpacked store.
-                         (string-append "." (%store-directory) "/"))
-
-                       (define (canonical? file)
-                         ;; Return #t if FILE is read-only and its mtime is 1.
-                         (let ((st (lstat file)))
-                           (or (not (string-prefix? store file))
-                               (eq? 'symlink (stat:type st))
-                               (and (= 1 (stat:mtime st))
-                                    (zero? (logand #o222
-                                                   (stat:mode st)))))))
-
-                       (define bin
-                         (string-append "." #$profile "/bin"))
-
-                       (setenv "PATH"
-                               (string-append #$%tar-bootstrap "/bin"))
-                       (system* "tar" "xvf" #$tarball)
-                       (mkdir #$output)
-                       (exit
-                        (and (file-exists? (string-append bin "/guile"))
-                             (file-exists? store)
-                             (every canonical?
-                                    (find-files "." (const #t)
-                                                #:directories? #t))
-                             (string=? (string-append #$%bootstrap-guile "/bin")
-                                       (readlink bin))
-                             (string=? (string-append ".." #$profile
-                                                      "/bin/guile")
-                                       (readlink "bin/Guile")))))))))
-    (built-derivations (list check))))
-
 ;; The following test needs guile-sqlite3, libgcrypt, etc. as a consequence of
 ;; commit c45477d2a1a651485feede20fe0f3d15aec48b39 and related changes.  Thus,
 ;; run it on the user's store, if it's available, on the grounds that these
 ;; dependencies may be already there, or we can get substitutes or build them
 ;; quite inexpensively; see <https://bugs.gnu.org/32184>.
-
 (with-external-store store
+  (unless store (test-skip 1))
+  (test-assertm "self-contained-tarball" store
+    (mlet* %store-monad
+        ((guile   (set-guile-for-build (default-guile)))
+         (profile -> (profile
+                      (content (packages->manifest (list %bootstrap-guile)))
+                      (hooks '())
+                      (locales? #f)))
+         (tarball (self-contained-tarball "pack" profile
+                                          #:symlinks '(("/bin/Guile"
+                                                        -> "bin/guile"))
+                                          #:compressor %gzip-compressor
+                                          #:archiver %tar-bootstrap))
+         (check   (gexp->derivation
+                   "check-tarball"
+                   (with-imported-modules '((guix build utils))
+                     #~(begin
+                         (use-modules (guix build utils)
+                                      (srfi srfi-1))
+
+                         (define store
+                           ;; The unpacked store.
+                           (string-append "." (%store-directory) "/"))
+
+                         (define (canonical? file)
+                           ;; Return #t if FILE is read-only and its mtime is 1.
+                           (let ((st (lstat file)))
+                             (or (not (string-prefix? store file))
+                                 (eq? 'symlink (stat:type st))
+                                 (and (= 1 (stat:mtime st))
+                                      (zero? (logand #o222
+                                                     (stat:mode st)))))))
+
+                         (define bin
+                           (string-append "." #$profile "/bin"))
+
+                         (setenv "PATH"
+                                 (string-append #$%tar-bootstrap "/bin"))
+                         (system* "tar" "xvf" #$tarball)
+                         (mkdir #$output)
+                         (exit
+                          (and (file-exists? (string-append bin "/guile"))
+                               (file-exists? store)
+                               (every canonical?
+                                      (find-files "." (const #t)
+                                                  #:directories? #t))
+                               (string=? (string-append #$%bootstrap-guile "/bin")
+                                         (readlink bin))
+                               (string=? (string-append ".." #$profile
+                                                        "/bin/guile")
+                                         (readlink "bin/Guile")))))))))
+      (built-derivations (list check))))
+
   (unless store (test-skip 1))
   (test-assertm "self-contained-tarball + localstatedir" store
     (mlet* %store-monad
-- 
cgit 1.4.1


From c75022d65f1fa18b8c4839e50f915e8f4d4fe305 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 18 Jul 2023 11:43:45 -0400
Subject: tests: pack: Fix indentation.

* tests/pack.scm: Fix indentation.
---
 tests/pack.scm | 201 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 101 insertions(+), 100 deletions(-)

diff --git a/tests/pack.scm b/tests/pack.scm
index 0864a4b78a..cf249f861b 100644
--- a/tests/pack.scm
+++ b/tests/pack.scm
@@ -239,15 +239,14 @@
                            ((layer)
                             (invoke "tar" "xvf" layer)))
 
-                         (when
-                          (and (file-exists? (string-append bin "/guile"))
-                               (file-exists? "var/guix/db/db.sqlite")
-                               (file-is-directory? "tmp")
-                               (string=? (string-append #$%bootstrap-guile "/bin")
-                                         (pk 'binlink (readlink bin)))
-                               (string=? (string-append #$profile "/bin/guile")
-                                         (pk 'guilelink (readlink "bin/Guile"))))
-                          (mkdir #$output)))))))
+                         (when (and (file-exists? (string-append bin "/guile"))
+                                    (file-exists? "var/guix/db/db.sqlite")
+                                    (file-is-directory? "tmp")
+                                    (string=? (string-append #$%bootstrap-guile "/bin")
+                                              (pk 'binlink (readlink bin)))
+                                    (string=? (string-append #$profile "/bin/guile")
+                                              (pk 'guilelink (readlink "bin/Guile"))))
+                           (mkdir #$output)))))))
       (built-derivations (list check))))
 
   (unless store (test-skip 1))
@@ -310,71 +309,72 @@
                      (plain-file "postinst"
                                  "echo running configure script\n"))))
          (check
-          (gexp->derivation "check-deb-pack"
-            (with-imported-modules '((guix build utils))
-              #~(begin
-                  (use-modules (guix build utils)
-                               (ice-9 match)
-                               (ice-9 popen)
-                               (ice-9 rdelim)
-                               (ice-9 textual-ports)
-                               (rnrs base))
-
-                  (setenv "PATH" (string-join
-                                  (list (string-append #+%tar-bootstrap "/bin")
-                                        (string-append #+dpkg "/bin")
-                                        (string-append #+%ar-bootstrap "/bin"))
-                                  ":"))
-
-                  ;; Validate the output of 'dpkg --info'.
-                  (let* ((port (open-pipe* OPEN_READ "dpkg" "--info" #$deb))
-                         (info (get-string-all port))
-                         (exit-val (status:exit-val (close-pipe port))))
-                    (assert (zero? exit-val))
-
-                    (assert (string-contains
-                             info
-                             (string-append "Package: "
-                                            #+(package-name %bootstrap-guile))))
-
-                    (assert (string-contains
-                             info
-                             (string-append "Version: "
-                                            #+(package-version %bootstrap-guile)))))
-
-                  ;; Sanity check .deb contents.
-                  (invoke "ar" "-xv" #$deb)
-                  (assert (file-exists? "debian-binary"))
-                  (assert (file-exists? "data.tar.gz"))
-                  (assert (file-exists? "control.tar.gz"))
-
-                  ;; Verify there are no hard links in data.tar.gz, as hard
-                  ;; links would cause dpkg to fail unpacking the archive.
-                  (define hard-links
-                    (let ((port (open-pipe* OPEN_READ "tar" "-tvf" "data.tar.gz")))
-                      (let loop ((hard-links '()))
-                        (match (read-line port)
-                          ((? eof-object?)
-                           (assert (zero? (status:exit-val (close-pipe port))))
-                           hard-links)
-                          (line
-                           (if (string-prefix? "u" line)
-                               (loop (cons line hard-links))
-                               (loop hard-links)))))))
-
-                  (unless (null? hard-links)
-                    (error "hard links found in data.tar.gz" hard-links))
-
-                  ;; Verify the presence of the control files.
-                  (invoke "tar" "-xf" "control.tar.gz")
-                  (assert (file-exists? "control"))
-                  (assert (and (file-exists? "postinst")
-                               (= #o111 ;script is executable
-                                  (logand #o111 (stat:perms
-                                                 (stat "postinst"))))))
-                  (assert (file-exists? "triggers"))
-
-                  (mkdir #$output))))))
+          (gexp->derivation
+           "check-deb-pack"
+           (with-imported-modules '((guix build utils))
+             #~(begin
+                 (use-modules (guix build utils)
+                              (ice-9 match)
+                              (ice-9 popen)
+                              (ice-9 rdelim)
+                              (ice-9 textual-ports)
+                              (rnrs base))
+
+                 (setenv "PATH" (string-join
+                                 (list (string-append #+%tar-bootstrap "/bin")
+                                       (string-append #+dpkg "/bin")
+                                       (string-append #+%ar-bootstrap "/bin"))
+                                 ":"))
+
+                 ;; Validate the output of 'dpkg --info'.
+                 (let* ((port (open-pipe* OPEN_READ "dpkg" "--info" #$deb))
+                        (info (get-string-all port))
+                        (exit-val (status:exit-val (close-pipe port))))
+                   (assert (zero? exit-val))
+
+                   (assert (string-contains
+                            info
+                            (string-append "Package: "
+                                           #+(package-name %bootstrap-guile))))
+
+                   (assert (string-contains
+                            info
+                            (string-append "Version: "
+                                           #+(package-version %bootstrap-guile)))))
+
+                 ;; Sanity check .deb contents.
+                 (invoke "ar" "-xv" #$deb)
+                 (assert (file-exists? "debian-binary"))
+                 (assert (file-exists? "data.tar.gz"))
+                 (assert (file-exists? "control.tar.gz"))
+
+                 ;; Verify there are no hard links in data.tar.gz, as hard
+                 ;; links would cause dpkg to fail unpacking the archive.
+                 (define hard-links
+                   (let ((port (open-pipe* OPEN_READ "tar" "-tvf" "data.tar.gz")))
+                     (let loop ((hard-links '()))
+                       (match (read-line port)
+                         ((? eof-object?)
+                          (assert (zero? (status:exit-val (close-pipe port))))
+                          hard-links)
+                         (line
+                          (if (string-prefix? "u" line)
+                              (loop (cons line hard-links))
+                              (loop hard-links)))))))
+
+                 (unless (null? hard-links)
+                   (error "hard links found in data.tar.gz" hard-links))
+
+                 ;; Verify the presence of the control files.
+                 (invoke "tar" "-xf" "control.tar.gz")
+                 (assert (file-exists? "control"))
+                 (assert (and (file-exists? "postinst")
+                              (= #o111  ;script is executable
+                                 (logand #o111 (stat:perms
+                                                (stat "postinst"))))))
+                 (assert (file-exists? "triggers"))
+
+                 (mkdir #$output))))))
       (built-derivations (list check))))
 
   (unless store (test-skip 1))
@@ -390,32 +390,33 @@
                                 #:symlinks '(("/bin/guile" -> "bin/guile"))
                                 #:extra-options '(#:relocatable? #t)))
          (check
-          (gexp->derivation "check-rpm-pack"
-            (with-imported-modules (source-module-closure
-                                    '((guix build utils)))
-              #~(begin
-                  (use-modules (guix build utils))
-
-                  (define fakeroot #+(file-append fakeroot "/bin/fakeroot"))
-                  (define rpm #+(file-append rpm-for-tests "/bin/rpm"))
-                  (mkdir-p "/tmp/lib/rpm")
-
-                  ;; Install the RPM package.  This causes RPM to validate the
-                  ;; signatures, header as well as the file digests, which
-                  ;; makes it a rather thorough test.
-                  (mkdir "test-prefix")
-                  (invoke fakeroot rpm "--install"
-                          (string-append "--prefix=" (getcwd) "/test-prefix")
-                          #$rpm-pack)
-
-                  ;; Invoke the installed Guile command.
-                  (invoke "./test-prefix/bin/guile" "--version")
-
-                  ;; Uninstall the RPM package.
-                  (invoke fakeroot rpm "--erase" "guile-bootstrap")
-
-                  ;; Required so the above is run.
-                  (mkdir #$output))))))
+          (gexp->derivation
+           "check-rpm-pack"
+           (with-imported-modules (source-module-closure
+                                   '((guix build utils)))
+             #~(begin
+                 (use-modules (guix build utils))
+
+                 (define fakeroot #+(file-append fakeroot "/bin/fakeroot"))
+                 (define rpm #+(file-append rpm-for-tests "/bin/rpm"))
+                 (mkdir-p "/tmp/lib/rpm")
+
+                 ;; Install the RPM package.  This causes RPM to validate the
+                 ;; signatures, header as well as the file digests, which
+                 ;; makes it a rather thorough test.
+                 (mkdir "test-prefix")
+                 (invoke fakeroot rpm "--install"
+                         (string-append "--prefix=" (getcwd) "/test-prefix")
+                         #$rpm-pack)
+
+                 ;; Invoke the installed Guile command.
+                 (invoke "./test-prefix/bin/guile" "--version")
+
+                 ;; Uninstall the RPM package.
+                 (invoke fakeroot rpm "--erase" "guile-bootstrap")
+
+                 ;; Required so the above is run.
+                 (mkdir #$output))))))
       (built-derivations (list check)))))
 
 (test-end)
-- 
cgit 1.4.1


From d9a851433ad3e44a937cc98e200f6a17d5bd9063 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: hw-probe: Fix build.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/hardware.scm (hw-probe)[arguments]:
‘lspci’ has moved to /bin.
---
 gnu/packages/hardware.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 8a16c1766d..cf39a97d58 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -250,7 +250,7 @@ sets, and tools to deal with register databases.")
               ;; their references.
               ;; TODO: package edid-decode and add "bin/edid-decode" below:
               (define need-progs (list "sbin/dmidecode" "sbin/smartctl"
-                                       "sbin/lspci" "bin/lsusb"))
+                                       "bin/lspci" "bin/lsusb"))
               (wrap-script hw-probe
                 (list "PERL5LIB" 'prefix (list (getenv "PERL5LIB")))
                 (list "PATH" 'prefix
-- 
cgit 1.4.1


From 91344faa93c15eaecabd80e14f5ab85e35245a2f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: xtensor: Update to 0.24.6.

* gnu/packages/algebra.scm (xtensor): Update to 0.24.6.
---
 gnu/packages/algebra.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 83eb63e206..a717750c7b 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -1189,7 +1189,7 @@ features, and more.")
 (define-public xtensor
   (package
     (name "xtensor")
-    (version "0.24.0")
+    (version "0.24.6")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1197,7 +1197,7 @@ features, and more.")
                     (commit version)))
               (sha256
                (base32
-                "14fpzwdq26p2fqdrmc78hny9pp09k9c53jnwlh7f8x54ikzm23c2"))
+                "0gf5m5p61981pv7yh5425lcv8dci948ri37hn1zlli7xg54x0g3i"))
               (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (native-inputs
-- 
cgit 1.4.1


From f8fcd6e533ec50a0c3e1cb86a26c7b3109305f00 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:00 +0200
Subject: gnu: evince: Parameterise source URI.

* gnu/packages/gnome.scm (evince)[source]: Use VERSION.
---
 gnu/packages/gnome.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4f5734dc0a..f2654c3f4e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2611,12 +2611,14 @@ forgotten when the session ends.")
   (package
     (name "evince")
     (version "44.1")
-    (source (origin
-              (method url-fetch)
-              (uri "mirror://gnome/sources/evince/44/evince-44.1.tar.xz")
-              (sha256
-               (base32
-                "0523lzk7xpfr6gir8nx80fmp1lhajm837hilmgn8zczz2nxx7bqm"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnome/sources/evince/"
+                           (version-major version) "/"
+                           "evince-" version ".tar.xz"))
+       (sha256
+        (base32 "0523lzk7xpfr6gir8nx80fmp1lhajm837hilmgn8zczz2nxx7bqm"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t
-- 
cgit 1.4.1


From e74ccdc483bbebe8dc9328b2f4598c99acd0beb5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: evince: Update to 44.3.

* gnu/packages/gnome.scm (evince): Update to 44.3.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f2654c3f4e..8708764416 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2610,7 +2610,7 @@ forgotten when the session ends.")
 (define-public evince
   (package
     (name "evince")
-    (version "44.1")
+    (version "44.3")
     (source
      (origin
        (method url-fetch)
@@ -2618,7 +2618,7 @@ forgotten when the session ends.")
                            (version-major version) "/"
                            "evince-" version ".tar.xz"))
        (sha256
-        (base32 "0523lzk7xpfr6gir8nx80fmp1lhajm837hilmgn8zczz2nxx7bqm"))))
+        (base32 "08inp13kksa027ij9ai10734jxdn1y7s0skbgzsyk9j739ca32rv"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t
-- 
cgit 1.4.1


From bc5e71229dc611c86d5e8a53d5db024473484344 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: whois: Update to 5.5.17.

* gnu/packages/networking.scm (whois): Update to 5.5.17.
[arguments]: Add BASHCOMPDIR to #:configure-flags.
Don't explicitly return #t from phases.
---
 gnu/packages/networking.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 3ddf9e7a27..a1187c4803 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1710,7 +1710,7 @@ and up to 1 Mbit/s downstream.")
 (define-public whois
   (package
     (name "whois")
-    (version "5.5.11")
+    (version "5.5.17")
     (source
      (origin
        (method git-fetch)
@@ -1719,20 +1719,21 @@ and up to 1 Mbit/s downstream.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0wys0aixzq6mzvg7p6jb0d5rkkg23pjcgcsx86p7hjidxdvnbwzr"))))
+        (base32 "1mqgc8saz4l0hr4p8r9cgndwx3r9aal7ak9irgrrkxyjd65xpa9n"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no test suite
-       #:make-flags (list (string-append "CC=" ,(cc-for-target))
-                          (string-append "PKG_CONFIG=" ,(pkg-config-for-target))
-                          (string-append "prefix=" (assoc-ref %outputs "out")))
+       #:make-flags
+       (list (string-append "CC=" ,(cc-for-target))
+             (string-append "PKG_CONFIG=" ,(pkg-config-for-target))
+             (string-append "prefix=" (assoc-ref %outputs "out"))
+             "BASHCOMPDIR=$(prefix)/share/bash-completion/completions")
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)            ; no configure script
          (add-before 'build 'setenv
            (lambda _
-             (setenv "HAVE_ICONV" "1")
-             #t)))))
+             (setenv "HAVE_ICONV" "1"))))))
     (inputs
      (list libidn2))
     (native-inputs
-- 
cgit 1.4.1


From c212bdf64f323ebc4148b55983e8e398a3c6f171 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: whois: Remove input labels.

* gnu/packages/networking.scm (whois)[native-inputs]:
Remove input labels.
---
 gnu/packages/networking.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index a1187c4803..752d706797 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1737,9 +1737,9 @@ and up to 1 Mbit/s downstream.")
     (inputs
      (list libidn2))
     (native-inputs
-     `(("gettext" ,gettext-minimal)
-       ("perl" ,perl)
-       ("pkg-config" ,pkg-config)))
+     (list gettext-minimal
+           perl
+           pkg-config))
     (synopsis "Intelligent client for the WHOIS directory service")
     (description
       "whois searches for an object in a @dfn{WHOIS} (RFC 3912) database.
-- 
cgit 1.4.1


From 7595a07da5583bb33e7fb1290620d045929110c4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: whois: Use G-expressions.

* gnu/packages/networking.scm (whois)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/networking.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 752d706797..93eb8cae85 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1722,18 +1722,19 @@ and up to 1 Mbit/s downstream.")
         (base32 "1mqgc8saz4l0hr4p8r9cgndwx3r9aal7ak9irgrrkxyjd65xpa9n"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f                      ; no test suite
-       #:make-flags
-       (list (string-append "CC=" ,(cc-for-target))
-             (string-append "PKG_CONFIG=" ,(pkg-config-for-target))
-             (string-append "prefix=" (assoc-ref %outputs "out"))
-             "BASHCOMPDIR=$(prefix)/share/bash-completion/completions")
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)            ; no configure script
-         (add-before 'build 'setenv
-           (lambda _
-             (setenv "HAVE_ICONV" "1"))))))
+     (list
+      #:tests? #f                       ; no test suite
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              (string-append "PKG_CONFIG=" #$(pkg-config-for-target))
+              (string-append "prefix=" #$output)
+              "BASHCOMPDIR=$(prefix)/share/bash-completion/completions")
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure)           ; no configure script
+          (add-before 'build 'setenv
+            (lambda _
+              (setenv "HAVE_ICONV" "1"))))))
     (inputs
      (list libidn2))
     (native-inputs
-- 
cgit 1.4.1


From 2565a159fe7e62428b62801e68b943418d8d4e98 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:03 +0200
Subject: gnu: ntp: Update to 4.2.8p17.

* gnu/packages/ntp.scm (ntp): Update to 4.2.8p17.
[arguments]: Don't explicitly return #t from phases.
[source]: Remove obsolete patches.
---
 gnu/packages/ntp.scm | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm
index 607799f348..43a8b6b045 100644
--- a/gnu/packages/ntp.scm
+++ b/gnu/packages/ntp.scm
@@ -106,7 +106,7 @@ time-stamping or reference clock, sub-microsecond accuracy is possible.")
 (define-public ntp
   (package
    (name "ntp")
-   (version "4.2.8p15")
+   (version "4.2.8p17")
    (source
      (origin
        (method url-fetch)
@@ -119,27 +119,7 @@ time-stamping or reference clock, sub-microsecond accuracy is possible.")
                    (version-major+minor version)
                    "/ntp-" version ".tar.gz")))
        (sha256
-        (base32 "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n"))
-       ;; Add an upstream patch to fix build with GCC 10.  Taken from
-       ;; <https://bugs.ntp.org/show_bug.cgi?id=3688>.
-       (patches (list (origin
-                        (method url-fetch)
-                        (uri "https://bugs.ntp.org/attachment.cgi?id=1760\
-&action=diff&context=patch&collapsed=&headers=1&format=raw")
-                        (file-name "ntp-gcc-compat.patch")
-                        (sha256
-                         (base32
-                          "13d28sg45rflc7kqiv30asrhna8n69wlpwx16l65rravgpvp90h2")))
-                      ;; And another one that fixes the build with glibc 2.34:
-                      ;; <https://bugs.ntp.org/show_bug.cgi?id=3741>.
-                      (origin
-                        (method url-fetch)
-                        (uri "https://bugs.ntp.org/attachment.cgi?id=1814\
-&action=diff&collapsed=&headers=1&format=raw")
-                        (file-name "ntp-glibc-compat.patch")
-                        (sha256
-                         (base32
-                          "0z8ndaw3l086mbm42v9gfgxild1yvg0anxf3724lsalvgqlndcj4")))))
+        (base32 "0rm8sf4qwcip49wgpgcp2dpwspsm0ad5xkkxy26mnv56wrrd4g8h"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -151,8 +131,7 @@ time-stamping or reference clock, sub-microsecond accuracy is possible.")
            (delete-file-recursively "sntp/libevent")
            (mkdir "sntp/libevent")
            (rename-file "sntp/libevent:build-aux"
-                        "sntp/libevent/build-aux")
-           #t))))
+                        "sntp/libevent/build-aux")))))
    (native-inputs (list which pkg-config))
    (inputs
     `(("openssl" ,openssl-1.1)
@@ -172,8 +151,7 @@ time-stamping or reference clock, sub-microsecond accuracy is possible.")
         (add-after 'unpack 'disable-network-test
                    (lambda _
                      (substitute* "tests/libntp/Makefile.in"
-                       (("test-decodenetnum\\$\\(EXEEXT\\) ") ""))
-                     #t)))))
+                       (("test-decodenetnum\\$\\(EXEEXT\\) ") "")))))))
    (build-system gnu-build-system)
    (synopsis "Real time clock synchronization system")
    (description "NTP is a system designed to synchronize the clocks of
-- 
cgit 1.4.1


From 9a84da4418ac7658c5a22aee92aac63b44806145 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:05 +0200
Subject: gnu: ntp: Remove input labels.

* gnu/packages/ntp.scm (ntp)[inputs]:
Remove input labels.
---
 gnu/packages/ntp.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm
index 43a8b6b045..f12bfd469b 100644
--- a/gnu/packages/ntp.scm
+++ b/gnu/packages/ntp.scm
@@ -134,14 +134,14 @@ time-stamping or reference clock, sub-microsecond accuracy is possible.")
                         "sntp/libevent/build-aux")))))
    (native-inputs (list which pkg-config))
    (inputs
-    `(("openssl" ,openssl-1.1)
-      ("libevent" ,libevent)
-      ;; Build with POSIX capabilities support on GNU/Linux.  This allows 'ntpd'
-      ;; to run as non-root (when invoked with '-u'.)
-      ,@(if (string-suffix? "-linux"
-                            (or (%current-target-system) (%current-system)))
-            `(("libcap" ,libcap))
-            '())))
+    (cons* openssl-1.1
+           libevent
+           ;; Build with POSIX capabilities support on GNU/Linux.  This allows
+           ;; 'ntpd' to run as non-root (when invoked with '-u'.)
+           (if (string-suffix? "-linux"
+                               (or (%current-target-system) (%current-system)))
+               (list libcap)
+               '())))
    (arguments
     `(;; Pass "--with-yielding-select=yes" so that 'configure' knows whether
       ;; 'select' yields when using pthreads in a cross-compilation context.
-- 
cgit 1.4.1


From 75184011c7dec0ec217d7cde9592b12488e77578 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: ntp: Use G-expressions.

* gnu/packages/ntp.scm (ntp)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/ntp.scm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm
index f12bfd469b..1a72efbc79 100644
--- a/gnu/packages/ntp.scm
+++ b/gnu/packages/ntp.scm
@@ -37,6 +37,7 @@
   #:use-module (gnu packages tls)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix packages)
@@ -143,15 +144,17 @@ time-stamping or reference clock, sub-microsecond accuracy is possible.")
                (list libcap)
                '())))
    (arguments
-    `(;; Pass "--with-yielding-select=yes" so that 'configure' knows whether
-      ;; 'select' yields when using pthreads in a cross-compilation context.
-      #:configure-flags (list "--with-yielding-select=yes")
-      #:phases
-      (modify-phases %standard-phases
-        (add-after 'unpack 'disable-network-test
-                   (lambda _
-                     (substitute* "tests/libntp/Makefile.in"
-                       (("test-decodenetnum\\$\\(EXEEXT\\) ") "")))))))
+    (list
+     ;; Pass "--with-yielding-select=yes" so that 'configure' knows whether
+     ;; 'select' yields when using pthreads in a cross-compilation context.
+     #:configure-flags
+     #~(list "--with-yielding-select=yes")
+     #:phases
+     #~(modify-phases %standard-phases
+         (add-after 'unpack 'disable-network-test
+           (lambda _
+             (substitute* "tests/libntp/Makefile.in"
+               (("test-decodenetnum\\$\\(EXEEXT\\) ") "")))))))
    (build-system gnu-build-system)
    (synopsis "Real time clock synchronization system")
    (description "NTP is a system designed to synchronize the clocks of
-- 
cgit 1.4.1


From 8cd281f87871bb2c7f87ea36969d9a2607885e76 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:03 +0200
Subject: gnu: iperf: Update to 3.14.

* gnu/packages/networking.scm (iperf): Update to 3.14.
---
 gnu/packages/networking.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 93eb8cae85..9db8c8dabd 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -2681,7 +2681,7 @@ that block port 22.")
 (define-public iperf
   (package
     (name "iperf")
-    (version "3.13")
+    (version "3.14")
     (source
      (origin
        (method git-fetch)
@@ -2690,7 +2690,7 @@ that block port 22.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "19i0lkr2i4iyy9hr5iwxnhb8pmjrqsbwbnzky6agy9yzgzrggfjv"))))
+        (base32 "0xy7q508yrraa8q3bxdsc2fwacc6qm7l6p44a07jp7ki8bwdcs8z"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit 1.4.1


From 7fcd97b77979a5083ed64e6fad137c1ad5716e4d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:04 +0200
Subject: gnu: spiped: Update to 1.6.2.

* gnu/packages/networking.scm (spiped): Update to 1.6.2.
[arguments]: Don't explicitly return #t from phases.
---
 gnu/packages/networking.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 9db8c8dabd..b885e73dcd 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -2975,14 +2975,14 @@ enabled due to license conflicts between the BSD advertising clause and the GPL.
 (define-public spiped
   (package
     (name "spiped")
-    (version "1.6.1")
+    (version "1.6.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.tarsnap.com/spiped/spiped-"
                                   version ".tgz"))
               (sha256
                (base32
-                "04rpnc53whfky7pp2m9h35gwzwn6788pnl6c1qd576mpknbqjw4d"))))
+                "0rs5403bp48wyy2x0f3hk0f75ds1qn03sgyli2c7y7fi29ynim05"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
@@ -3000,15 +3000,13 @@ enabled due to license conflicts between the BSD advertising clause and the GPL.
                             "libcperciva/cpusupport/Build/cpusupport.sh"
                             "libcperciva/POSIX/posix-cflags.sh"
                             "libcperciva/POSIX/posix-l.sh")
-               (("command -p") ""))
-             #t))
+               (("command -p") ""))))
          (delete 'configure) ; No ./configure script.
          (add-after 'install 'install-more-docs
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref %outputs "out"))
                     (misc (string-append out "/share/doc/spiped")))
-               (install-file "DESIGN.md" misc)
-               #t))))))
+               (install-file "DESIGN.md" misc)))))))
     (native-inputs
      (list procps)) ; `ps` is used by the test suite.
     (inputs
-- 
cgit 1.4.1


From a18d57d1f8ae6a39941a84998bddaf361053aa07 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:03 +0200
Subject: gnu: spiped: Use G-expressions.

* gnu/packages/networking.scm (spiped)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/networking.scm | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index b885e73dcd..a490fafb5c 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -2985,30 +2985,28 @@ enabled due to license conflicts between the BSD advertising clause and the GPL.
                 "0rs5403bp48wyy2x0f3hk0f75ds1qn03sgyli2c7y7fi29ynim05"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:test-target "test"
-       #:make-flags (let* ((out (assoc-ref %outputs "out"))
-                           (bindir (string-append out "/bin"))
-                           (man1dir (string-append out "/share/man/man1")))
-                      (list ,(string-append "CC=" (cc-for-target)) ; It tries to invoke `c99`.
-                            (string-append "BINDIR=" bindir)
-                            (string-append "MAN1DIR=" man1dir)))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-command-invocations
-           (lambda _
-             (substitute* '("Makefile"
-                            "libcperciva/cpusupport/Build/cpusupport.sh"
-                            "libcperciva/POSIX/posix-cflags.sh"
-                            "libcperciva/POSIX/posix-l.sh")
-               (("command -p") ""))))
-         (delete 'configure) ; No ./configure script.
-         (add-after 'install 'install-more-docs
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref %outputs "out"))
-                    (misc (string-append out "/share/doc/spiped")))
-               (install-file "DESIGN.md" misc)))))))
+     (list
+      #:test-target "test"
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              (string-append "BINDIR=" #$output "/bin")
+              (string-append "MAN1DIR=" #$output "/share/man/man1"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-command-invocations
+            (lambda _
+              (substitute* '("Makefile"
+                             "libcperciva/cpusupport/Build/cpusupport.sh"
+                             "libcperciva/POSIX/posix-cflags.sh"
+                             "libcperciva/POSIX/posix-l.sh")
+                (("command -p") ""))))
+          (delete 'configure)           ; no ./configure script
+          (add-after 'install 'install-more-docs
+            (lambda _
+              (install-file "DESIGN.md"
+                            (string-append #$output "/share/doc/spiped")))))))
     (native-inputs
-     (list procps)) ; `ps` is used by the test suite.
+     (list procps))                     ; `ps` is used by the test suite
     (inputs
      (list openssl))
     (home-page "https://www.tarsnap.com/spiped.html")
-- 
cgit 1.4.1


From 708f62bc1c7e0a51e08e11097addfd90b5a039ad Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: traceroute: Update to 2.1.2.

* gnu/packages/networking.scm (traceroute): Update to 2.1.2.
---
 gnu/packages/networking.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index a490fafb5c..02e85da524 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4199,7 +4199,7 @@ network.  This must be enabled on the target host, usually in the BIOS.")
 (define-public traceroute
   (package
     (name "traceroute")
-    (version "2.1.0")
+    (version "2.1.2")
     (source
      (origin
        (method url-fetch)
@@ -4207,7 +4207,7 @@ network.  This must be enabled on the target host, usually in the BIOS.")
                            "traceroute-" version "/traceroute-"
                            version ".tar.gz"))
        (sha256
-        (base32 "1dh32vcfawkl1p9g4ral1p0camds4paqr8db1kaqxwyk6hmd4s9n"))))
+        (base32 "07svkglyizxirgcmv6d4ih59f3ds8pnyprvkrqcf5d3p567jcz2h"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ;no test suite
-- 
cgit 1.4.1


From 818e9ad283c42e5ec41f61ac87feee99a657b8e8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: traceroute: Use G-expressions.

* gnu/packages/networking.scm (traceroute)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/networking.scm | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 02e85da524..3943aed75f 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4210,23 +4210,25 @@ network.  This must be enabled on the target host, usually in the BIOS.")
         (base32 "07svkglyizxirgcmv6d4ih59f3ds8pnyprvkrqcf5d3p567jcz2h"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f                      ;no test suite
-       #:make-flags
-       (list (string-append "LIBRARY_PATH="
-                            (assoc-ref %build-inputs "libc") "/lib")
-             (string-append "CFLAGS=-I"
-                            (assoc-ref %build-inputs "kernel-headers")
-                            "/include")
-             "LDFLAGS=-lm -L../libsupp"
-             (string-append "prefix=" (assoc-ref %outputs "out")))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-make
-           (lambda _
-             (substitute* "default.rules"
-               ((" \\$\\(LIBDEPS\\)") "$(filter-out -l%,$(LIBDEPS))"))))
-         (delete 'bootstrap)            ;no configure.ac file
-         (delete 'configure))))         ;no configure script
+     (list
+      #:tests? #f                       ; no test suite
+      #:make-flags
+      #~(list (string-append "LIBRARY_PATH="
+                             (assoc-ref %build-inputs "libc") "/lib")
+              (string-append "CFLAGS=-I"
+                             (assoc-ref %build-inputs "kernel-headers")
+                             "/include")
+              "LDFLAGS=-lm -L../libsupp"
+              (string-append "prefix=" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-make
+            (lambda _
+              (substitute* "default.rules"
+                ((" \\$\\(LIBDEPS\\)")
+                 "$(filter-out -l%,$(LIBDEPS))"))))
+          (delete 'bootstrap)           ; no configure.ac file
+          (delete 'configure))))        ; no configure script
     (home-page "https://traceroute.sourceforge.net/")
     (synopsis "Tracks the route taken by packets over an IP network")
     (description "This package provides a modern, but Linux-specific
-- 
cgit 1.4.1


From 3a806e92dcedb78a7106aebbfaf90e8be435a199 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: wireshark: Update to 4.0.7.

* gnu/packages/networking.scm (wireshark): Update to 4.0.7.
---
 gnu/packages/networking.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 3943aed75f..18d5c26ce0 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1757,14 +1757,14 @@ of the same name.")
 (define-public wireshark
   (package
     (name "wireshark")
-    (version "4.0.5")
+    (version "4.0.7")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.wireshark.org/download/src/wireshark-"
                            version ".tar.xz"))
        (sha256
-        (base32 "0abb36n3li5w22f435k31mvk0sy0f41sxz4fqrl4ksjzjd377dki"))))
+        (base32 "0xw7iagh37y02qgzgmb2xf1qagbphv5lpgra8lq3x0pzrc27p7x7"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
cgit 1.4.1


From c1bdfed1f9b0d2e588eaf60a6fcd99aeb4f702b9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: gcab: Update to 1.6.

* gnu/packages/package-management.scm (gcab): Update to 1.6.
---
 gnu/packages/package-management.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 9312d34242..6e61377a6e 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1772,14 +1772,14 @@ and the error handling is very rough.")
 (define-public gcab
   (package
     (name "gcab")
-    (version "1.4")
+    (version "1.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/gcab/"
                                   version "/gcab-" version ".tar.xz"))
               (sha256
                (base32
-                "13q43iqld4l50yra45lhvkd376pn6qpk7rkx374zn8y9wsdzm9b7"))))
+                "02sngv40zwadajsiav1paahyfgkccbh9s7r5ks82chbwawarc31g"))))
     (build-system meson-build-system)
     (native-inputs
      `(("glib:bin" ,glib "bin")         ; for glib-mkenums
-- 
cgit 1.4.1


From e9f8f2a706e75d0e002b08f795f381aad65e0105 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: gcab: Remove input labels.

* gnu/packages/package-management.scm (gcab)[native-inputs]:
Remove input labels.
---
 gnu/packages/package-management.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 6e61377a6e..c6273efbd0 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1782,10 +1782,10 @@ and the error handling is very rough.")
                 "02sngv40zwadajsiav1paahyfgkccbh9s7r5ks82chbwawarc31g"))))
     (build-system meson-build-system)
     (native-inputs
-     `(("glib:bin" ,glib "bin")         ; for glib-mkenums
-       ("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)
-       ("vala" ,vala)))
+     (list `(,glib "bin")               ; for glib-mkenums
+           intltool
+           pkg-config
+           vala))
     (inputs
      (list glib zlib))
     (arguments
-- 
cgit 1.4.1


From 03f618d63ff717626298c3c629896818640794b6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: liblxi: Update to 1.20.

* gnu/packages/hardware.scm (liblxi): Update to 1.20.
---
 gnu/packages/hardware.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index cf39a97d58..eb63e4f9d2 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -1399,7 +1399,7 @@ confused with the @code{cpuid} command line utility from package @code{cpuid}.")
 (define-public liblxi
   (package
     (name "liblxi")
-    (version "1.18")
+    (version "1.20")
     (source
      (origin
        (method git-fetch)
@@ -1408,8 +1408,7 @@ confused with the @code{cpuid} command line utility from package @code{cpuid}.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0cbnnd5qmchlr586349j5y4qv5w3bw9nmpbd3k6sq9vwvqh5dmns"))))
+        (base32 "1cc95ggs64jqq9lk5c8fm4nk6fdnv1x7lr3k4znamj0vv6w22bcd"))))
     (build-system meson-build-system)
     (native-inputs
      (list cmake pkg-config))
-- 
cgit 1.4.1


From 5f520cc7569fb8bf0e6d5ec69be254eb79b82360 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:00 +0200
Subject: gnu: liblxi: Edit description.

* gnu/packages/hardware.scm (liblxi)[synopsis]: Use @acronym{}.
[description]: Likewise.  Expand.
---
 gnu/packages/hardware.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index eb63e4f9d2..339a3bf345 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -1415,11 +1415,13 @@ confused with the @code{cpuid} command line utility from package @code{cpuid}.")
     (inputs
      (list avahi libtirpc libxml2))
     (home-page "https://lxi-tools.github.io/")
-    (synopsis "LAN eXtensions for Instrumentation library")
+    (synopsis "@acronym{LXI, LAN eXtensions for Instrumentation} library")
     (description
-     "This package provides library for LAN eXtensions for Instrumentation
-based on the LXI Consortium standard which defines the communication protocols
-for modern instrumentation and data acquision systems using Ethernet.")
+     "This library offers a simple API for communicating with instruments
+compatible with the @acronym{LXI, LAN eXtensions for Instrumentation} standard
+that defines communication protocols for instrumentation and data acquisition
+systems using Ethernet.  Applications can use liblxi to discover instruments on
+your network, send SCPI commands, and receive responses.")
     (license license:bsd-3)))
 
 (define-public lxi-tools
-- 
cgit 1.4.1


From 514d68b48fe2ebe96754b97e26951fd93ae1e656 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:13 +0200
Subject: gnu: spread-sheet-widget: Update to 0.8.

* gnu/packages/gtk.scm (spread-sheet-widget): Update to 0.8.
---
 gnu/packages/gtk.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 9621357b99..5916742022 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -2388,17 +2388,17 @@ does not deal with windowing system surfaces, drawing, scene graphs, or input.")
 (define-public spread-sheet-widget
   (package
     (name "spread-sheet-widget")
-    (version "0.7")
+    (version "0.8")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://alpha.gnu.org/gnu/ssw/"
                            "spread-sheet-widget-" version ".tar.gz"))
        (sha256
-        (base32 "09rzgp7gabnzab460x874a1ibgyjiibpwzsz5srn9zs6jv2jdxjb"))))
+        (base32 "0jwmx5i02jwmkp6gci2mapqglh2g3a0092wns185hfygiwlxi2c5"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list `(,glib "bin") ; for glib-genmarshal, etc.
+     (list `(,glib "bin")               ; for glib-genmarshal, etc.
            pkg-config))
     ;; In 'Requires' of spread-sheet-widget.pc.
     (propagated-inputs
-- 
cgit 1.4.1


From d40b71069f304bd5cc685ce89b24532317733687 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: spread-sheet-widget: Omit static library.

* gnu/packages/gtk.scm (spread-sheet-widget)[arguments]:
Add "--disable-static" to #:configure-flags.
---
 gnu/packages/gtk.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 5916742022..8e9a9dc8b2 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -2397,6 +2397,9 @@ does not deal with windowing system surfaces, drawing, scene graphs, or input.")
        (sha256
         (base32 "0jwmx5i02jwmkp6gci2mapqglh2g3a0092wns185hfygiwlxi2c5"))))
     (build-system gnu-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "--disable-static")))
     (native-inputs
      (list `(,glib "bin")               ; for glib-genmarshal, etc.
            pkg-config))
-- 
cgit 1.4.1


From 2349eb62e2dc10ad33d084ca635a648c1e840f17 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: hwinfo: Update to 23.1.

* gnu/packages/hardware.scm (hwinfo): Update to 23.1.
---
 gnu/packages/hardware.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 339a3bf345..cf2eb46ffb 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -331,7 +331,7 @@ operability and find drivers.")
 (define-public hwinfo
   (package
     (name "hwinfo")
-    (version "22.2")
+    (version "23.1")
     (home-page "https://github.com/openSUSE/hwinfo")
     (source
      (origin
@@ -342,7 +342,7 @@ operability and find drivers.")
          (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1lfzcyiipxwi8rh0aw5sy7n8x986b9f9pa9g048rxn6k7anfpxk7"))
+        (base32 "1sdkkwbl1psqnh6135bmsa3ijrckk1nfz95xqckmd8awmx074ikz"))
        (modules
         '((guix build utils)))
        (snippet
-- 
cgit 1.4.1


From f93605b32b2e356422cde043ea0f0ec3f7ac229d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: hwinfo: Use G-expressions.

* gnu/packages/hardware.scm (hwinfo)[source, arguments]:
Rewrite as G-expressions.
---
 gnu/packages/hardware.scm | 134 ++++++++++++++++++++++------------------------
 1 file changed, 65 insertions(+), 69 deletions(-)

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index cf2eb46ffb..9445dd82d6 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -346,78 +346,74 @@ operability and find drivers.")
        (modules
         '((guix build utils)))
        (snippet
-        `(begin
-           ;; Remove git2log program file.
-           (delete-file "git2log")
-           ;; Remove variables that depend on git2log.
-           (substitute* "Makefile"
-             (("GIT2LOG.*\\:=.*$") "")
-             (("GITDEPS.*\\:=.*$") "")
-             (("BRANCH.*\\:=.*$") ""))
-           ;; Create version file.
-           (call-with-output-file "VERSION"
-             (lambda (port)
-               (format port ,version)))))))
+        #~(begin
+            ;; Remove git2log program file.
+            (delete-file "git2log")
+            ;; Remove variables that depend on git2log.
+            (substitute* "Makefile"
+              (("GIT2LOG.*\\:=.*$") "")
+              (("GITDEPS.*\\:=.*$") "")
+              (("BRANCH.*\\:=.*$") ""))
+            ;; Create version file.
+            (call-with-output-file "VERSION"
+              (lambda (port) (format port #$version)))))))
     (build-system gnu-build-system)
     (outputs '("out" "lib" "doc"))
     (arguments
-     `(#:tests? #f                      ; no test-suite available
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (lib (assoc-ref outputs "lib"))
-                    (doc (assoc-ref outputs "doc"))
-                    (incl-dir (string-append lib "/include"))
-                    (lib-dir (string-append lib "/lib"))
-                    (sbin-dir (string-append out "/sbin"))
-                    (share-dir (string-append out "/share"))
-                    (doc-dir (string-append doc "/share/doc")))
-               ;; Generate HTML documentation in the output "doc".
-               (mkdir-p doc-dir)
-               (substitute* "doc/libhd.doxy"
-                 (("OUTPUT_DIRECTORY.*=.*libhd")
-                  (string-append "OUTPUT_DIRECTORY = " doc-dir "/libhd")))
-               ;; Correct values of the version and install directories.
-               (substitute* "Makefile"
-                 (("VERSION.*\\:=.*$")
-                  (string-append "VERSION := " ,version "\n"))
-                 (("LIBDIR.*\\?=.*$")
-                  (string-append "LIBDIR ?= " lib-dir "\n"))
-                 (("/usr/include") incl-dir)
-                 (("/(usr|var)/(lib|lib64)") lib-dir)
-                 (("/usr/sbin") sbin-dir)
-                 (("/usr/share") share-dir)
-                 (("\\$\\(DESTDIR\\)/sbin ") ""))
-               ;; Add the "lib" output to the run-path.
-               (substitute* "Makefile.common"
-                 (("-Lsrc")
-                  (string-append "-Lsrc " "-Wl,-rpath=" lib-dir)))
-               ;; Correct program name of the lexical analyzer.
-               (substitute* "src/isdn/cdb/Makefile"
-                 (("lex isdn_cdb.lex") "flex isdn_cdb.lex"))
-               ;; Patch pkg-config file to point to the "lib" output.
-               (substitute* "hwinfo.pc.in"
-                 (("/usr") lib)))))
-         (delete 'configure)
-         (replace 'build
-           (lambda _
-             (setenv "CC" ,(cc-for-target))
-             (invoke "make" "shared")
-             (invoke "make" "doc")))
-         (add-after 'install 'install-manpages
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (man-dir (string-append out "/share/man"))
-                    (man1-dir (string-append man-dir "/man1"))
-                    (man8-dir (string-append man-dir "/man8")))
-               (for-each
-                (lambda (x) (install-file x man1-dir))
-                (find-files "doc" "\\.1$"))
-               (for-each
-                (lambda (y) (install-file y man8-dir))
-                (find-files "doc" "\\.8$"))))))))
+     (list
+      #:tests? #f                       ; no test-suite available
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda _
+              (let ((include (string-append #$output:lib "/include"))
+                    (lib (string-append #$output:lib "/lib"))
+                    (sbin (string-append #$output "/sbin"))
+                    (share (string-append #$output "/share"))
+                    (doc (string-append #$output:doc "/share/doc")))
+                ;; Generate HTML documentation in the "doc" output.
+                (mkdir-p doc)
+                (substitute* "doc/libhd.doxy"
+                  (("OUTPUT_DIRECTORY.*=.*libhd")
+                   (string-append "OUTPUT_DIRECTORY = " doc "/libhd")))
+                ;; Correct values of the version and install directories.
+                (substitute* "Makefile"
+                  (("VERSION.*\\:=.*$")
+                   (string-append "VERSION := " #$version "\n"))
+                  (("LIBDIR.*\\?=.*$")
+                   (string-append "LIBDIR ?= " lib "\n"))
+                  (("/usr/include") include)
+                  (("/(usr|var)/(lib|lib64)") lib)
+                  (("/usr/sbin") sbin)
+                  (("/usr/share") share)
+                  (("\\$\\(DESTDIR\\)/sbin ") ""))
+                ;; Add the "lib" output to the run-path.
+                (substitute* "Makefile.common"
+                  (("-Lsrc")
+                   (string-append "-Lsrc " "-Wl,-rpath=" lib)))
+                ;; Correct program name of the lexical analyzer.
+                (substitute* "src/isdn/cdb/Makefile"
+                  (("lex isdn_cdb.lex") "flex isdn_cdb.lex"))
+                ;; Patch pkg-config file to point to the "lib" output.
+                (substitute* "hwinfo.pc.in"
+                  (("/usr") #$output:lib)))))
+          (delete 'configure)
+          (replace 'build
+            (lambda* (#:key make-flags #:allow-other-keys)
+              (setenv "CC" #$(cc-for-target))
+              (invoke "make" "shared")
+              (invoke "make" "doc")))
+          (add-after 'install 'install-man-pages
+            (lambda _
+              (let* ((man (string-append #$output "/share/man"))
+                     (man1 (string-append man "/man1"))
+                     (man8 (string-append man "/man8")))
+                (for-each
+                 (lambda (x) (install-file x man1))
+                 (find-files "doc" "\\.1$"))
+                (for-each
+                 (lambda (y) (install-file y man8))
+                 (find-files "doc" "\\.8$"))))))))
     (native-inputs
      (list doxygen flex perl pkg-config))
     (inputs
-- 
cgit 1.4.1


From 84779e6271bdcde6033ad4339502e421b2efd1a4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:00 +0200
Subject: gnu: hwinfo: Factorise 'install-man-pages.

* gnu/packages/hardware.scm (hwinfo)[arguments]: Get section numbers
from the man page file names rather than hard-coding 2.
---
 gnu/packages/hardware.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 9445dd82d6..68f06917c6 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -405,15 +405,11 @@ operability and find drivers.")
               (invoke "make" "doc")))
           (add-after 'install 'install-man-pages
             (lambda _
-              (let* ((man (string-append #$output "/share/man"))
-                     (man1 (string-append man "/man1"))
-                     (man8 (string-append man "/man8")))
-                (for-each
-                 (lambda (x) (install-file x man1))
-                 (find-files "doc" "\\.1$"))
-                (for-each
-                 (lambda (y) (install-file y man8))
-                 (find-files "doc" "\\.8$"))))))))
+              (for-each
+               (lambda (file)
+                 (install-file file (string-append #$output "/share/man/man"
+                                                   (string-take-right file 1))))
+               (find-files "doc" "\\.[0-9]$")))))))
     (native-inputs
      (list doxygen flex perl pkg-config))
     (inputs
-- 
cgit 1.4.1


From 4c20d7a661f457f52b7bc80f1c99c4f25e5af0d2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: hwinfo: Make with flags.

* gnu/packages/hardware.scm (hwinfo)[arguments]: Move CC, LIBDIR, and
VERSION from hacky substitutions to superior #:make-flags.  Honour them
in the 'build phase.
---
 gnu/packages/hardware.scm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 68f06917c6..2566339a2a 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -362,6 +362,10 @@ operability and find drivers.")
     (arguments
      (list
       #:tests? #f                       ; no test-suite available
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              (string-append "LIBDIR=" #$output:lib "/lib")
+              (string-append "VERSION=" #$version))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch
@@ -378,10 +382,6 @@ operability and find drivers.")
                    (string-append "OUTPUT_DIRECTORY = " doc "/libhd")))
                 ;; Correct values of the version and install directories.
                 (substitute* "Makefile"
-                  (("VERSION.*\\:=.*$")
-                   (string-append "VERSION := " #$version "\n"))
-                  (("LIBDIR.*\\?=.*$")
-                   (string-append "LIBDIR ?= " lib "\n"))
                   (("/usr/include") include)
                   (("/(usr|var)/(lib|lib64)") lib)
                   (("/usr/sbin") sbin)
@@ -400,9 +400,8 @@ operability and find drivers.")
           (delete 'configure)
           (replace 'build
             (lambda* (#:key make-flags #:allow-other-keys)
-              (setenv "CC" #$(cc-for-target))
-              (invoke "make" "shared")
-              (invoke "make" "doc")))
+              (apply invoke "make" "shared" make-flags)
+              (apply invoke "make" "doc" make-flags)))
           (add-after 'install 'install-man-pages
             (lambda _
               (for-each
-- 
cgit 1.4.1


From 5593d1c39e920e16045ebe0dade467992f527bc1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: gifsicle: Update to 1.94.

* gnu/packages/image.scm (gifsicle): Update to 1.94.
[arguments]: Don't explicitly return #t from phases.
---
 gnu/packages/image.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 50af2001ad..3336e38852 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -2046,14 +2046,14 @@ stdout.")
 (define-public gifsicle
   (package
    (name "gifsicle")
-   (version "1.93")
+   (version "1.94")
    (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.lcdf.org/gifsicle/gifsicle-"
                            version ".tar.gz"))
        (sha256
-        (base32 "0irljjm76anicsm5rfkpqxd6x105aa8f0sky13dc3x1bfdwp1xlj"))))
+        (base32 "16zq5wd6fyjgy0p0mak15k3mh1zpqb9rg6gqfpg215kqq02p1jab"))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases
@@ -2066,8 +2066,7 @@ stdout.")
               (("/bin/sh")
                (which "sh"))
               (("/bin/rm")
-               (which "rm")))
-            #t)))))
+               (which "rm"))))))))
    (native-inputs (list perl))    ; only for tests
    (inputs (list libx11))
    (home-page "https://www.lcdf.org/gifsicle/")
-- 
cgit 1.4.1


From 5e4480e967ce2f88b39034725bbbc5864873ea62 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:03 +0200
Subject: gnu: libqb: Remove obsolete bootstrapping inputs.

* gnu/packages/high-availability.scm (libqb)[native-inputs]: Remove
autoconf, automake, and libtool.
---
 gnu/packages/high-availability.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index 35bb28786b..bf5a578ade 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -116,7 +116,7 @@ realistic with today's hardware.")
                (base32
                 "071k916vz9ppyb69rpk792fzjs3nf3chakn10i496scgiqh49rzi"))))
     (build-system gnu-build-system)
-    (native-inputs (list autoconf automake libtool libxml2 pkg-config))
+    (native-inputs (list libxml2 pkg-config))
     (home-page "https://clusterlabs.github.io/libqb/")
     (synopsis
      "Library providing high performance logging, tracing, ipc, and poll")
-- 
cgit 1.4.1


From 1e8eacf7242275318fec922dba78e9a3286def72 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:04 +0200
Subject: gnu: libqb: Fix cross-compilation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/high-availability.scm (libqb)[native-inputs]:
Move libxml2 from here…
[inputs]: …to here.
---
 gnu/packages/high-availability.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index bf5a578ade..612d8c2cfc 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -116,7 +116,8 @@ realistic with today's hardware.")
                (base32
                 "071k916vz9ppyb69rpk792fzjs3nf3chakn10i496scgiqh49rzi"))))
     (build-system gnu-build-system)
-    (native-inputs (list libxml2 pkg-config))
+    (native-inputs (list pkg-config))
+    (inputs (list libxml2))
     (home-page "https://clusterlabs.github.io/libqb/")
     (synopsis
      "Library providing high performance logging, tracing, ipc, and poll")
-- 
cgit 1.4.1


From 46cbb6e4d03ca323be2760f7175a716e324f7681 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: libqb: Update to 2.0.7.

* gnu/packages/high-availability.scm (libqb): Update to 2.0.7.
---
 gnu/packages/high-availability.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index 612d8c2cfc..1fe62170c7 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -106,7 +106,7 @@ realistic with today's hardware.")
 (define-public libqb
   (package
     (name "libqb")
-    (version "2.0.6")
+    (version "2.0.7")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -114,7 +114,7 @@ realistic with today's hardware.")
                     version "/libqb-" version ".tar.xz"))
               (sha256
                (base32
-                "071k916vz9ppyb69rpk792fzjs3nf3chakn10i496scgiqh49rzi"))))
+                "0xd51wh7gdindh6fzi62r4xp9lkayggb1rqsprqmjkh1m71gnvin"))))
     (build-system gnu-build-system)
     (native-inputs (list pkg-config))
     (inputs (list libxml2))
-- 
cgit 1.4.1


From 31733c9090f8727a969869d9deeb702e6f996004 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:00 +0200
Subject: gnu: libqb: Tweak description.

* gnu/packages/high-availability.scm (libqb)[synopsis]: Fix spelling.
[description]: Use @acronym{}.
---
 gnu/packages/high-availability.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index 1fe62170c7..11ff8014cf 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -120,12 +120,12 @@ realistic with today's hardware.")
     (inputs (list libxml2))
     (home-page "https://clusterlabs.github.io/libqb/")
     (synopsis
-     "Library providing high performance logging, tracing, ipc, and poll")
+     "Library providing high-performance logging, tracing, IPC, and polling")
     (description
      "Libqb is a library with the primary purpose of providing
 high-performance, reusable features for client-server architecture, such as
-logging, tracing, inter-process communication (IPC), and polling.  Libqb is
-not intended to be an all-encompassing library, but instead provide focused
+logging, tracing, @acronym{IPC, inter-process communication} and polling.  Libqb
+is not intended to be an all-encompassing library, but instead provide focused
 APIs that are highly tuned for maximum performance for client-server
 applications.")
     (license license:lgpl2.1)))
-- 
cgit 1.4.1


From 09c14288cfe3f0017965d503841a938116c3372b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:00 +0200
Subject: gnu: bcachefs-tools: Respect input rewriting.

* gnu/packages/file-systems.scm (bcachefs-tools)[arguments]: Rewrite the
'promote-mount.bcachefs.sh phase to use SEARCH-INPUT-FILE.
---
 gnu/packages/file-systems.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 007203ae12..7788acd34e 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -614,16 +614,18 @@ from a mounted file system.")
                  (add-after 'install 'promote-mount.bcachefs.sh
                    ;; XXX The (optional) ‘mount.bcachefs’ requires rust:cargo.
                    ;; This shell alternative does the job well enough for now.
-                   (lambda _
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     (define (whence file)
+                       (dirname (search-input-file inputs file)))
                      (with-directory-excursion (string-append #$output "/sbin")
                        (rename-file "mount.bcachefs.sh" "mount.bcachefs")
                        ;; WRAP-SCRIPT causes bogus ‘Insufficient arguments’ errors.
                        (wrap-program "mount.bcachefs"
                          `("PATH" ":" prefix
-                           ,(list (string-append #$output            "/sbin")
-                                  (string-append #$coreutils-minimal "/bin")
-                                  (string-append #$gawk              "/bin")
-                                  (string-append #$util-linux        "/bin"))))))))))
+                           ,(list (getcwd)
+                                  (whence "bin/tail")
+                                  (whence "bin/awk")
+                                  (whence "bin/mount"))))))))))
       (native-inputs
        (append
          (list pkg-config
-- 
cgit 1.4.1


From f858d5c8a5270e5db189dc7cc2fa8ffe83c16ef5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:04 +0200
Subject: gnu: bcachefs-tools: Update to 0.1-17.c8bec83.

* gnu/packages/file-systems.scm (bcachefs-tools): Update to 0.1-17.c8bec83.
[arguments]: Remove obsolete PYTEST_ variables from #:make-flags, and add
NO_RUST.  Delete the obsolete 'promote-mount.bcachefs.sh phase.
Add a custom 'check phase.
[native-inputs]: Consolidate separate lists.
---
 gnu/packages/file-systems.scm | 72 +++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 7788acd34e..a957cc495a 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -574,8 +574,8 @@ from a mounted file system.")
     (license license:gpl2+)))
 
 (define-public bcachefs-tools
-  (let ((commit "46a6b9210c927ab46fd1227cb6f641be0b4a7505")
-        (revision "16"))
+  (let ((commit "c8bec83e307f28751c433ba1d3f648429fb5a34c")
+        (revision "17"))
     (package
       (name "bcachefs-tools")
       (version (git-version "0.1" revision commit))
@@ -587,7 +587,7 @@ from a mounted file system.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0jblpwz8mxrx0pa2gc5bwj60qjj2c0zmd8r06f2bhgzs75avpkj3"))))
+          (base32 "0b1avy5mw3r3ppfs3n9cq4zb74yl45nd5l69r6hi27z9q5bc3nv8"))))
       (build-system gnu-build-system)
       (arguments
        (list #:make-flags
@@ -596,47 +596,39 @@ from a mounted file system.")
                      "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools"
                      (string-append "CC=" #$(cc-for-target))
                      (string-append "PKG_CONFIG=" #$(pkg-config-for-target))
-                     (string-append "PYTEST_CMD="
-                                    #$(this-package-native-input "python-pytest")
-                                    "/bin/pytest")
-                     (string-append "PYTEST_ARGS=-k '"
-                                    ;; These fail (‘invalid argument’) on
-                                    ;; kernels with a previous bcachefs version.
-                                    "not test_format and "
-                                    "not test_fsck and "
-                                    "not test_list and "
-                                    "not test_list_inodes and "
-                                    "not test_list_dirent"
-                                    "'"))
+                     ;; ‘This will be less of an option in the future, as more
+                     ;; code gets rewritten in Rust.’
+                     "NO_RUST=better")
              #:phases
              #~(modify-phases %standard-phases
                  (delete 'configure)    ; no configure script
-                 (add-after 'install 'promote-mount.bcachefs.sh
-                   ;; XXX The (optional) ‘mount.bcachefs’ requires rust:cargo.
-                   ;; This shell alternative does the job well enough for now.
-                   (lambda* (#:key inputs #:allow-other-keys)
-                     (define (whence file)
-                       (dirname (search-input-file inputs file)))
-                     (with-directory-excursion (string-append #$output "/sbin")
-                       (rename-file "mount.bcachefs.sh" "mount.bcachefs")
-                       ;; WRAP-SCRIPT causes bogus ‘Insufficient arguments’ errors.
-                       (wrap-program "mount.bcachefs"
-                         `("PATH" ":" prefix
-                           ,(list (getcwd)
-                                  (whence "bin/tail")
-                                  (whence "bin/awk")
-                                  (whence "bin/mount"))))))))))
+                 (replace 'check
+                   ;; The test suite is moribund upstream (‘never been useful’),
+                   ;; but let's keep running it as a sanity check until then.
+                   (lambda* (#:key tests? make-flags #:allow-other-keys)
+                     (when tests?
+                       ;; We must manually build the test_helper first.
+                       (apply invoke "make" "tests" make-flags)
+                       (invoke (string-append
+                                #$(this-package-native-input "python-pytest")
+                                "/bin/pytest") "-k"
+                                ;; These fail (‘invalid argument’) on kernels
+                                ;; with a previous bcachefs version.
+                                (string-append "not test_format and "
+                                               "not test_fsck and "
+                                               "not test_list and "
+                                               "not test_list_inodes and "
+                                               "not test_list_dirent"))))))))
       (native-inputs
-       (append
-         (list pkg-config
-               ;; For tests.
-               python-pytest)
-         (if (member (%current-system) (package-supported-systems valgrind))
-           (list valgrind)
-           '())
-         ;; For generating documentation with rst2man.
-         (list python
-               python-docutils)))
+       (cons* pkg-config
+              ;; For generating documentation with rst2man.
+              python
+              python-docutils
+              ;; For tests.
+              python-pytest
+              (if (member (%current-system) (package-supported-systems valgrind))
+                  (list valgrind)
+                  '())))
       (inputs
        (list eudev
              keyutils
-- 
cgit 1.4.1


From 13cb9b302868b5a966a6ae177412c474084f4bf1 Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Fri, 30 Jun 2023 15:56:45 +0800
Subject: gnu: python-wand: Fix build.

Fixes <https://issues.guix.gnu.org/64350>.

* gnu/packages/python-xyz.scm (python-wand)[arguments]<#:phases>: Pass tests?
to 'check.

Reported-by: Thorsten Wilms <t_w_@freenet.de>
Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
---
 gnu/packages/python-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6a29701219..755b0af4b6 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2446,7 +2446,7 @@ conventions and aliases in the same expression.")
              (setenv "MAGICK_HOME" (assoc-ref inputs "imagemagick"))
              (setenv "WAND_MAGICK_LIBRARY_SUFFIX" ".Q16")))
          (replace 'check
-           (lambda _
+           (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
                (invoke "pytest" "-vv")))))))
     (native-inputs
-- 
cgit 1.4.1


From 9c6081c705e8221a31dc6db832fd5170b8239602 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 29 May 2023 20:10:17 +0200
Subject: gnu: commencement: Add autoconf-boot0.

* gnu/packages/commencement.scm (autoconf-boot0): New variable.
---
 gnu/packages/commencement.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 9bd0c113c2..3ccd51ac52 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -33,6 +33,7 @@
 (define-module (gnu packages commencement)
   #:use-module (gnu packages)
   #:use-module (gnu packages bootstrap)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages c)
@@ -2602,6 +2603,15 @@ memoized as a function of '%current-system'."
   (package-with-explicit-inputs %boot0-inputs
                                 %bootstrap-guile))
 
+(define autoconf-boot0
+  (with-boot0
+   (package
+     (inherit autoconf)
+     (name "autoconf-boot0")
+     (native-inputs (list m4-boot0 perl-boot0))
+     (inputs '())
+     (arguments (list #:tests? #f)))))
+
 (define gnumach-headers-boot0
   (with-boot0
    (package
-- 
cgit 1.4.1


From 85f940b0e78caeed52a0de8dc67c4b3be56ef926 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 29 May 2023 20:19:52 +0200
Subject: gnu: commencement: Add automake-boot0.

* gnu/packages/commencement.scm (automake-boot0): New variable.
---
 gnu/packages/commencement.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 3ccd51ac52..d0603e62c8 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2612,6 +2612,19 @@ memoized as a function of '%current-system'."
      (inputs '())
      (arguments (list #:tests? #f)))))
 
+(define automake-boot0
+  (with-boot0
+   (package
+     (inherit automake)
+     (name "automake-boot0")
+     (source (origin
+               (inherit (package-source automake))
+               (patches '())))        ;test are skipped anyway
+     (native-inputs (list autoconf-boot0 m4-boot0 perl-boot0))
+     (inputs '())
+     (arguments
+      (list #:tests? #f)))))
+
 (define gnumach-headers-boot0
   (with-boot0
    (package
-- 
cgit 1.4.1


From ed88588931bafd6595cc038b9aeb5e8ff37561a8 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 18 Jul 2023 12:49:28 +0200
Subject: gnu: commencement: Add git-fetch-from-tarball utility.

* gnu/packages/commencement.scm (git-fetch-from-tarball): New procedure.
---
 gnu/packages/commencement.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index d0603e62c8..bec3db43e3 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -57,7 +57,10 @@
   #:use-module (gnu packages xml)
   #:use-module (guix gexp)
   #:use-module (guix packages)
+  #:use-module ((guix store) #:select (%store-monad))
+  #:use-module (guix monads)
   #:use-module (guix download)
+  #:use-module ((guix git-download) #:select (git-reference git-file-name))
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
   #:use-module ((guix licenses) #:prefix license:)
@@ -90,6 +93,38 @@
 ;;;
 ;;; Code:
 
+(define* (git-fetch-from-tarball tarball)
+  "Return an <origin> method equivalent to 'git-fetch', except that it fetches
+the checkout from TARBALL, a tarball containing said checkout.
+
+  The purpose of this procedure is to work around bootstrapping issues:
+'git-fetch' depends on Git, which is much higher in the dependency graph."
+  (lambda* (url hash-algo hash
+                #:optional name
+                #:key (system (%current-system))
+                (guile %bootstrap-guile))
+    (mlet %store-monad ((guile (package->derivation guile system)))
+      (gexp->derivation
+       (or name "git-checkout")
+       (with-imported-modules '((guix build utils))
+         #~(begin
+             (use-modules (guix build utils)
+                          (ice-9 ftw)
+                          (ice-9 match))
+             (setenv "PATH"
+                     #+(file-append %bootstrap-coreutils&co "/bin"))
+             (invoke "tar" "xf" #$tarball)
+             (match (scandir ".")
+               (("." ".." directory)
+                (copy-recursively directory #$output)))))
+       #:recursive? #t
+       #:hash-algo hash-algo
+       #:hash hash
+       #:system system
+       #:guile-for-build guile
+       #:graft? #f
+       #:local-build? #t))))
+
 (define bootar
   (package
     (name "bootar")
-- 
cgit 1.4.1


From 5315c237020ae7d7fc3a9ac3fc72e7b99c5b75c9 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 29 May 2023 21:25:05 +0200
Subject: gnu: commencement: gnumach-headers-boot0: Update to 1.8+git20221224.

* gnu/packages/commencement.scm (gnumach-headers-boot0)[name]: New field; give
proper name.
[source]: Update to 1.8+git20221224, using git-fetch-from-tarball.
[native-inputs]: Add autoconf-boot0, automake-boot0, texinfo-boot0.
[arguments]: Add 'patch-compat' phase to allow building hurd-minimal etc, with
our out-of-date bootstsrap binaries.
---
 gnu/packages/commencement.scm | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index bec3db43e3..b4d02ac9cd 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2664,18 +2664,35 @@ memoized as a function of '%current-system'."
   (with-boot0
    (package
      (inherit gnumach-headers)
-     (version "1.8-116-g28b53508")
-     (source (bootstrap-origin
-              (origin
-                (method url-fetch)
-                (uri (list (string-append "mirror://gnu/guix/mirror/gnumach-"
-                                          version ".tar.gz")
-                           (string-append "https://lilypond.org/janneke/hurd/"
-                                          "gnumach-" version ".tar.gz")))
-                (sha256
-                 (base32
-                  "006i0zgwy81vxarpfm12vip4q6i5mgmi5mmy5ldvxp5hx9h3l0zg")))))
-     (native-inputs '()))))
+     (name "gnumach-headers-boot0")
+     (version "1.8+git20221224")
+     (source
+      (origin
+        (inherit (package-source gnumach-headers))
+        (method
+         (git-fetch-from-tarball
+          (origin
+            (method url-fetch)
+            (uri (string-append
+                  "https://git.savannah.gnu.org/cgit/hurd/gnumach.git/snapshot/"
+                  "gnumach-" version ".tar.gz"))
+            (sha256
+             (base32
+              "0vb19ynvrxz302snqxkd0wgizwa5fw2x06a4zjsllqb9ijbq9mc8")))))))
+     (native-inputs (list autoconf-boot0 automake-boot0 texinfo-boot0))
+     (arguments
+      (substitute-keyword-arguments (package-arguments gnumach-headers)
+        ((#:phases phases)
+         #~(modify-phases #$phases
+             (add-after 'unpack 'patch-compat
+               (lambda _
+                 (substitute* '("include/device/device_types.h"
+                                "include/mach_debug/slab_info.h"
+                                "include/mach_debug/vm_info.h")
+                   (("rpc_vm_size_t") "unsigned int")
+                   (("rpc_vm_offset_t") "unsigned int")
+                   (("rpc_long_natural_t") "unsigned long")
+                   (("long_natural_t") "unsigned long")))))))))))
 
 (define mig-boot0
   (let* ((mig (package
-- 
cgit 1.4.1


From c1840e9442f7e69fa864553346e3af1c4c4f5ada Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 29 May 2023 20:10:38 +0200
Subject: gnu: commencement: mig-boot0: Update to 1.8+git20230520.

* gnu/packages/commencement.scm (mig-boot0): Remove redundant
outer let.
[name]: New field, give proper name.
[version]: New field
[source]: Update to 1.8+git20230520.
[native-inputs]: Add autoconf-boot0, automake-boot0.
[inputs]: Add gnumach-headers-boot0.
---
 gnu/packages/commencement.scm | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index b4d02ac9cd..f2d3b96c1a 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2695,17 +2695,21 @@ memoized as a function of '%current-system'."
                    (("long_natural_t") "unsigned long")))))))))))
 
 (define mig-boot0
-  (let* ((mig (package
-                 (inherit (package-with-bootstrap-guile mig))
-                 (native-inputs `(("bison" ,bison-boot0)
-                                  ("flex" ,flex-boot0)))
-                 (inputs `(("flex" ,flex-boot0)))
-                 (arguments
-                  ;; TODO: On next rebuild cycle, reuse phases from 'mig'.
-                  `(#:configure-flags
-                    `(,(string-append "LDFLAGS=-Wl,-rpath="
-                                      (assoc-ref %build-inputs "flex") "/lib/")))))))
-    (with-boot0 mig)))
+  (with-boot0
+   (package
+     (inherit mig)
+     (name "mig-boot0")
+     (version "1.8+git20230520")
+     (source (origin (inherit (package-source mig))))
+     (native-inputs (list autoconf-boot0 automake-boot0 bison-boot0 flex-boot0
+                          gnumach-headers-boot0))
+     (inputs (list flex-boot0 gnumach-headers-boot0))
+     (arguments
+      (list
+       #:configure-flags
+       #~(list (string-append "LDFLAGS=-Wl,-rpath="
+                              #$(this-package-native-input "flex")
+                              "/lib/")))))))
 
 (define hurd-version-boot0 "0.9-229-ga1efcee8")
 (define hurd-source-boot0
-- 
cgit 1.4.1


From 72dbad505abcf360e2fedb747aad2ad7f4a0c326 Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Mon, 22 May 2023 11:04:17 +0200
Subject: gnu: mig: Use git-fetch.

Now that we have `git-fetch-from-tarball' to break the cycle in commencement
for git-fetch sources, we can finally update mig to use git-fetch to allow
`--with-commit' builds.

* gnu/packages/hurd.scm (mig)[source]: Use git-fetch again.
* gnu/packages/commencement.scm (mig-boot0)[source]: Use
git-fetch-from-tarball accordingly.
---
 gnu/packages/commencement.scm | 14 +++++++++++++-
 gnu/packages/hurd.scm         | 17 +++++++----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index f2d3b96c1a..687153f0fc 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2700,7 +2700,19 @@ memoized as a function of '%current-system'."
      (inherit mig)
      (name "mig-boot0")
      (version "1.8+git20230520")
-     (source (origin (inherit (package-source mig))))
+     (source
+      (origin
+        (inherit (package-source mig))
+        (method
+         (git-fetch-from-tarball
+          (origin
+            (method url-fetch)
+            (uri (string-append
+                  "https://git.savannah.gnu.org/cgit/hurd/mig.git/snapshot/"
+                  "mig-" version ".tar.gz"))
+            (sha256
+             (base32
+              "1l1vfm4wap5yxylv91wssgpy7fnq22wp3akgd5nv995kychfa9jy")))))))
      (native-inputs (list autoconf-boot0 automake-boot0 bison-boot0 flex-boot0
                           gnumach-headers-boot0))
      (inputs (list flex-boot0 gnumach-headers-boot0))
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index b184657fb9..4064a9e2e8 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -93,21 +93,18 @@
     (name "mig")
     (version "1.8+git20230520")
     (source (origin
-              (method url-fetch)
-              ;; XXX: Versions 2.35 and 2.37 of glibc can only be built with an
-              ;; unreleased version of MiG:
-              ;; <https://lists.gnu.org/archive/html/bug-hurd/2023-03/msg00025.html>.
-              ;; It cannot be fetched from Git though, as the extra dependency
-              ;; on Autoconf/Automake would complicate bootstrapping.
-              (uri (string-append "mirror://gnu/guix/mirror/mig-"
-                                  version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.savannah.gnu.org/git/hurd/mig.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1ap31jd9jkvvz3vb88hg19cyqmqzmra724yl1xhcrv7gcgnan7d9"))))
+                "10r0fdjqjzqsy6ajb21rifvhw0wpjvrw6a1zdyliqlzqny5k0qlz"))))
     (build-system gnu-build-system)
     ;; Flex is needed both at build and run time.
     (inputs (list gnumach-headers flex))
-    (native-inputs (list flex bison))
+    (native-inputs (list autoconf automake flex bison))
     (arguments
      (list #:tests? #f
            #:phases
-- 
cgit 1.4.1


From e9c23e2c8e7bd61925409fe7c7f6dd19fe168ef4 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 30 May 2023 06:35:58 +0200
Subject: gnu: commencement: hurd-headers-boot0: Update to 0.9.git20230216.

* gnu/packages/commencement.scm (hurd-headers-boot0): Remove redundant outer
let and package-with-bootstrap-guile.
[name]: New field; give proper name.
[version]: New field.
[source]: Update to 0.9.git20230216, using git-fetch-from-tarball.
[inputs]: Add autoconf-boot0, automake-boot0, gnumach-headers-boot0.
---
 gnu/packages/commencement.scm | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 687153f0fc..e6bce76f49 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2737,12 +2737,27 @@ memoized as a function of '%current-system'."
         "0bq2q2jisxcy0kgcm6rz0z2fddwxxm7azsama7li28a2m08kdpzy")))))
 
 (define hurd-headers-boot0
-  (let ((hurd-headers (package (inherit hurd-headers)
-                               (version hurd-version-boot0)
-                               (source hurd-source-boot0)
-                               (native-inputs `(("mig" ,mig-boot0)))
-                               (inputs '()))))
-    (with-boot0 (package-with-bootstrap-guile hurd-headers))))
+  (with-boot0
+   (package
+     (inherit hurd-headers)
+     (name "hurd-headers-boot0")
+     (version "0.9.git20230216")
+     (source
+      (origin
+        (inherit (package-source hurd-headers))
+        (method
+         (git-fetch-from-tarball
+          (origin
+            (method url-fetch)
+            (uri (string-append
+                  "https://git.savannah.gnu.org/cgit/hurd/hurd.git/snapshot/"
+                  "hurd-v" version ".tar.gz"))
+            (sha256
+             (base32
+              "1f75nlkcl00dqnnrbrj1frvzs2qibfpygj3gwywqi85aldjl48y7")))))))
+     (native-inputs
+      (list autoconf-boot0 automake-boot0 mig-boot0))
+     (inputs '()))))
 
 (define hurd-minimal-boot0
   (let ((hurd-minimal (package (inherit hurd-minimal)
-- 
cgit 1.4.1


From 8831d3ba9f799b7342ab466d625097f1982513a9 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 29 May 2023 22:20:08 +0200
Subject: gnu: commencement: hurd-minimal-boot0: Update to 0.9.git20230216.

* gnu/packages/commencement.scm (hurd-minimal-boot0): Remove redundant let
and package-with-bootstrap-guile.
[name]: New field; give proper name.
[version]: New field.
[source]: Update to 0.9.git20230216, using hurd-headers-boot0' source.
[inputs]: Add autoconf-boot0, automake-boot0, gnumach-headers-boot0.
[native-inputs]: Add autoconf-boot0, automake-boot0, and
gnumach-headers-boot0.
* gnu/packages/commencement.scm (hurd-version-boot0, hurd-source-boot0):
Remove.
---
 gnu/packages/commencement.scm | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index e6bce76f49..fe6f025257 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2723,19 +2723,6 @@ memoized as a function of '%current-system'."
                               #$(this-package-native-input "flex")
                               "/lib/")))))))
 
-(define hurd-version-boot0 "0.9-229-ga1efcee8")
-(define hurd-source-boot0
-  (let ((version hurd-version-boot0))
-    (origin
-      (method url-fetch)
-      (uri (list (string-append "mirror://gnu/guix/mirror/hurd-v"
-                                version ".tar.gz")
-                 (string-append "https://lilypond.org/janneke/hurd/"
-                                "hurd-v" version ".tar.gz")))
-      (sha256
-       (base32
-        "0bq2q2jisxcy0kgcm6rz0z2fddwxxm7azsama7li28a2m08kdpzy")))))
-
 (define hurd-headers-boot0
   (with-boot0
    (package
@@ -2760,12 +2747,14 @@ memoized as a function of '%current-system'."
      (inputs '()))))
 
 (define hurd-minimal-boot0
-  (let ((hurd-minimal (package (inherit hurd-minimal)
-                               (version hurd-version-boot0)
-                               (source hurd-source-boot0)
-                               (native-inputs `(("mig" ,mig-boot0)))
-                               (inputs '()))))
-    (with-boot0 (package-with-bootstrap-guile hurd-minimal))))
+  (with-boot0
+   (package
+     (inherit hurd-minimal)
+     (name "hurd-minimal-boot0")
+     (source (package-source hurd-headers-boot0))
+     (native-inputs
+      (list autoconf-boot0 automake-boot0 gnumach-headers-boot0 mig-boot0))
+     (inputs (list gnumach-headers-boot0)))))
 
 (define/system-dependent hurd-core-headers-boot0
   ;; Return the Hurd and Mach headers as well as initial Hurd libraries for
-- 
cgit 1.4.1


From 2d298564e39994be559d9518b88130f45ca1726f Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Mon, 17 Jul 2023 19:27:36 +0300
Subject: gnu: cl-array-utils: Update to 1.2.0-0.29da8fc.

* gnu/packages/lisp-xyz.scm (sbcl-array-utils): Update to 1.2.0-0.29da8fc.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
---
 gnu/packages/lisp-xyz.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 9fc5341521..7c869f3a0e 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -10365,11 +10365,11 @@ macro.  This library provides a set of simple utilities to help with that.")
   (sbcl-package->ecl-package sbcl-form-fiddle))
 
 (define-public sbcl-array-utils
-  (let ((commit "40cea8fc895add87d1dba9232da817750222b528")
-        (revision "1"))
+  (let ((commit "29da8fccf6093fe8f8c7b2daef7de1a428ef1834")
+        (revision "0"))
     (package
       (name "sbcl-array-utils")
-      (version (git-version "1.1.1" revision commit))
+      (version (git-version "1.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10379,7 +10379,7 @@ macro.  This library provides a set of simple utilities to help with that.")
            (commit commit)))
          (file-name (git-file-name "cl-array-utils" version))
          (sha256
-          (base32 "0d7nddak8h2aa82z11vdbd97srk5bdgq41pzmibsz3ymspnndicd"))))
+          (base32 "1d66s2inb9hpw27hdb20x27dychmpn1mn35v0mlsib848qdz87az"))))
       (build-system asdf-build-system/sbcl)
       (native-inputs
        (list sbcl-parachute))
-- 
cgit 1.4.1


From 54a49cf1ccc9d2cf44e5de5bdd0ce5fc7c810fb0 Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Tue, 18 Jul 2023 12:10:13 +0300
Subject: gnu: cl-lisp-unit2: Update to 0.9.4-0.b5aa17b.

* gnu/packages/lisp-check.scm (sbcl-lisp-unit2): Update to 0.9.4-0.b5aa17b.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
---
 gnu/packages/lisp-check.scm | 46 +++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/lisp-check.scm b/gnu/packages/lisp-check.scm
index 4b18f79a44..6bade26aea 100644
--- a/gnu/packages/lisp-check.scm
+++ b/gnu/packages/lisp-check.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2021, 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2021 Charles Jackson <charles.b.jackson@protonmail.com>
 ;;; Copyright © 2022 jgart <jgart@dismail.de>
-;;; Copyright © 2022 André A. Gomes <andremegafone@gmail.com>
+;;; Copyright © 2022, 2023 André A. Gomes <andremegafone@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -696,29 +696,31 @@ testing.  It is an extension of the library written by Chris Riesbeck.")
 (define-public sbcl-lisp-unit2
   ;; There is a cyclical dependency between symbol-munger and lisp-unit2.
   ;; See https://github.com/AccelerationNet/symbol-munger/issues/4
-  (package
-    (name "sbcl-lisp-unit2")
-    (version "0.9.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/AccelerationNet/lisp-unit2")
-             (commit version)))
-       (file-name (git-file-name "cl-lisp-unit2" version))
-       (sha256
-        (base32 "0dnq0qvbsn7ciknvmwzfjnimlzq1gdkv5xd87agmhxm1cpm1ksz0"))))
-    (build-system asdf-build-system/sbcl)
-    (inputs
-     (list sbcl-alexandria sbcl-cl-interpol sbcl-iterate
-           sbcl-symbol-munger))
-    (synopsis "Test Framework for Common Lisp")
-    (description
-     "LISP-UNIT2 is a Common Lisp library that supports unit testing in the
+  (let ((commit "b5aa17b298cf2f669f4c0262c471e1ee4ab4699a")
+        (revision "0"))
+    (package
+      (name "sbcl-lisp-unit2")
+      (version (git-version "0.9.4" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/AccelerationNet/lisp-unit2")
+               (commit commit)))
+         (file-name (git-file-name "cl-lisp-unit2" version))
+         (sha256
+          (base32 "140nn22n1xv3qaash3x6h2h7xmys44s3f42b7bakfhpc4qlx0b69"))))
+      (build-system asdf-build-system/sbcl)
+      (inputs
+       (list sbcl-alexandria sbcl-cl-interpol sbcl-iterate
+             sbcl-symbol-munger))
+      (synopsis "Test Framework for Common Lisp")
+      (description
+       "LISP-UNIT2 is a Common Lisp library that supports unit testing in the
 style of JUnit for Java.  It is a new version of the lisp-unit library written
 by Chris Riesbeck.")
-    (home-page "https://github.com/AccelerationNet/lisp-unit2")
-    (license license:expat)))
+      (home-page "https://github.com/AccelerationNet/lisp-unit2")
+      (license license:expat))))
 
 (define-public cl-lisp-unit2
   (sbcl-package->cl-source-package sbcl-lisp-unit2))
-- 
cgit 1.4.1


From 324f56927b5856d9b7629c594e7d2893916e8c16 Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Tue, 18 Jul 2023 12:32:31 +0300
Subject: gnu: cl-ndebug: Update to 0.2.0.

* gnu/packages/lisp-xyz.scm (sbcl-ndebug): Update to 0.2.0.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
---
 gnu/packages/lisp-xyz.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 7c869f3a0e..eeda615c95 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -27956,23 +27956,22 @@ manipulations as the composition of more primitive operations.")
 (define-public sbcl-ndebug
   (package
     (name "sbcl-ndebug")
-    (version "0.1.0")
+    (version "0.2.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/atlas-engineer/ndebug")
              (commit version)))
-       (file-name (git-file-name "ndebug" version))
+       (file-name (git-file-name "cl-ndebug" version))
        (sha256
-        (base32 "0wdp0wqk6clq3hh9yqmgdm55x50b5m7ly9004j2c8k5zz1rgi4rr"))))
+        (base32 "1sndg4qclkdr53xkxrfjskx8gcqx0bn4r0vslzfx1kgznl4hbf1d"))))
     (build-system asdf-build-system/sbcl)
     (inputs
-     (list
-      sbcl-dissect
-      sbcl-lparallel
-      sbcl-slime-swank
-      sbcl-trivial-custom-debugger))
+     (list sbcl-dissect
+           sbcl-trivial-custom-debugger
+           sbcl-bordeaux-threads
+           sbcl-trivial-gray-streams))
     (native-inputs
      (list sbcl-lisp-unit2))
     (home-page "https://github.com/atlas-engineer/ndebug/")
-- 
cgit 1.4.1


From 1f53bfb7d73638e5187df6f0e976b5f5eb091b0d Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Tue, 18 Jul 2023 13:17:55 +0300
Subject: gnu: cl-usocket: Update to 0.8.6.

* gnu/packages/lisp-xyz.scm (sbcl-usocket): Update to 0.8.6.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
---
 gnu/packages/lisp-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index eeda615c95..95bc9d5d75 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -5325,7 +5325,7 @@ Lisp (from GBBopen project).")
 (define-public sbcl-usocket
   (package
     (name "sbcl-usocket")
-    (version "0.8.5")
+    (version "0.8.6")
     (source
      (origin
        (method git-fetch)
@@ -5334,7 +5334,7 @@ Lisp (from GBBopen project).")
              (commit (string-append "v" version))))
        (file-name (git-file-name "cl-usocket" version))
        (sha256
-        (base32 "1pn5mf4d9g3b7h0vfx0mh7rlrydfbk8q35pg4ip6prf4zyg70wba"))))
+        (base32 "0by8hhg6gijdbq5vjykd374rmvqyikp4synpyk0wjcl7rk3r0vgn"))))
     (build-system asdf-build-system/sbcl)
     (native-inputs
      (list sbcl-rt))
-- 
cgit 1.4.1


From b2750695f72519286cb0530431396767588cc67d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 09:50:08 +0200
Subject: gnu: Add r-gsva.

* gnu/packages/bioconductor.scm (r-gsva): New variable.
---
 gnu/packages/bioconductor.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 8549d2404d..4f1a4d61b1 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -7183,6 +7183,46 @@ testing and other simple calculations.")
 Enrichment Analysis} (GSEA).")
     (license license:artistic2.0)))
 
+(define-public r-gsva
+  (package
+    (name "r-gsva")
+    (version "1.48.2")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "GSVA" version))
+              (sha256
+               (base32
+                "1y0dz9ayyrz4ylppa8f4m4b20yajzdl1sz4wpz8kcsfhh71ii64y"))))
+    (properties `((upstream-name . "GSVA")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-biobase
+                             r-biocparallel
+                             r-biocsingular
+                             r-delayedarray
+                             r-delayedmatrixstats
+                             r-gseabase
+                             r-hdf5array
+                             r-iranges
+                             r-matrix
+                             r-s4vectors
+                             r-singlecellexperiment
+                             r-sparsematrixstats
+                             r-summarizedexperiment))
+    (native-inputs (list r-knitr))
+    (home-page "https://github.com/rcastelo/GSVA")
+    (synopsis "Gene Set Variation Analysis for microarray and RNA-seq data")
+    (description
+     "Gene Set Variation Analysis (GSVA) is a non-parametric, unsupervised
+method for estimating variation of gene set enrichment through the samples of
+a expression data set.  GSVA performs a change in coordinate systems,
+transforming the data from a gene by sample matrix to a gene-set by sample
+matrix, thereby allowing the evaluation of pathway enrichment for each sample.
+This new matrix of GSVA enrichment scores facilitates applying standard
+analytical methods like functional enrichment, survival analysis, clustering,
+CNV-pathway analysis or cross-tissue pathway analysis, in a pathway-centric
+manner.")
+    (license license:gpl2+)))
+
 (define-public r-harshlight
   (package
     (name "r-harshlight")
-- 
cgit 1.4.1


From ff6b2a88c4600ad5774e6dde9eb7e2c18e85ada3 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 13:08:02 +0200
Subject: gnu: Add r-gwasexacthw.

* gnu/packages/cran.scm (r-gwasexacthw): New variable.
---
 gnu/packages/cran.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index bc2f7acb7f..acd1eb0be5 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -926,6 +926,27 @@ differential abundance analysis of zero-inflated high-dimensional
 compositional data.")
     (license license:gpl3)))
 
+(define-public r-gwasexacthw
+  (package
+    (name "r-gwasexacthw")
+    (version "1.01")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "GWASExactHW" version))
+              (sha256
+               (base32
+                "19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"))))
+    (properties `((upstream-name . "GWASExactHW")))
+    (build-system r-build-system)
+    (home-page "https://cran.r-project.org/package=GWASExactHW")
+    (synopsis
+     "Exact Hardy-Weinburg testing for Genome Wide Association Studies")
+    (description
+     "This package contains a function to do exact Hardy-Weinburg
+testing (using Fisher's test) for SNP genotypes as typically obtained in a
+@dfn{Genome Wide Association Study} (GWAS).")
+    (license license:gpl3)))
+
 (define-public r-gwidgets2
   (package
     (name "r-gwidgets2")
-- 
cgit 1.4.1


From 4415a421c454817728a164db77f0437572343168 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 13:08:47 +0200
Subject: gnu: Add r-uchardet.

* gnu/packages/cran.scm (r-uchardet): New variable.
---
 gnu/packages/cran.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index acd1eb0be5..b057a299d4 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -8009,6 +8009,28 @@ can be computed between character vectors while taking proper care of encoding
 or between integer vectors representing generic sequences.")
     (license license:gpl3+)))
 
+(define-public r-uchardet
+  (package
+    (name "r-uchardet")
+    (version "1.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "uchardet" version))
+              (sha256
+               (base32
+                "0m3xy807smqdxhkhd9cwrcf3ljlyvfmnkd7831qzpgcadam2jcdj"))))
+    (properties `((upstream-name . "uchardet")))
+    (build-system r-build-system)
+    (native-inputs (list r-knitr))
+    (home-page "https://artemklevtsov.gitlab.io/uchardet")
+    (synopsis "Universal character encoding detector")
+    (description
+     "This package provides R bindings to the uchardet encoding detector
+library from Mozilla.  It takes a sequence of bytes in an unknown character
+encoding without any additional information, and attempts to get the encoding
+of the text.  All return names of the encodings are iconv-compatible.")
+    (license license:gpl2)))
+
 (define-public r-ucminf
   (package
     (name "r-ucminf")
-- 
cgit 1.4.1


From 5f6daad3c8ebd7d39e6f9fe94be264e8de6595c4 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 13:09:03 +0200
Subject: gnu: Add r-operator-tools.

* gnu/packages/cran.scm (r-operator-tools): New variable.
---
 gnu/packages/cran.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index b057a299d4..df0840502d 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -11268,6 +11268,28 @@ package covers Models, Completions, Chat, Edits, Images, Embeddings, Audio,
 Files, Fine-tunes, Moderations, and legacy Engines endpoints.")
     (license license:expat)))
 
+(define-public r-operator-tools
+  (package
+    (name "r-operator-tools")
+    (version "1.6.3")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "operator.tools" version))
+              (sha256
+               (base32
+                "1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"))))
+    (properties `((upstream-name . "operator.tools")))
+    (build-system r-build-system)
+    (home-page "https://github.com/decisionpatterns/operator.tools")
+    (synopsis "Utilities for working with R's operators")
+    (description
+     "This package provides a collection of utilities that allow programming
+with R's operators.  Routines allow classifying operators, translating to and
+from an operator and its underlying function, and inverting some
+operators (e.g. comparison operators), etc.  All methods can be extended to
+custom infix operators.")
+    (license license:gpl2)))
+
 (define-public r-openxlsx
   (package
     (name "r-openxlsx")
-- 
cgit 1.4.1


From c31eea21ddb48bc66635b2681017e7e5e055fd59 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 13:09:25 +0200
Subject: gnu: Add r-formula-tools.

* gnu/packages/cran.scm (r-formula-tools): New variable.
---
 gnu/packages/cran.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index df0840502d..589bcd8f30 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -29625,6 +29625,30 @@ to improve the readability of data presented in tabular form rendered in web
 pages.")
     (license license:expat)))
 
+(define-public r-formula-tools
+  (package
+    (name "r-formula-tools")
+    (version "1.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "formula.tools" version))
+              (sha256
+               (base32
+                "15d3ikfmsh9zszfgfkrxb3jkipl41inm7n6bhs73kwlnklnygq2g"))))
+    (properties `((upstream-name . "formula.tools")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-operator-tools))
+    (home-page "https://github.com/decisionpatterns/formula.tools")
+    (synopsis
+     "Utilities for manipulating formulas, calls, assignments and other R objects")
+    (description
+     "These utilities facilitate the programmatic manipulations of formulas,
+expressions, calls, assignments and other R language objects.  These objects
+all share the same structure: a left-hand side, operator and right-hand side.
+This packages provides methods for accessing and modifying this structures as
+well as extracting and replacing names and symbols from these objects.")
+    (license license:gpl2)))
+
 (define-public r-xmisc
   (package
     (name "r-xmisc")
-- 
cgit 1.4.1


From 1b48d723bd70b90b8526697debb1805994cbe431 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 13:09:32 +0200
Subject: gnu: Add r-logistf.

* gnu/packages/cran.scm (r-logistf): New variable.
---
 gnu/packages/cran.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 589bcd8f30..4229fc2cea 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -19443,6 +19443,37 @@ hierarchic loggers, multiple handlers per logger, level based filtering, space
 handling in messages and custom formatting.")
     (license license:gpl3)))
 
+(define-public r-logistf
+  (package
+    (name "r-logistf")
+    (version "1.25.0")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "logistf" version))
+              (sha256
+               (base32
+                "0w78jsynw5jh3l9r3ssjs8rza6givgrxzwnb5jwazcm8637d6gix"))))
+    (properties `((upstream-name . "logistf")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-formula-tools r-matrix r-mgcv r-mice))
+    (home-page
+     "https://cemsiis.meduniwien.ac.at/en/kb/science-research\
+/software/statistical-software/firth-correction/")
+    (synopsis "Firth's bias-reduced logistic regression")
+    (description
+     "Fit a logistic regression model using Firth's bias reduction method,
+equivalent to penalization of the log-likelihood by the Jeffreys prior.
+Confidence intervals for regression coefficients can be computed by penalized
+profile likelihood.  Firth's method was proposed as ideal solution to the
+problem of separation in logistic regression, see Heinze and Schemper (2002)
+<doi:10.1002/sim.1047>.  If needed, the bias reduction can be turned off such
+that ordinary maximum likelihood logistic regression is obtained.  Two new
+modifications of Firth's method, FLIC and FLAC, lead to unbiased predictions
+and are now available in the package as well, see Puhr et al (2017)
+<doi:10.1002/sim.7273>.")
+    ;; Any version of the GPL
+    (license license:gpl3+)))
+
 (define-public r-longdat
   (package
     (name "r-longdat")
-- 
cgit 1.4.1


From b4cfd40aaee4477382f6a28aa939a304bf92f894 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 14:37:54 +0200
Subject: gnu: Add r-enhancedvolcano.

* gnu/packages/bioconductor.scm (r-enhancedvolcano): New variable.
---
 gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 4f1a4d61b1..9d924c5429 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -6677,6 +6677,34 @@ other types of genomic data that produce counts, including ChIP-seq, SAGE and
 CAGE.")
     (license license:gpl2+)))
 
+(define-public r-enhancedvolcano
+  (package
+    (name "r-enhancedvolcano")
+    (version "1.18.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "EnhancedVolcano" version))
+              (sha256
+               (base32
+                "1mcyhgdvfmkkh0rlhf51an7j1zi96lqdhifki2aqmlx0lqvg4qxq"))))
+    (properties `((upstream-name . "EnhancedVolcano")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-ggplot2 r-ggrepel))
+    (native-inputs (list r-knitr))
+    (home-page "https://github.com/kevinblighe/EnhancedVolcano")
+    (synopsis
+     "Publication-ready volcano plots with enhanced coloring and labeling")
+    (description
+     "Volcano plots represent a useful way to visualise the results of
+differential expression analyses.  This package provides a highly-configurable
+function that produces publication-ready volcano plots.  EnhancedVolcano will
+attempt to fit as many point labels in the plot window as possible, thus
+avoiding clogging up the plot with labels that could not otherwise have been
+read.  Other functionality allows the user to identify up to 4 different types
+of attributes in the same plot space via color, shape, size, and shade
+parameter configurations.")
+    (license license:gpl3)))
+
 (define-public r-enmix
   (package
     (name "r-enmix")
-- 
cgit 1.4.1


From 46cae56dfe63ca72b5aaf38c28275b6109d9a572 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 14:53:06 +0200
Subject: gnu: Add r-snprelate.

* gnu/packages/bioconductor.scm (r-snprelate): New variable.
---
 gnu/packages/bioconductor.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 9d924c5429..f6917405a3 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -20025,6 +20025,41 @@ segmented data for individual and multiple arrays.")
     ;; Expanded from GPL
     (license (list license:gpl2+ license:gpl3+))))
 
+(define-public r-snprelate
+  (package
+    (name "r-snprelate")
+    (version "1.34.1")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "SNPRelate" version))
+              (sha256
+               (base32
+                "0js932qvhlwmnrr2jfvsch2zm6w6a1z5wydns3r1bw24r817dlgh"))))
+    (properties `((upstream-name . "SNPRelate")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-gdsfmt))
+    (native-inputs (list r-knitr))
+    (home-page "https://github.com/zhengxwen/SNPRelate")
+    (synopsis
+     "Toolset for relatedness and Principal Component Analysis of SNP data")
+    (description
+     "Genome-wide association studies (GWAS) are widely used to investigate
+the genetic basis of diseases and traits, but they pose many computational
+challenges.  The R package SNPRelate provides a binary format for
+single-nucleotide polymorphism (SNP) data in GWAS utilizing CoreArray Genomic
+Data Structure (GDS) data files.  The GDS format offers the efficient
+operations specifically designed for integers with two bits, since a SNP could
+occupy only two bits.  SNPRelate is also designed to accelerate two key
+computations on SNP data using parallel computing for multi-core symmetric
+multiprocessing computer architectures: Principal Component Analysis (PCA) and
+relatedness analysis using Identity-By-Descent measures.  The SNP GDS format
+is also used by the GWASTools package with the support of S4 classes and
+generic functions.  The extended GDS format is implemented in the SeqArray
+package to support the storage of single nucleotide variations (SNVs),
+insertion/deletion polymorphism (indel) and structural variation calls in
+whole-genome and whole-exome variant data.")
+    (license license:gpl3)))
+
 (define-public r-snpstats
   (package
     (name "r-snpstats")
-- 
cgit 1.4.1


From d0c96a78edf32409ef39cec6986c131c280f9ec5 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 14:54:02 +0200
Subject: gnu: Add r-genomicdatacommons.

* gnu/packages/bioconductor.scm (r-genomicdatacommons): New variable.
---
 gnu/packages/bioconductor.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index f6917405a3..7b633f4bad 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -6996,6 +6996,37 @@ junction detection, and working with the nucleotide content of the
 alignments.")
     (license license:artistic2.0)))
 
+(define-public r-genomicdatacommons
+  (package
+    (name "r-genomicdatacommons")
+    (version "1.24.2")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "GenomicDataCommons" version))
+              (sha256
+               (base32
+                "0dgvhi6nbc1qvrdwww2r39gxd2xmbadvy03lxh5nny9pyhhdlz3l"))))
+    (properties `((upstream-name . "GenomicDataCommons")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-dplyr
+                             r-genomicranges
+                             r-httr
+                             r-iranges
+                             r-jsonlite
+                             r-magrittr
+                             r-rappdirs
+                             r-readr
+                             r-rlang
+                             r-tibble
+                             r-xml2))
+    (native-inputs (list r-knitr))
+    (home-page "https://bioconductor.org/packages/GenomicDataCommons")
+    (synopsis "NIH/NCI genomic data commons access")
+    (description
+     "This package lets you programmatically access the NIH/NCI Genomic Data
+Commons RESTful service.")
+    (license license:artistic2.0)))
+
 (define-public r-genomicfeatures
   (package
     (name "r-genomicfeatures")
-- 
cgit 1.4.1


From dc889e85a98ee891bd5cc30849ee286e2ae03c98 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 14:55:11 +0200
Subject: gnu: Add r-dyndoc.

* gnu/packages/bioconductor.scm (r-dyndoc): New variable.
---
 gnu/packages/bioconductor.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 7b633f4bad..05123b5506 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -5008,6 +5008,25 @@ Beta-Binomial distributions.")
     ;; Any version of the GPL
     (license (list license:gpl2+ license:gpl3+))))
 
+(define-public r-dyndoc
+  (package
+    (name "r-dyndoc")
+    (version "1.78.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "DynDoc" version))
+              (sha256
+               (base32
+                "16cb4pby6ja0xy8ygbgr6zfbyp4agyhlds5sayc5ryq50vafykah"))))
+    (properties `((upstream-name . "DynDoc")))
+    (build-system r-build-system)
+    (home-page "https://bioconductor.org/packages/DynDoc")
+    (synopsis "Dynamic document tools")
+    (description
+     "This package provides a set of functions to create and interact with
+dynamic documents and vignettes.")
+    (license license:artistic2.0)))
+
 (define-public r-bluster
   (package
    (name "r-bluster")
-- 
cgit 1.4.1


From b7d3a9e2f5395d71498bafffa2f4d800bf8572c1 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 14:56:11 +0200
Subject: gnu: Add r-tkwidgets.

* gnu/packages/bioconductor.scm (r-tkwidgets): New variable.
---
 gnu/packages/bioconductor.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 05123b5506..58294f8a3e 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -9306,6 +9306,25 @@ this package.  It also provides functionalities for visualizing, summarizing
 and comparing the clusterings.")
     (license license:expat)))
 
+(define-public r-tkwidgets
+  (package
+    (name "r-tkwidgets")
+    (version "1.78.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "tkWidgets" version))
+              (sha256
+               (base32
+                "1xp0gdfrhhfzfww4ig3y90f7334y24rhzrmlxmm4wav8slvcran2"))))
+    (properties `((upstream-name . "tkWidgets")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-dyndoc r-widgettools))
+    (home-page "https://bioconductor.org/packages/tkWidgets")
+    (synopsis "R based tk widgets")
+    (description
+     "This package implements widgets to provide user interfaces.")
+    (license license:artistic2.0)))
+
 (define-public r-transcriptr
   (package
     (name "r-transcriptr")
-- 
cgit 1.4.1


From f77216721e20f471f7989590422c595f80d70534 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 14:57:07 +0200
Subject: gnu: Add r-plyranges.

* gnu/packages/bioconductor.scm (r-plyranges): New variable.
---
 gnu/packages/bioconductor.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 58294f8a3e..69c054e4c7 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -11263,6 +11263,40 @@ PLGEM has been shown to improve the detection of differentially expressed
 genes or proteins in these datasets.")
     (license license:gpl2)))
 
+(define-public r-plyranges
+  (package
+    (name "r-plyranges")
+    (version "1.20.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "plyranges" version))
+              (sha256
+               (base32
+                "1qv8snpcxpg16v5ji7sq3bnmgrgghz9h4mh246mcnnxfhi44b6nv"))))
+    (properties `((upstream-name . "plyranges")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-biocgenerics
+                             r-dplyr
+                             r-genomeinfodb
+                             r-genomicalignments
+                             r-genomicranges
+                             r-iranges
+                             r-magrittr
+                             r-rlang
+                             r-rsamtools
+                             r-rtracklayer
+                             r-s4vectors
+                             r-tidyselect))
+    (native-inputs (list r-knitr))
+    (home-page "https://bioconductor.org/packages/plyranges")
+    (synopsis "Fluent interface for manipulating GenomicRanges")
+    (description
+     "This package provides a dplyr-like interface for interacting with the
+common Bioconductor classes @code{Ranges} and @code{GenomicRanges}.  By
+providing a grammatical and consistent way of manipulating these classes their
+accessiblity for new Bioconductor users is hopefully increased.")
+    (license license:artistic2.0)))
+
 (define-public r-inspect
   (package
     (name "r-inspect")
-- 
cgit 1.4.1


From c5f9e435da652179aa70f8c6c9cabdbb02cf0728 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 14:59:11 +0200
Subject: gnu: Add r-singscore.

* gnu/packages/bioconductor.scm (r-singscore): New variable.
---
 gnu/packages/bioconductor.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 69c054e4c7..c7f99d82b4 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -9306,6 +9306,44 @@ this package.  It also provides functionalities for visualizing, summarizing
 and comparing the clusterings.")
     (license license:expat)))
 
+(define-public r-singscore
+  (package
+    (name "r-singscore")
+    (version "1.20.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "singscore" version))
+              (sha256
+               (base32
+                "1s1kyvkbfgwskf0hi4b44c2yx256rjp1yk9ijpld9qlm7z7pi67q"))))
+    (properties `((upstream-name . "singscore")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-biobase
+                             r-biocparallel
+                             r-edger
+                             r-ggplot2
+                             r-ggrepel
+                             r-gseabase
+                             r-magrittr
+                             r-matrixstats
+                             r-plotly
+                             r-plyr
+                             r-rcolorbrewer
+                             r-reshape
+                             r-reshape2
+                             r-s4vectors
+                             r-summarizedexperiment
+                             r-tidyr))
+    (native-inputs (list r-knitr))
+    (home-page "https://davislaboratory.github.io/singscore/")
+    (synopsis "Rank-based single-sample gene set scoring method")
+    (description
+     "This package provides a simple single-sample gene signature scoring
+method that uses rank-based statistics to analyze the sample's gene expression
+profile.  It scores the expression activities of gene sets at a single-sample
+level.")
+    (license license:gpl3)))
+
 (define-public r-tkwidgets
   (package
     (name "r-tkwidgets")
-- 
cgit 1.4.1


From 9d45783d777eda4874570f5cba29a9e4be9a0abf Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:00:19 +0200
Subject: gnu: Add r-spatialexperiment.

* gnu/packages/bioconductor.scm (r-spatialexperiment): New variable.
---
 gnu/packages/bioconductor.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index c7f99d82b4..656bb1a9c0 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -19426,6 +19426,38 @@ operations on sparse matrices.  Currently, the optimizations are limited to
 data in the column sparse format.")
     (license license:expat)))
 
+(define-public r-spatialexperiment
+  (package
+    (name "r-spatialexperiment")
+    (version "1.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "SpatialExperiment" version))
+              (sha256
+               (base32
+                "18fcfyjvp9nzadlicsnz62wva8ik0z6jqg1b906avm2vk6rbxw70"))))
+    (properties `((upstream-name . "SpatialExperiment")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-biocfilecache
+                             r-biocgenerics
+                             r-dropletutils
+                             r-magick
+                             r-rjson
+                             r-s4vectors
+                             r-singlecellexperiment
+                             r-summarizedexperiment))
+    (native-inputs (list r-knitr))
+    (home-page "https://github.com/drighelli/SpatialExperiment")
+    (synopsis "S4 class for spatially resolved -omics data")
+    (description
+     "This package defines an S4 class for storing data from spatial -omics
+experiments.  The class extends SingleCellExperiment to support storage and
+retrieval of additional information from spot-based and molecule-based
+platforms, including spatial coordinates, images, and image metadata.  A
+specialized constructor function is included for data from the 10x Genomics
+Visium platform.")
+    (license license:gpl3)))
+
 (define-public r-delayedmatrixstats
   (package
     (name "r-delayedmatrixstats")
-- 
cgit 1.4.1


From 5a20a14c3e0ccf762b54d60ef176b72b1e565c61 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:03:01 +0200
Subject: gnu: Add r-raggedexperiment.

* gnu/packages/bioconductor.scm (r-raggedexperiment): New variable.
---
 gnu/packages/bioconductor.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 656bb1a9c0..bab399a9e9 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -7363,6 +7363,39 @@ matrix to solve the memory problem.")
 the Human Protein Atlas project.")
     (license license:artistic2.0)))
 
+(define-public r-raggedexperiment
+  (package
+    (name "r-raggedexperiment")
+    (version "1.24.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "RaggedExperiment" version))
+              (sha256
+               (base32
+                "1xs7dz5mkh9zs078g2a0izij8vxrwhzh7gyjglp057gicsca0hal"))))
+    (properties `((upstream-name . "RaggedExperiment")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-biocgenerics
+                             r-genomeinfodb
+                             r-genomicranges
+                             r-iranges
+                             r-matrix
+                             r-matrixgenerics
+                             r-s4vectors
+                             r-summarizedexperiment))
+    (native-inputs (list r-knitr))
+    (home-page "https://bioconductor.org/packages/RaggedExperiment")
+    (synopsis "Representation of sparse experiments and assays across samples")
+    (description
+     "This package provides a flexible representation of copy number,
+mutation, and other data that fit into the ragged array schema for genomic
+location data.  The basic representation of such data provides a rectangular
+flat table interface to the user with range information in the rows and
+samples/specimen in the columns.  The @code{RaggedExperiment} class derives
+from a @code{GRangesList} representation and provides a semblance of a
+rectangular dataset.")
+    (license license:artistic2.0)))
+
 (define-public r-rhtslib
   (package
     (name "r-rhtslib")
-- 
cgit 1.4.1


From efec1a8453380c61bf87e978a91989267b91ac4c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:04:12 +0200
Subject: gnu: Add r-mfuzz.

* gnu/packages/bioconductor.scm (r-mfuzz): New variable.
---
 gnu/packages/bioconductor.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index bab399a9e9..b60b98d7bb 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -7810,6 +7810,26 @@ resolution 5hmC data from experimental protocols such as oxBS-Seq and
 TAB-Seq.")
     (license license:artistic2.0)))
 
+(define-public r-mfuzz
+  (package
+    (name "r-mfuzz")
+    (version "2.60.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "Mfuzz" version))
+              (sha256
+               (base32
+                "0rfna5ycwkx4xb2gv1wpfn7f7nz6f79w5nlkb7719l5730d81wnz"))))
+    (properties `((upstream-name . "Mfuzz")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-biobase r-e1071 r-tkwidgets))
+    (home-page "http://mfuzz.sysbiolab.eu/")
+    (synopsis "Soft clustering of time series gene expression data")
+    (description
+     "This is a package for noise-robust soft clustering of gene expression
+time-series data (including a graphical user interface).")
+    (license license:gpl2)))
+
 (define-public r-mmuphin
   (package
     (name "r-mmuphin")
-- 
cgit 1.4.1


From e74e9f62405e6ff20f2a23c2c6c64c7007c52b9e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:05:09 +0200
Subject: gnu: r-cellid: Move out of experiments section.

* gnu/packages/bioconductor.scm (r-cellid): Move from experiments section to
packages section.
---
 gnu/packages/bioconductor.scm | 90 +++++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index b60b98d7bb..b19daa2e3f 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -1436,51 +1436,6 @@ curated cell type labels, for use in procedures like automated annotation of
 single-cell data or deconvolution of bulk RNA-seq.")
     (license license:gpl3)))
 
-(define-public r-cellid
-  (package
-    (name "r-cellid")
-    (version "1.8.1")
-    (source (origin
-              (method url-fetch)
-              (uri (bioconductor-uri "CelliD" version))
-              (sha256
-               (base32
-                "0vigvqjrlqbi5kviaj8qvyq3v8afgbc5pjrz7zmx2ckf4hdp0g03"))))
-    (properties `((upstream-name . "CelliD")))
-    (build-system r-build-system)
-    (propagated-inputs
-     (list r-data-table
-           r-biocparallel
-           r-fastmatch
-	   r-fgsea
-           r-ggplot2
-           r-glue
-           r-irlba
-           r-matrix
-           r-matrixstats
-           r-pbapply
-           r-rcpp
-           r-rcpparmadillo
-           r-reticulate
-           r-rtsne
-           r-seurat
-           r-stringr
-           r-tictoc
-	   r-singlecellexperiment
-           r-summarizedexperiment
-           r-umap))
-    (native-inputs (list r-knitr r-scater))
-    (home-page "https://bioconductor.org/packages/CelliD")
-    (synopsis
-     "Single cell gene signature extraction using multiple correspondence analysis")
-    (description
-     "CelliD is a clustering-free method for extracting per-cell gene
-signatures from scRNA-seq.  CelliD allows unbiased cell identity recognition
-across different donors, tissues-of-origin, model organisms and single-cell
-omics protocols.  The package can also be used to explore functional pathways
-enrichment in single cell data.")
-    (license license:gpl3)))
-
 (define-public r-champdata
   (package
     (name "r-champdata")
@@ -4220,6 +4175,51 @@ scRNA-seq data.  A flexible beta-binomial error model that accounts for
 stochastic dropout events as well as systematic allelic imbalance is used.")
     (license license:gpl3)))
 
+(define-public r-cellid
+  (package
+    (name "r-cellid")
+    (version "1.8.1")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "CelliD" version))
+              (sha256
+               (base32
+                "0vigvqjrlqbi5kviaj8qvyq3v8afgbc5pjrz7zmx2ckf4hdp0g03"))))
+    (properties `((upstream-name . "CelliD")))
+    (build-system r-build-system)
+    (propagated-inputs
+     (list r-data-table
+           r-biocparallel
+           r-fastmatch
+	   r-fgsea
+           r-ggplot2
+           r-glue
+           r-irlba
+           r-matrix
+           r-matrixstats
+           r-pbapply
+           r-rcpp
+           r-rcpparmadillo
+           r-reticulate
+           r-rtsne
+           r-seurat
+           r-stringr
+           r-tictoc
+	   r-singlecellexperiment
+           r-summarizedexperiment
+           r-umap))
+    (native-inputs (list r-knitr r-scater))
+    (home-page "https://bioconductor.org/packages/CelliD")
+    (synopsis
+     "Single cell gene signature extraction using multiple correspondence analysis")
+    (description
+     "CelliD is a clustering-free method for extracting per-cell gene
+signatures from scRNA-seq.  CelliD allows unbiased cell identity recognition
+across different donors, tissues-of-origin, model organisms and single-cell
+omics protocols.  The package can also be used to explore functional pathways
+enrichment in single cell data.")
+    (license license:gpl3)))
+
 (define-public r-coverageview
   (package
     (name "r-coverageview")
-- 
cgit 1.4.1


From 2edbfd43aab8ff3a99dee552974b7c0153568ca4 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:06:03 +0200
Subject: gnu: r-missmethyl: Move out of experiments section.

* gnu/packages/bioconductor.scm (r-missmethyl): Move from experiments section
to packages section.
---
 gnu/packages/bioconductor.scm | 100 +++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index b19daa2e3f..f2aecc2fd5 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -1731,56 +1731,6 @@ in Nature Genetics, January 2018.")
 methylation arrays.")
     (license license:artistic2.0)))
 
-(define-public r-missmethyl
-  (package
-    (name "r-missmethyl")
-    (version "1.34.0")
-    (source (origin
-              (method url-fetch)
-              (uri (bioconductor-uri "missMethyl" version))
-              (sha256
-               (base32
-                "1jvrdr57mv93pcbyazcg1bcx1zd0kp72hi1if839gw54hk3igs3h"))))
-    (properties `((upstream-name . "missMethyl")))
-    (build-system r-build-system)
-    (propagated-inputs
-     (list r-annotationdbi
-           r-biasedurn
-           r-biobase
-           r-biocgenerics
-           r-genomicranges
-           r-go-db
-           r-illuminahumanmethylation450kanno-ilmn12-hg19
-           r-illuminahumanmethylation450kmanifest
-           r-illuminahumanmethylationepicanno-ilm10b4-hg19
-           r-illuminahumanmethylationepicmanifest
-           r-iranges
-           r-limma
-           r-methylumi
-           r-minfi
-           r-org-hs-eg-db
-           r-ruv
-           r-s4vectors
-           r-statmod
-           r-stringr
-           r-summarizedexperiment))
-    (native-inputs (list r-knitr))
-    (home-page "https://bioconductor.org/packages/missMethyl")
-    (synopsis "Analyzing Illumina HumanMethylation BeadChip data")
-    (description
-     "This is a package for normalization, testing for differential
-variability and differential methylation and gene set testing for data from
-Illumina's Infinium HumanMethylation arrays.  The normalization procedure is
-subset-quantile within-array normalization (SWAN), which allows Infinium I and
-II type probes on a single array to be normalized together.  The test for
-differential variability is based on an empirical Bayes version of Levene's
-test.  Differential methylation testing is performed using RUV, which can
-adjust for systematic errors of unknown origin in high-dimensional data by
-using negative control probes.  Gene ontology analysis is performed by taking
-into account the number of probes per gene on the array, as well as taking
-into account multi-gene associated probes.")
-    (license license:gpl2)))
-
 (define-public r-msdata
   (package
     (name "r-msdata")
@@ -12850,6 +12800,56 @@ model.")
 methylation arrays.")
     (license license:artistic2.0)))
 
+(define-public r-missmethyl
+  (package
+    (name "r-missmethyl")
+    (version "1.34.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "missMethyl" version))
+              (sha256
+               (base32
+                "1jvrdr57mv93pcbyazcg1bcx1zd0kp72hi1if839gw54hk3igs3h"))))
+    (properties `((upstream-name . "missMethyl")))
+    (build-system r-build-system)
+    (propagated-inputs
+     (list r-annotationdbi
+           r-biasedurn
+           r-biobase
+           r-biocgenerics
+           r-genomicranges
+           r-go-db
+           r-illuminahumanmethylation450kanno-ilmn12-hg19
+           r-illuminahumanmethylation450kmanifest
+           r-illuminahumanmethylationepicanno-ilm10b4-hg19
+           r-illuminahumanmethylationepicmanifest
+           r-iranges
+           r-limma
+           r-methylumi
+           r-minfi
+           r-org-hs-eg-db
+           r-ruv
+           r-s4vectors
+           r-statmod
+           r-stringr
+           r-summarizedexperiment))
+    (native-inputs (list r-knitr))
+    (home-page "https://bioconductor.org/packages/missMethyl")
+    (synopsis "Analyzing Illumina HumanMethylation BeadChip data")
+    (description
+     "This is a package for normalization, testing for differential
+variability and differential methylation and gene set testing for data from
+Illumina's Infinium HumanMethylation arrays.  The normalization procedure is
+subset-quantile within-array normalization (SWAN), which allows Infinium I and
+II type probes on a single array to be normalized together.  The test for
+differential variability is based on an empirical Bayes version of Levene's
+test.  Differential methylation testing is performed using RUV, which can
+adjust for systematic errors of unknown origin in high-dimensional data by
+using negative control probes.  Gene ontology analysis is performed by taking
+into account the number of probes per gene on the array, as well as taking
+into account multi-gene associated probes.")
+    (license license:gpl2)))
+
 (define-public r-methylumi
   (package
     (name "r-methylumi")
-- 
cgit 1.4.1


From c63da4eb52860d50c01213addc274cc2a373d3ac Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:08:02 +0200
Subject: gnu: Add r-survcomp.

* gnu/packages/bioconductor.scm (r-survcomp): New variable.
---
 gnu/packages/bioconductor.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index f2aecc2fd5..af0f39aa8d 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -9671,6 +9671,33 @@ typically represent genomic ranges of interest and the columns represent
 samples.")
     (license license:artistic2.0)))
 
+(define-public r-survcomp
+  (package
+    (name "r-survcomp")
+    (version "1.50.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "survcomp" version))
+              (sha256
+               (base32
+                "1va0ijx3qk3rjhzaflygfwlzn5a670y833qly8in8p5r3al9bdj6"))))
+    (properties `((upstream-name . "survcomp")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-bootstrap
+                             r-ipred
+                             r-kernsmooth
+                             r-prodlim
+                             r-rmeta
+                             r-suppdists
+                             r-survival
+                             r-survivalroc))
+    (home-page "https://www.pmgenomics.ca/bhklab/")
+    (synopsis "Performance assessment and comparison for survival analysis")
+    (description
+     "This is a package for the assessment and comparison of the performance
+of risk prediction (survival) models.")
+    (license license:artistic2.0)))
+
 (define-public r-sva
   (package
     (name "r-sva")
-- 
cgit 1.4.1


From 15b35874b104723c5f1bf39a92469c43e514350f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:09:03 +0200
Subject: gnu: Add r-ggtreeextra.

* gnu/packages/bioconductor.scm (r-ggtreeextra): New variable.
---
 gnu/packages/bioconductor.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index af0f39aa8d..17ad509197 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -10619,6 +10619,36 @@ expressed genes in DNA microarray experiments.")
 fitting of some classes of graphical Markov models.")
     (license license:gpl2+)))
 
+(define-public r-ggtreeextra
+  (package
+    (name "r-ggtreeextra")
+    (version "1.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "ggtreeExtra" version))
+              (sha256
+               (base32
+                "19xikly6ksh03kgpz35wj2d2gdbpikhrk71ahj9ghhkmlwdyjbcr"))))
+    (properties `((upstream-name . "ggtreeExtra")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-cli
+                             r-ggnewscale
+                             r-ggplot2
+                             r-ggtree
+                             r-magrittr
+                             r-rlang
+                             r-tidytree))
+    (native-inputs (list r-knitr))
+    (home-page "https://github.com/YuLab-SMU/ggtreeExtra/")
+    (synopsis
+     "Add geometric layers On circular or other layout tree of ggtree")
+    (description
+     "ggtreeExtra extends the method for mapping and visualizing associated
+data on phylogenetic tree using ggtree.  These associated data can be
+presented on the external panels to circular layout, fan layout, or other
+rectangular layout tree built by ggtree with the grammar of ggplot2.")
+    (license license:gpl3+)))
+
 ;; This is a CRAN package, but it depends on a bunch of Bioconductor packages.
 (define-public r-ggpicrust2
   (package
-- 
cgit 1.4.1


From 1f80d41735612f40ae53c6964c0bc707f1200bbb Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:09:55 +0200
Subject: gnu: Add r-nebulosa.

* gnu/packages/bioconductor.scm (r-nebulosa): New variable.
---
 gnu/packages/bioconductor.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 17ad509197..bf989a8220 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -5335,6 +5335,37 @@ pre-calculated probe set quality scores that were used to define the
 mapping.")
     (license license:artistic2.0)))
 
+(define-public r-nebulosa
+  (package
+    (name "r-nebulosa")
+    (version "1.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "Nebulosa" version))
+              (sha256
+               (base32
+                "0lqm9mfmaxdhhs9di2kjg2rixng78lrrikyp7blmpyqk4c41j3nh"))))
+    (properties `((upstream-name . "Nebulosa")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-ggplot2
+                             r-ks
+                             r-matrix
+                             r-patchwork
+                             r-seurat
+                             r-singlecellexperiment
+                             r-summarizedexperiment))
+    (native-inputs (list r-knitr))
+    (home-page "https://github.com/powellgenomicslab/Nebulosa")
+    (synopsis
+     "Single-cell data visualisation using kernel gene-weighted density estimation")
+    (description
+     "This package provides a enhanced visualization of single-cell data based
+on gene-weighted density estimation.  Nebulosa recovers the signal from
+dropped-out features and allows the inspection of the joint expression from
+multiple features (e.g. genes).  @code{Seurat} and @code{SingleCellExperiment}
+objects can be used within Nebulosa.")
+    (license license:gpl3)))
+
 ;; This is a CRAN package, but it depends on Bioconductor packages.
 (define-public r-nmf
   (package
-- 
cgit 1.4.1


From 72e6324b4ae5a85cbcd08548a5aecdaf390996bd Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:10:47 +0200
Subject: gnu: Add r-seqarray.

* gnu/packages/bioconductor.scm (r-seqarray): New variable.
---
 gnu/packages/bioconductor.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index bf989a8220..1cef5bb0d5 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -9182,6 +9182,36 @@ facilitate unsupervised analysis of any high-dimensional data such as
 single-cell RNA-seq.")
     (license license:artistic2.0)))
 
+(define-public r-seqarray
+  (package
+    (name "r-seqarray")
+    (version "1.40.1")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "SeqArray" version))
+              (sha256
+               (base32
+                "1771vk23psjavvi1nf2z8i2xawygdh4amawlijnskci8y9w4x5dm"))))
+    (properties `((upstream-name . "SeqArray")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-biostrings
+                             r-gdsfmt
+                             r-genomeinfodb
+                             r-genomicranges
+                             r-iranges
+                             r-s4vectors))
+    (native-inputs (list r-knitr))
+    (home-page "https://github.com/zhengxwen/SeqArray")
+    (synopsis
+     "Data management of large-scale whole-genome sequence variant calls")
+    (description
+     "This package supports data management of large-scale whole-genome
+sequencing variant calls with thousands of individuals: genotypic data (e.g.,
+SNVs, indels and structural variation calls) and annotations in SeqArray GDS
+files are stored in an array-oriented and compressed manner, with efficient
+data access using the R programming language.")
+    (license license:gpl3)))
+
 (define-public r-seqlogo
   (package
     (name "r-seqlogo")
-- 
cgit 1.4.1


From 3132fcf7f8e9dda748e3e395c83adfc1de70e52e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:13:42 +0200
Subject: gnu: Add r-globalancova.

* gnu/packages/bioconductor.scm (r-globalancova): New variable.
---
 gnu/packages/bioconductor.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 1cef5bb0d5..e46a9175fa 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -7157,6 +7157,38 @@ profiles and assignment of a status (gain, normal or loss) to each chromosomal
 regions identified.")
     (license license:gpl2)))
 
+(define-public r-globalancova
+  (package
+    (name "r-globalancova")
+    (version "4.18.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "GlobalAncova" version))
+              (sha256
+               (base32
+                "1fld18rmi6rqm2nr549a4740w1iq3mf5df67v9ba6h42r4abs1ar"))))
+    (properties `((upstream-name . "GlobalAncova")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-annotate
+                             r-annotationdbi
+                             r-biobase
+                             r-corpcor
+                             r-dendextend
+                             r-globaltest
+                             r-gseabase
+                             r-vgam))
+    (home-page "https://bioconductor.org/packages/GlobalAncova")
+    (synopsis "Global test for groups of variables via model comparisons")
+    (description
+     "This package supports the computation of an F-test for the association
+between expression values and clinical entities.  In many cases a two way
+layout with gene and a dichotomous group as factors will be considered.
+However, adjustment for other covariates and the analysis of arbitrary
+clinical variables, interactions, gene co-expression, time series data and so
+on is also possible.  The test is carried out by comparison of corresponding
+linear models via the extra sum of squares principle.")
+    (license license:gpl2+)))
+
 (define-public r-globaltest
   (package
     (name "r-globaltest")
-- 
cgit 1.4.1


From 91b1367e902b03ea21a105f8df4110d51465a992 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:15:09 +0200
Subject: gnu: Add r-tcgautils.

* gnu/packages/bioconductor.scm (r-tcgautils): New variable.
---
 gnu/packages/bioconductor.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index e46a9175fa..683ec77213 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -9440,6 +9440,44 @@ profile.  It scores the expression activities of gene sets at a single-sample
 level.")
     (license license:gpl3)))
 
+(define-public r-tcgautils
+  (package
+    (name "r-tcgautils")
+    (version "1.20.2")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "TCGAutils" version))
+              (sha256
+               (base32
+                "0nnfrd5x3mii9adizvz79jinlxn2lhg4civ9v0wwygmdhk7rrm1n"))))
+    (properties `((upstream-name . "TCGAutils")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-annotationdbi
+                             r-biocgenerics
+                             r-genomeinfodb
+                             r-genomicdatacommons
+                             r-genomicfeatures
+                             r-genomicranges
+                             r-iranges
+                             r-multiassayexperiment
+                             r-raggedexperiment
+                             r-rvest
+                             r-s4vectors
+                             r-stringr
+                             r-summarizedexperiment
+                             r-xml2))
+    (native-inputs (list r-knitr))
+    (home-page "https://bioconductor.org/packages/TCGAutils")
+    (synopsis "TCGA utility functions for data management")
+    (description
+     "This package provides a suite of helper functions for checking and
+manipulating TCGA data including data obtained from the @code{curatedTCGAData}
+experiment package.  These functions aim to simplify and make working with
+TCGA data more manageable.  Exported functions include those that import data
+from flat files into Bioconductor objects, convert row annotations, and
+identifier translation via the GDC API.")
+    (license license:artistic2.0)))
+
 (define-public r-tkwidgets
   (package
     (name "r-tkwidgets")
-- 
cgit 1.4.1


From 9cf4d488501d38d13c458669f15588555912f089 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:16:04 +0200
Subject: gnu: Add r-ucell.

* gnu/packages/bioconductor.scm (r-ucell): New variable.
---
 gnu/packages/bioconductor.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 683ec77213..8f0c3759d7 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -17291,6 +17291,37 @@ non-parametric testing for statistical significance in Ct values between
 features (e.g.  genes, microRNAs).")
     (license license:artistic2.0)))
 
+(define-public r-ucell
+  (package
+    (name "r-ucell")
+    (version "2.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "UCell" version))
+              (sha256
+               (base32
+                "01qcwmiqri4xvwr3j4k1g062rfj6bbc0bvh0ifq1jq2xrm1azw9y"))))
+    (properties `((upstream-name . "UCell")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-biocneighbors
+                             r-biocparallel
+                             r-data-table
+                             r-matrix
+                             r-singlecellexperiment
+                             r-summarizedexperiment))
+    (native-inputs (list r-knitr))
+    (home-page "https://github.com/carmonalab/UCell")
+    (synopsis "Rank-based signature enrichment analysis for single-cell data")
+    (description
+     "UCell is a package for evaluating gene signatures in single-cell datasets.
+UCell signature scores, based on the Mann-Whitney U statistic, are robust to
+dataset size and heterogeneity, and their calculation demands less computing
+time and memory than other available methods, enabling the processing of large
+datasets in a few minutes even on machines with limited computing power.
+UCell can be applied to any single-cell data matrix, and includes functions to
+directly interact with SingleCellExperiment and Seurat objects.")
+    (license license:gpl3)))
+
 (define-public r-unifiedwmwqpcr
   (package
     (name "r-unifiedwmwqpcr")
-- 
cgit 1.4.1


From a4dc8edcedb98fa37224b287e24260ac4946a86d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:17:01 +0200
Subject: gnu: Add r-beaddatapackr.

* gnu/packages/bioconductor.scm (r-beaddatapackr): New variable.
---
 gnu/packages/bioconductor.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 8f0c3759d7..d8ce480486 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -19283,6 +19283,26 @@ matrices.")
 performs copy number calculations and reports.")
     (license license:gpl2)))
 
+(define-public r-beaddatapackr
+  (package
+    (name "r-beaddatapackr")
+    (version "1.52.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "BeadDataPackR" version))
+              (sha256
+               (base32
+                "0hm4brxg2rxazdcnhjiz6f4di2q8wssrrp35m79vm93sac9w42y3"))))
+    (properties `((upstream-name . "BeadDataPackR")))
+    (build-system r-build-system)
+    (native-inputs (list r-knitr))
+    (home-page "https://bioconductor.org/packages/BeadDataPackR")
+    (synopsis "Compression of Illumina BeadArray data")
+    (description
+     "This package provides functionality for the compression and
+decompression of raw bead-level data from the Illumina BeadArray platform.")
+    (license license:gpl2)))
+
 ;; This package includes files that have been taken from kentutils.  Some
 ;; parts of kentutils are not released under a free license, but this package
 ;; only uses files that are also found in the free parts of kentutils.
-- 
cgit 1.4.1


From 5be6946e19433edb08f99adab7d288ab6f88978a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:17:58 +0200
Subject: gnu: Add r-beadarray.

* gnu/packages/bioconductor.scm (r-beadarray): New variable.
---
 gnu/packages/bioconductor.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index d8ce480486..14f8e54c1f 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -19263,6 +19263,39 @@ variety of commonly used matrix types, including sparse and HDF5-backed
 matrices.")
     (license license:gpl3)))
 
+(define-public r-beadarray
+  (package
+    (name "r-beadarray")
+    (version "2.50.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "beadarray" version))
+              (sha256
+               (base32
+                "0rd41193rq6v4a97ibp0l2bz140nsv91plhn7iim8d8n9hgxqhjp"))))
+    (properties `((upstream-name . "beadarray")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-annotationdbi
+                             r-beaddatapackr
+                             r-biobase
+                             r-biocgenerics
+                             r-genomicranges
+                             r-ggplot2
+                             r-hexbin
+                             r-illuminaio
+                             r-iranges
+                             r-limma
+                             r-reshape2))
+    (native-inputs (list r-knitr))
+    (home-page "https://bioconductor.org/packages/beadarray")
+    (synopsis
+     "Quality assessment and low-level analysis for Illumina BeadArray data")
+    (description
+     "The package is able to read bead-level data (raw TIFFs and text files)
+output by BeadScan as well as bead-summary data from BeadStudio.  Methods for
+quality assessment and low-level analysis are provided.")
+    (license license:expat)))
+
 (define-public r-beadarraysnp
   (package
     (name "r-beadarraysnp")
-- 
cgit 1.4.1


From 571ad39628bb994d34fc43557f14f31cce1e8525 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:20:08 +0200
Subject: gnu: Add r-gwastools.

* gnu/packages/bioconductor.scm (r-gwastools): New variable.
---
 gnu/packages/bioconductor.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 14f8e54c1f..026fb436e3 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -20317,6 +20317,37 @@ with your data.")
 EMBL-EBI GWAS catalog.")
     (license license:artistic2.0)))
 
+(define-public r-gwastools
+  (package
+    (name "r-gwastools")
+    (version "1.46.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "GWASTools" version))
+              (sha256
+               (base32
+                "1g86xg2d9wi6xijhc89zxhbw190aviw9nkwvbwgz85jf71wf34hv"))))
+    (properties `((upstream-name . "GWASTools")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-biobase
+                             r-data-table
+                             r-dbi
+                             r-dnacopy
+                             r-gdsfmt
+                             r-gwasexacthw
+                             r-lmtest
+                             r-logistf
+                             r-quantsmooth
+                             r-rsqlite
+                             r-sandwich
+                             r-survival))
+    (home-page "https://github.com/smgogarten/GWASTools")
+    (synopsis "Tools for Genome Wide Association Studies")
+    (description
+     "This package provides classes for storing very large GWAS data sets and
+annotation, and functions for GWAS data cleaning and analysis.")
+    (license license:artistic2.0)))
+
 (define-public r-kegggraph
   (package
     (name "r-kegggraph")
-- 
cgit 1.4.1


From 45bf1a9a6b2791037a318a2ea8a337f4c617c98c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:23:32 +0200
Subject: import/utils: Add more initial words to beautify-description.

* guix/import/utils.scm (beautify-description): Add "Classes" and "Tools" to
initial words to be prefixed with "This package provides".
---
 guix/import/utils.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 5176f12a31..2ffc13bae3 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2012, 2013, 2018, 2019, 2020, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 Jelle Licht <jlicht@fsfe.org>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
-;;; Copyright © 2017, 2019, 2020, 2022 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2017, 2019, 2020, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
 ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com>
@@ -342,7 +342,8 @@ LENGTH characters."
                             (char-set #\space #\newline))))
          (new-words
           (match words
-            (((and (or "A" "Functions" "Methods") first) . rest)
+            (((and (or "A" "Classes" "Functions" "Methods" "Tools")
+                   first) . rest)
              (cons* "This" "package" "provides"
                     (string-downcase first) rest))
             (((and (or "Contains"
-- 
cgit 1.4.1


From 3fa6c2b1cb65d860419e67638be9335dfbdda56f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:25:41 +0200
Subject: gnu: Add r-rtcgatoolbox.

* gnu/packages/bioconductor.scm (r-rtcgatoolbox): New variable.
---
 gnu/packages/bioconductor.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 026fb436e3..9cf7a522d1 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -8909,6 +8909,46 @@ tab-delimited (tabix) files.")
      "This package models a RESTful service as if it were a nested R list.")
     (license license:artistic2.0)))
 
+(define-public r-rtcgatoolbox
+  (package
+    (name "r-rtcgatoolbox")
+    (version "2.30.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "RTCGAToolbox" version))
+              (sha256
+               (base32
+                "03p5rgjzc1265q60jkvk92vhcib5wdnv6bz997r70q9c39y03wm5"))))
+    (properties `((upstream-name . "RTCGAToolbox")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-biocgenerics
+                             r-data-table
+                             r-delayedarray
+                             r-genomeinfodb
+                             r-genomicranges
+                             r-httr
+                             r-raggedexperiment
+                             r-rcircos
+                             r-rcurl
+                             r-rjsonio
+                             r-rvest
+                             r-s4vectors
+                             r-stringr
+                             r-summarizedexperiment
+                             r-tcgautils))
+    (native-inputs (list r-knitr))
+    (home-page "http://mksamur.github.io/RTCGAToolbox/")
+    (synopsis "Export TCGA Firehose data")
+    (description
+     "Managing data from large scale projects such as The Cancer Genome
+Atlas (TCGA) for further analysis is an important and time consuming step for
+research projects.  Several efforts, such as Firehose project, make TCGA
+pre-processed data publicly available via web services and data portals but it
+requires managing, downloading and preparing the data for following steps.
+This package provides an extensible R based data client for Firehose
+pre-processed data.")
+    (license license:gpl2)))
+
 (define-public r-rtracklayer
   (package
     (name "r-rtracklayer")
-- 
cgit 1.4.1


From 16a05db0ac8e9d405895e120f419ed25bb8d108d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:26:13 +0200
Subject: gnu: Add r-spectra.

* gnu/packages/bioconductor.scm (r-spectra): New variable.
---
 gnu/packages/bioconductor.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 9cf7a522d1..73068bab4a 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -9714,6 +9714,37 @@ into features.  These features can be processed with any number of statistical
 tools either included in speaq or available elsewhere on CRAN.")
     (license license:asl2.0)))
 
+(define-public r-spectra
+  (package
+    (name "r-spectra")
+    (version "1.10.1")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "Spectra" version))
+              (sha256
+               (base32
+                "0vq5ha5m1vny7nrhgfmmkjd30zv0xaignp1a1m0xj08lnhkkmd69"))))
+    (properties `((upstream-name . "Spectra")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-biocgenerics
+                             r-biocparallel
+                             r-fs
+                             r-iranges
+                             r-mscoreutils
+                             r-protgenerics
+                             r-s4vectors))
+    (native-inputs (list r-knitr))
+    (home-page "https://github.com/RforMassSpectrometry/Spectra")
+    (synopsis "Spectra infrastructure for mass spectrometry data")
+    (description
+     "The Spectra package defines an efficient infrastructure for storing and
+handling mass spectrometry spectra and functionality to subset, process,
+visualize and compare spectra data.  It provides different
+implementations (backends) to store mass spectrometry data.  These comprise
+backends tuned for fast data access and processing and backends for very large
+data sets ensuring a small memory footprint.")
+    (license license:artistic2.0)))
+
 (define-public r-stager
   (package
     (name "r-stager")
-- 
cgit 1.4.1


From 5566f691a28789e8a73be3b9549db0296b30c665 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:26:50 +0200
Subject: gnu: Add r-qfeatures.

* gnu/packages/bioconductor.scm (r-qfeatures): New variable.
---
 gnu/packages/bioconductor.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 73068bab4a..d9d9274095 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -10416,6 +10416,41 @@ arrays (expression/SNP/tiling/exon) at probe-level.  It currently supports
 Affymetrix (CEL files) and NimbleGen arrays (XYS files).")
     (license license:lgpl2.0+)))
 
+(define-public r-qfeatures
+  (package
+    (name "r-qfeatures")
+    (version "1.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "QFeatures" version))
+              (sha256
+               (base32
+                "1xnmd14nf4cqbfxkjsl6af312k7l27ars5g8qdnljylkn8kq276z"))))
+    (properties `((upstream-name . "QFeatures")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-annotationfilter
+                             r-biobase
+                             r-biocgenerics
+                             r-igraph
+                             r-iranges
+                             r-lazyeval
+                             r-mscoreutils
+                             r-multiassayexperiment
+                             r-plotly
+                             r-protgenerics
+                             r-s4vectors
+                             r-summarizedexperiment))
+    (native-inputs (list r-knitr))
+    (home-page "https://github.com/RforMassSpectrometry/QFeatures")
+    (synopsis "Quantitative features for mass spectrometry data")
+    (description
+     "The QFeatures infrastructure enables the management and processing of
+quantitative features for high-throughput mass spectrometry assays.  It
+provides a familiar Bioconductor user experience to manages quantitative data
+across different assay levels (such as peptide spectrum matches, peptides and
+proteins) in a coherent and tractable format.")
+    (license license:artistic2.0)))
+
 (define-public r-quantsmooth
   (package
     (name "r-quantsmooth")
-- 
cgit 1.4.1


From b9bd1bcce995299065252e192c96ae302c9b0e81 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 19 Jul 2023 15:53:28 +0200
Subject: import/utils: beautify-description: Wrap class names in @code{...}.

* guix/import/utils.scm (beautify-description): Add procedure to wrap words in
@code{...} markup.
* tests/import-utils.scm: Add two tests.
---
 guix/import/utils.scm  |  8 +++++++-
 tests/import-utils.scm | 10 +++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 2ffc13bae3..257570e95b 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -335,7 +335,13 @@ LENGTH characters."
                    (cut string-trim-both <> #\')
                    ;; Escape single @ to prevent it from being understood as
                    ;; invalid Texinfo syntax.
-                   (cut regexp-substitute/global #f "@" <> 'pre "@@" 'post)))))
+                   (cut regexp-substitute/global #f "@" <> 'pre "@@" 'post)
+                   ;; Wrap camelCase or PascalCase words in @code{...}.
+                   (lambda (word)
+                     (let ((pattern (make-regexp "([A-Z][a-z]+[A-Z]|[a-z]+[A-Z])")))
+                       (match (list-matches pattern word)
+                         (() word)
+                         (_ (string-append "@code{" word "}")))))))))
          (words
           (string-tokenize (string-trim-both description)
                            (char-set-complement
diff --git a/tests/import-utils.scm b/tests/import-utils.scm
index 1565dd610a..7b078eac05 100644
--- a/tests/import-utils.scm
+++ b/tests/import-utils.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2017, 2022 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2017, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@@ -53,6 +53,14 @@ Differences are hard to spot, e.g. in CLOS vs. GOOPS."))
   "This @@ is not Texinfo syntax.  Neither is this %@@>%."
   (beautify-description "This @ is not Texinfo syntax.  Neither is this %@>%."))
 
+(test-equal "beautify-description: wrap PascalCase words in @code"
+  "The term @code{DelayedMatrix} refers to a class."
+  (beautify-description "The term DelayedMatrix refers to a class."))
+
+(test-equal "beautify-description: do not wrap acronyms in @code"
+  "The term API is not code, but @code{myAPI} might be."
+  (beautify-description "The term API is not code, but myAPI might be."))
+
 (test-equal "license->symbol"
   'license:lgpl2.0
   (license->symbol license:lgpl2.0))
-- 
cgit 1.4.1


From 6a86e2d13adf00688815566d176918e7d3d5216e Mon Sep 17 00:00:00 2001
From: Bruno Victal <mirai@makinata.eu>
Date: Fri, 30 Jun 2023 14:58:12 +0100
Subject: marionette: Allow passing custom OCR arguments.

* gnu/build/marionette.scm (%default-ocrad-arguments): New variable.
(invoke-ocrad-ocr, invoke-tesseract-ocr, marionette-screen-text)
[ocr-arguments]: New argument.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/build/marionette.scm | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm
index b8fba61d06..27c10e3dfe 100644
--- a/gnu/build/marionette.scm
+++ b/gnu/build/marionette.scm
@@ -1,7 +1,8 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016-2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
-;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,6 +37,7 @@
             wait-for-unix-socket
             marionette-control
             wait-for-screen-text
+            %default-ocrad-arguments
             %qwerty-us-keystrokes
             marionette-type
 
@@ -287,23 +289,30 @@ Monitor\")."
      ;; The "quit" command terminates QEMU immediately, with no output.
      (unless (string=? command "quit") (wait-for-monitor-prompt monitor)))))
 
-(define* (invoke-ocrad-ocr image #:key (ocrad "ocrad"))
+(define %default-ocrad-arguments
+  '("--invert" "--scale=10"))
+
+(define* (invoke-ocrad-ocr image #:key (ocrad "ocrad")
+                           (ocr-arguments %default-ocrad-arguments))
   "Invoke the OCRAD command on image, and return the recognized text."
-  (let* ((pipe (open-pipe* OPEN_READ ocrad "-i" "-s" "10" image))
+  (let* ((command (string-join `(,ocrad ,@ocr-arguments ,image)))
+         (pipe (open-input-pipe command))
          (text (get-string-all pipe)))
     (unless (zero? (close-pipe pipe))
       (error "'ocrad' failed" ocrad))
     text))
 
-(define* (invoke-tesseract-ocr image #:key (tesseract "tesseract"))
+(define* (invoke-tesseract-ocr image #:key (tesseract "tesseract")
+                               (ocr-arguments '()))
   "Invoke the TESSERACT command on IMAGE, and return the recognized text."
   (let* ((output-basename (tmpnam))
-         (output-basename* (string-append output-basename ".txt")))
+         (output-basename* (string-append output-basename ".txt"))
+         (arguments (cons* image output-basename ocr-arguments)))
     (dynamic-wind
       (const #t)
       (lambda ()
         (let ((exit-val (status:exit-val
-                         (system* tesseract image output-basename))))
+                         (apply system* tesseract arguments))))
           (unless (zero? exit-val)
             (error "'tesseract' failed" tesseract))
           (call-with-input-file output-basename* get-string-all)))
@@ -311,7 +320,8 @@ Monitor\")."
         (false-if-exception (delete-file output-basename))
         (false-if-exception (delete-file output-basename*))))))
 
-(define* (marionette-screen-text marionette #:key (ocr "ocrad"))
+(define* (marionette-screen-text marionette #:key (ocr "ocrad")
+                                 ocr-arguments)
   "Take a screenshot of MARIONETTE, perform optical character
 recognition (OCR), and return the text read from the screen as a string, along
 the screen dump image used.  Do this by invoking OCR, which should be the file
@@ -324,14 +334,22 @@ if it is not needed."
   ;; Process it via the OCR.
   (cond
    ((string-contains ocr "ocrad")
-    (values (invoke-ocrad-ocr image #:ocrad ocr) image))
+    (values (invoke-ocrad-ocr image
+                              #:ocrad ocr
+                              #:ocr-arguments
+                              (or ocr-arguments %default-ocrad-arguments))
+            image))
    ((string-contains ocr "tesseract")
-    (values (invoke-tesseract-ocr image #:tesseract ocr) image))
+    (values (invoke-tesseract-ocr image
+                                  #:tesseract ocr
+                                  #:ocr-arguments (or ocr-arguments '()))
+            image))
    (else (error "unsupported ocr command"))))
 
 (define* (wait-for-screen-text marionette predicate
                                #:key
                                (ocr "ocrad")
+                               ocr-arguments
                                (timeout 30)
                                pre-action
                                post-action)
@@ -359,7 +377,10 @@ Likewise for POST-ACTION, except it runs at the end of a successful OCR."
                  'ocr-text: last-text
                  'screendump: screendump-backup))
         (let* ((_ (and (procedure? pre-action) (pre-action)))
-               (text screendump (marionette-screen-text marionette #:ocr ocr))
+               (text screendump
+                     (marionette-screen-text marionette
+                                             #:ocr ocr
+                                             #:ocr-arguments ocr-arguments))
                (_ (and (procedure? post-action) (post-action)))
                (result (predicate text)))
           (cond (result
-- 
cgit 1.4.1


From ab2abe16debaae362ea04f32d66332423d2dba1b Mon Sep 17 00:00:00 2001
From: Bruno Victal <mirai@makinata.eu>
Date: Fri, 30 Jun 2023 14:58:13 +0100
Subject: tests: gdm: Prefer OCR to delay.

* gnu/tests/gdm.scm (run-gdm-test): Use wait-for-screen-text instead of sleep.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/tests/gdm.scm | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/gnu/tests/gdm.scm b/gnu/tests/gdm.scm
index ec1df4b797..6779337e09 100644
--- a/gnu/tests/gdm.scm
+++ b/gnu/tests/gdm.scm
@@ -19,6 +19,7 @@
 (define-module (gnu tests gdm)
   #:use-module (gnu tests)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages ocr)
   #:use-module (gnu services)
   #:use-module (gnu services desktop)
   #:use-module (gnu services xorg)
@@ -57,6 +58,7 @@
       #~(begin
           (use-modules (gnu build marionette)
                        (ice-9 format)
+                       (srfi srfi-26)
                        (srfi srfi-64))
 
           (let ((marionette (make-marionette (list #$vm)))
@@ -73,11 +75,19 @@
                   (start-service 'xorg-server))
                marionette))
 
-            (test-assert "gdm ready"
-              (wait-for-file "/var/run/gdm/gdm.pid" marionette))
-
-            ;; waiting for gdm.pid is not enough, tests may still sporadically fail.
-            (sleep 1)
+            (test-group "gdm ready"
+              (test-assert "PID file present"
+                (wait-for-file "/var/run/gdm/gdm.pid" marionette))
+
+              ;; Waiting for gdm.pid is not enough, tests may still sporadically
+              ;; fail; ensure that the login screen is up.
+              ;; XXX: GNU Ocrad works but with '--invert' only.
+              (test-assert "login screen up"
+                (wait-for-screen-text marionette
+                                      (cut string-contains <> "Guix")
+                                      #:ocr #$(file-append ocrad "/bin/ocrad")
+                                      #:ocr-arguments '("--invert")
+                                      #:timeout 120))) ;for slow systems
 
             (test-equal (string-append "session-type is " expected-session-type)
               expected-session-type
-- 
cgit 1.4.1


From 95424292993551854fb7373cef997fd39340ea4b Mon Sep 17 00:00:00 2001
From: Bruno Victal <mirai@makinata.eu>
Date: Fri, 30 Jun 2023 14:58:14 +0100
Subject: tests: xvnc: Group up GDM test and use GNU Ocrad instead of
 Tesseract.

* gnu/tests/vnc.scm (run-xvnc-test): Group up GDM test.  Use GNU Ocrad.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/tests/vnc.scm | 70 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/gnu/tests/vnc.scm b/gnu/tests/vnc.scm
index 5c4bd43fa3..a34bc466b7 100644
--- a/gnu/tests/vnc.scm
+++ b/gnu/tests/vnc.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>.
+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -104,6 +105,8 @@
               (operating-system os)
               (memory-size 1024)))
 
+  (define ocr (file-append ocrad "/bin/ocrad"))
+
   (define test
     (with-imported-modules (source-module-closure
                             '((gnu build marionette)
@@ -152,43 +155,48 @@ gsettings get org.gnome.settings-daemon.plugins.power sleep-inactive-ac-type \
 | grep -Fq nothing"))
                marionette))
 
-            (test-assert "vnc lands on the gdm login screen"
+            (test-group "vnc lands on the gdm login screen"
               ;; This test runs vncviewer on the local VM and verifies that it
               ;; manages to access the GDM login screen (via XDMCP).
-              (begin
-                (define (ratpoison-abort)
-                  (marionette-control "sendkey ctrl-g" marionette))
-
-                (define (ratpoison-help)
-                  (marionette-control "sendkey ctrl-t" marionette)
-                  (marionette-type "?" marionette)
-                  (sleep 1))            ;wait for help screen to appear
-
-                (define (ratpoison-exec command)
-                  (marionette-control "sendkey ctrl-t" marionette)
-                  (marionette-type "!" marionette)
-                  (marionette-type (string-append command "\n") marionette))
-
-                ;; Wait until the ratpoison help screen can be displayed; this
-                ;; means the window manager is ready.
+              (define (ratpoison-abort)
+                (marionette-control "sendkey ctrl-g" marionette))
+
+              (define (ratpoison-help)
+                (marionette-control "sendkey ctrl-t" marionette)
+                (marionette-type "?" marionette)
+                (sleep 1))              ;wait for help screen to appear
+
+              (define (ratpoison-exec command)
+                (marionette-control "sendkey ctrl-t" marionette)
+                (marionette-type "!" marionette)
+                (marionette-type (string-append command "\n") marionette))
+
+              ;; Wait until the ratpoison help screen can be displayed; this
+              ;; means the window manager is ready.
+              ;; XXX: The letters are half of the height preferred by
+              ;; GNU Ocrad, scale it by 2.
+              (test-assert "window manager is ready"
                 (wait-for-screen-text marionette
                                       (cut string-contains <> "key bindings")
-                                      #:ocr #$(file-append tesseract-ocr
-                                                           "/bin/tesseract")
+                                      #:ocr #$ocr
+                                      #:ocr-arguments '("--scale=2")
                                       #:pre-action ratpoison-help
-                                      #:post-action ratpoison-abort)
-
-                ;; Run vncviewer and expect the GDM login screen (accessed via
-                ;; XDMCP).  This can take a while to appear on slower machines.
-                (ratpoison-exec "vncviewer localhost:5905")
-                ;; XXX: tesseract narrowly recognizes "Guix" as "uix" from the
-                ;; background image; ocrad fares worst.  Sadly, 'Username' is
-                ;; not recognized at all.
+                                      #:post-action ratpoison-abort))
+
+              ;; Run vncviewer and expect the GDM login screen (accessed via
+              ;; XDMCP).  This can take a while to appear on slower machines.
+              (ratpoison-exec "vncviewer localhost:5905")
+
+              (test-assert "GDM login screen ready"
+                ;; XXX: The '--invert' argument as the sole option to GNU
+                ;; Ocrad is required for it to recognize "Guix" from the
+                ;; background image.  'Username' from the UI would be a better
+                ;; choice but is not recognized at all.
                 (wait-for-screen-text marionette
-                                      (cut string-contains <> "uix")
-                                      #:ocr #$(file-append tesseract-ocr
-                                                           "/bin/tesseract")
-                                      #:timeout 120)))
+                                      (cut string-contains <> "Guix")
+                                      #:ocr #$ocr
+                                      #:ocr-arguments '("--invert")
+                                      #:timeout 120))) ;for slow systems
 
             (test-end)))))
 
-- 
cgit 1.4.1


From 1edbadc6b49adda050a87057e6501c961888d7bb Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Wed, 19 Jul 2023 10:18:48 -0400
Subject: tests: xvnc: Fix 'gdm auto-suspend is disabled' test.

This failure is another collateral from commit a09c7da ("tests: Fork and exec
a new Guile for the marionette REPL."), which isolated the marionette
evaluation environment from that of the host.

* gnu/tests/vnc.scm (run-xvnc-test): Move the (guix build utils) import to...
["gdm auto-suspend is disabled"]: ... inside the marionette-eval of this
test.  Complete comment.

Reported-by: Bruno Victal <mirai@makinata.eu>
---
 gnu/tests/vnc.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/tests/vnc.scm b/gnu/tests/vnc.scm
index a34bc466b7..ab1c2749f3 100644
--- a/gnu/tests/vnc.scm
+++ b/gnu/tests/vnc.scm
@@ -113,7 +113,6 @@
                               (guix build utils)))
       #~(begin
           (use-modules (gnu build marionette)
-                       (guix build utils)
                        (srfi srfi-26)
                        (srfi srfi-64))
 
@@ -144,11 +143,12 @@
               ;; check it here.
               (marionette-eval
                '(begin
+                  (use-modules (guix build utils))
                   ;; Check that DCONF_PROFILE is set...
                   (invoke "/bin/sh" "-lc" "\
 pgrep gdm | head -n1 | xargs -I{} grep -Fq DCONF_PROFILE /proc/{}/environ")
 
-                  ;; ... and that
+                  ;; ... and that 'sleep-inactive-ac-type' is unset.
                   (invoke "/bin/sh" "-lc" "\
 sudo -E -u gdm env DCONF_PROFILE=/etc/dconf/profile/gdm dbus-run-session \
 gsettings get org.gnome.settings-daemon.plugins.power sleep-inactive-ac-type \
-- 
cgit 1.4.1


From 1d837aaa32a3a2de8f4a1ac391f92effba50834e Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Wed, 19 Jul 2023 10:28:35 -0400
Subject: tests: lightdm: Bump timeout waiting for screen text to 60 seconds.

This is to avoid non-deterministic failures on slower machines.

* gnu/tests/lightdm.scm (run-lightdm-test) <wait-for-screen-text>: Bump
timeout to 60 s (from the default 30 s).
---
 gnu/tests/lightdm.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/tests/lightdm.scm b/gnu/tests/lightdm.scm
index f1c3b67c8a..0fd809a984 100644
--- a/gnu/tests/lightdm.scm
+++ b/gnu/tests/lightdm.scm
@@ -137,7 +137,8 @@
               (wait-for-screen-text marionette
                                     (cut string-contains <> "Log In")
                                     #:ocr #$(file-append tesseract-ocr
-                                                         "/bin/tesseract")))
+                                                         "/bin/tesseract")
+                                    #:timeout 60)) ;for slow systems
 
             (test-assert "can connect to TCP port 5900 on IPv4"
               (wait-for-tcp-port 5900 marionette))
-- 
cgit 1.4.1


From 4267580a53e76e1ebbbe3ace7fcb3baa7620cb6f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:03 +0200
Subject: gnu: tpacpi-bat: Update to 3.2.

* gnu/packages/linux.scm (tpacpi-bat): Update to 3.2.
[arguments]: Don't explicitly return #t from phases.
linux tpacpi-bat
---
 gnu/packages/linux.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 39503de6ff..7f9a835d5f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -6357,7 +6357,7 @@ from userspace.")
 (define-public tpacpi-bat
   (package
     (name "tpacpi-bat")
-    (version "3.1")
+    (version "3.2")
     (source
      (origin
        (method git-fetch)
@@ -6366,7 +6366,7 @@ from userspace.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0wbaz34z99gqx721alh5vmpxpj2yxg3x9m8jqyivfi1wfpwc2nd5"))))
+        (base32 "0nd8s2bqbhl0sjpflphb4l9ix71p7kvnbvkq4dg9a1v0sxafyygm"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no test target
@@ -6380,8 +6380,7 @@ from userspace.")
                ;; tpacpi-bat modprobes the acpi_call kernel module if it's not
                ;; loaded.  That's the administrator's prerogative; disable it.
                (("system \"(modprobe .*)\"" _ match)
-                (format #f "die \"Please run ‘~a’ first.\\n\"" match)))
-             #t))
+                (format #f "die \"Please run ‘~a’ first.\\n\"" match)))))
          (delete 'configure)            ; nothing to configure
          (delete 'build)                ; nothing to build
          (replace 'install
@@ -6396,8 +6395,7 @@ from userspace.")
                            (let ((target (string-append doc "/" file)))
                              (mkdir-p (dirname target))
                              (copy-recursively file target)))
-                         (list "battery_asl" "examples" "README.md"))
-               #t))))))
+                         (list "battery_asl" "examples" "README.md"))))))))
     (inputs
      (list perl))
     (home-page "https://github.com/teleshoes/tpacpi-bat")
-- 
cgit 1.4.1


From e0c434ee729f3275c501512f746facc13e1f956e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: tpacpi-bat: Fix cross-compilation.

* gnu/packages/linux.scm (tpacpi-bat)[arguments]: Use SEARCH-INPUT-FILE.
[inputs]: Add coreutils-minimal.
---
 gnu/packages/linux.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 7f9a835d5f..f3b52b0331 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -6373,10 +6373,10 @@ from userspace.")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'refer-to-inputs
-           (lambda _
+           (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "tpacpi-bat"
                (("cat ")
-                (format #f "~a " (which "cat")))
+                (string-append (search-input-file inputs "bin/cat") " "))
                ;; tpacpi-bat modprobes the acpi_call kernel module if it's not
                ;; loaded.  That's the administrator's prerogative; disable it.
                (("system \"(modprobe .*)\"" _ match)
@@ -6397,7 +6397,8 @@ from userspace.")
                              (copy-recursively file target)))
                          (list "battery_asl" "examples" "README.md"))))))))
     (inputs
-     (list perl))
+     (list coreutils-minimal
+           perl))
     (home-page "https://github.com/teleshoes/tpacpi-bat")
     (synopsis "ThinkPad battery charge controller")
     (description
-- 
cgit 1.4.1


From f86cd0280eafa801b3cf41b772de4ec9f3ecd72b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: ytnef: Update to 2.1.2.

* gnu/packages/mail.scm (ytnef): Update to 2.1.2.
---
 gnu/packages/mail.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 8728b11b3a..03ba264a95 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -4159,7 +4159,7 @@ It is a replacement for the @command{urlview} program.")
 (define-public ytnef
   (package
     (name "ytnef")
-    (version "2.0")
+    (version "2.1.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -4168,7 +4168,7 @@ It is a replacement for the @command{urlview} program.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0pk7jp8yc91nahcb7659khwdid0ibfi7n0135kwfnasak8gr75rz"))))
+                "0rwgr98jn86d37xmgj57pl488kw62q7vq8jjicbbqkxl6vjgh1li"))))
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags
-- 
cgit 1.4.1


From 3a63ed24f2a1f25d26948883d88046a50bb94069 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: rspamd: Update to 3.5.

* gnu/packages/mail.scm (rspamd): Update to 3.5.
---
 gnu/packages/mail.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 03ba264a95..f6f03b0150 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -4541,7 +4541,7 @@ on RFC 3501 and original @code{imaplib} module.")
 (define-public rspamd
   (package
     (name "rspamd")
-    (version "3.4")
+    (version "3.5")
     (source
      (origin
        (method git-fetch)
@@ -4549,7 +4549,7 @@ on RFC 3501 and original @code{imaplib} module.")
              (url "https://github.com/rspamd/rspamd")
              (commit version)))
        (sha256
-        (base32 "0jgmi8wqzsnwvfj6w4njzhxhcawbafsdxjkx1ym8r2jx8k4hwhi8"))
+        (base32 "1d45vhs66r6ig5mvmx52i7c2b638y2zc7wgv3lx0pq7dqgjxxsyz"))
        (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (arguments
-- 
cgit 1.4.1


From 33166500d246581207171f213592f4128ffb210f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: gnome-multi-writer: Remove input labels.

* gnu/packages/gnome.scm (gnome-multi-writer)[native-inputs]:
Remove input labels.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8708764416..6e21167cc7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5356,8 +5356,8 @@ floating in an ocean using only your brain and a little bit of luck.")
                (("meson.add_install_script" &) (string-append "# " &)))
              #t)))))
     (native-inputs
-     `(("glib:bin" ,glib "bin")
-       ("pkg-config" ,pkg-config)))
+     (list `(,glib "bin")
+           pkg-config))
     (inputs
      (list gtk+
            glib ; for gio
-- 
cgit 1.4.1


From 4feaefbb277d7b5ae365999a9f9fb247dcc773e2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: gnome-multi-writer: Fix build.

* gnu/packages/gnome.scm (gnome-multi-writer)[native-inputs]: Add gettext-minimal.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6e21167cc7..11085ecc80 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5356,7 +5356,8 @@ floating in an ocean using only your brain and a little bit of luck.")
                (("meson.add_install_script" &) (string-append "# " &)))
              #t)))))
     (native-inputs
-     (list `(,glib "bin")
+     (list gettext-minimal
+           `(,glib "bin")
            pkg-config))
     (inputs
      (list gtk+
-- 
cgit 1.4.1


From 1063a3b5646322b55d806b7858b5c6ce6a2a9508 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: libtraceevent: Update to 1.7.3.

* gnu/packages/linux.scm (libtraceevent): Update to 1.7.3.
---
 gnu/packages/linux.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f3b52b0331..d1a69ab7fc 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -9841,7 +9841,7 @@ older system-wide @file{/sys} interface.")
 (define-public libtraceevent
   (package
     (name "libtraceevent")
-    (version "1.7.1")
+    (version "1.7.3")
     (source
      (origin
        (method git-fetch)
@@ -9850,8 +9850,7 @@ older system-wide @file{/sys} interface.")
              (commit (string-append name "-" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1kbl11lqh8cadi6r3qqxx68idr7597l6i50pr5p5mdgsf6k2i83c"))
+        (base32 "06mw2f0xnk6dy9w2z0n4dz7lnm02qfsmnmj2h24453qxlw57x0d6"))
        (modules '((guix build utils)))
        (snippet
         #~(begin
@@ -9862,14 +9861,14 @@ older system-wide @file{/sys} interface.")
     (build-system gnu-build-system)
     (arguments
      (list
-      #:tests? #f ;no test suite
+      #:tests? #f                       ; no test suite
       #:make-flags
       #~(list
          (string-append "pkgconfig_dir=" #$output "/lib/pkgconfig")
          (string-append "prefix=" #$output))
       #:phases
       #~(modify-phases %standard-phases
-          (delete 'configure))))
+          (delete 'configure))))        ; no configure script
     (home-page "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/")
     (synopsis "Linux kernel trace event library")
     (description "This package provides library to parse raw trace event
-- 
cgit 1.4.1


From 9991028feff0c30145db32166d1d04fff7db2f35 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:00 +0200
Subject: gnu: libtraceevent: Shorten source snippet.

* gnu/packages/linux.scm (libtraceevent)[source]:
Use SUBSTITUTE*'s features.
---
 gnu/packages/linux.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d1a69ab7fc..90a5a9566c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -9854,10 +9854,8 @@ older system-wide @file{/sys} interface.")
        (modules '((guix build utils)))
        (snippet
         #~(begin
-            (substitute* "Makefile"
-              (("/bin/pwd") "pwd"))
-            (substitute* "scripts/utils.mk"
-              (("/bin/pwd") "pwd"))))))
+            (substitute* (list "Makefile" "scripts/utils.mk")
+              (("/bin/(pwd)" _ command) command))))))
     (build-system gnu-build-system)
     (arguments
      (list
-- 
cgit 1.4.1


From 9e983c611ed39832262d40913faa3930e6ca6889 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:03 +0200
Subject: gnu: lesspipe: Update to 2.08.

* gnu/packages/less.scm (lesspipe): Update to 2.08.
---
 gnu/packages/less.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm
index 1ac15c369e..8544f33db6 100644
--- a/gnu/packages/less.scm
+++ b/gnu/packages/less.scm
@@ -63,7 +63,7 @@ text editors.")
 (define-public lesspipe
   (package
     (name "lesspipe")
-    (version "2.07")
+    (version "2.08")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -72,7 +72,7 @@ text editors.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0xci0c575hklb5y6vybvb48938fslb9zw3mlisvspx1p3fplyzrg"))))
+                "00kswzbyys4j5l10y3c3cinrgf0mkzjn1ilqdvs1mkbxlzk33pwc"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -112,7 +112,7 @@ text editors.")
                    (string-append file " -")))))))))
     (inputs
      (list file
-           ncurses  ;; for tput
+           ncurses                      ; for tput
            perl-archive-zip))
     (native-inputs (list perl))
     (home-page "https://github.com/wofr06/lesspipe")
-- 
cgit 1.4.1


From 2ca16e4318bcf5986610490d75f2a333ede31bec Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:04 +0200
Subject: gnu: libnvme: Update to 1.5.

* gnu/packages/linux.scm (libnvme): Update to 1.5.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 90a5a9566c..cf67a63331 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5132,14 +5132,14 @@ Translation (@dfn{SAT}) are also supported.")
 (define-public libnvme
   (package
     (name "libnvme")
-    (version "1.3")
+    (version "1.5")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/linux-nvme/libnvme.git")
                     (commit (string-append "v" version))))
               (sha256
-               (base32 "1fngj5acp2sl4162xalq5simfasnika6gy0xrbi41x09wikvhn7y"))
+               (base32 "1wq8bw60l090z2kb717wyzk5wz1jrcn31ykdaa7k9pz9w79v0v67"))
               (file-name (git-file-name name version))))
     (build-system meson-build-system)
     (arguments
-- 
cgit 1.4.1


From 07f436ce1301c9dc6344b3af03f8a159e35edbbd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: libnvme: Separate :doc files.

Also fix the .rst files being dumped in the root of the output.

* gnu/packages/linux.scm (libnvme)[outputs]: Add "doc".
[arguments]: Install HTML and RST documentation there.
---
 gnu/packages/linux.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index cf67a63331..bfccd1afb7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5142,11 +5142,14 @@ Translation (@dfn{SAT}) are also supported.")
                (base32 "1wq8bw60l090z2kb717wyzk5wz1jrcn31ykdaa7k9pz9w79v0v67"))
               (file-name (git-file-name name version))))
     (build-system meson-build-system)
+    (outputs (list "out" "doc"))        ; docs are 80% of all output
     (arguments
      (list
-      #:configure-flags #~(list (format #f "-Dhtmldir=~a/share/doc/~a/html"
-                                        #$output #$name)
-                                "-Ddocs-build=true" "-Ddocs=all")))
+      #:configure-flags
+      #~(let ((doc (string-append #$output:doc "/share/doc/" #$name)))
+          (list (string-append "-Dhtmldir=" doc "/html")
+                (string-append "-Drstdir=" doc "/rst")
+                "-Ddocs-build=true" "-Ddocs=all"))))
     (native-inputs (list pkg-config perl python python-sphinx))
     ;; libnvme.pc, libnvme-mi.pc lists these in Requires.private.
     (propagated-inputs (list dbus json-c openssl))
-- 
cgit 1.4.1


From 0dafac1cfbdffca8b0f655d85356409fed5bacdf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: nvme-cli: Update to 2.5.

* gnu/packages/linux.scm (nvme-cli): Update to 2.5.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index bfccd1afb7..31e1e78355 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5164,7 +5164,7 @@ and manage nvme devices on a Linux system.")
 (define-public nvme-cli
   (package
     (name "nvme-cli")
-    (version "2.3")
+    (version "2.5")
     (home-page "https://github.com/linux-nvme/nvme-cli")
     (source (origin
               (method git-fetch)
@@ -5172,7 +5172,7 @@ and manage nvme devices on a Linux system.")
                     (url home-page)
                     (commit (string-append "v" version))))
               (sha256
-               (base32 "1f3bhxh2kr94s6glzibrmgxxgs66qyabn8plnw5y0v9cpi78b3qs"))
+               (base32 "1jv1xir6gm86yyk5846qqkcjhc1bq103zyxf794fznyinh4nhlbg"))
               (file-name (git-file-name name version))))
     (build-system meson-build-system)
     (arguments
-- 
cgit 1.4.1


From 236edb05d7aee0e88127a3809ff77786f934aec6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:00 +0200
Subject: gnu: nvme-cli: Separate :doc files.

* gnu/packages/linux.scm (nvme-cli)[outputs]: Add "doc".
[arguments]: Install HTML documentation there.
---
 gnu/packages/linux.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 31e1e78355..221293f5aa 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5175,10 +5175,11 @@ and manage nvme devices on a Linux system.")
                (base32 "1jv1xir6gm86yyk5846qqkcjhc1bq103zyxf794fznyinh4nhlbg"))
               (file-name (git-file-name name version))))
     (build-system meson-build-system)
+    (outputs (list "out" "doc"))        ; docs make up ~70% of total size
     (arguments
      (list
       #:configure-flags #~(list (format #f "-Dhtmldir=~a/share/doc/~a/html"
-                                        #$output #$name)
+                                        #$output:doc #$name)
                                 "-Ddocs=all")))
     (native-inputs (list pkg-config))
     (inputs (list libnvme json-c zlib))
-- 
cgit 1.4.1


From cfbaef68eb61c949c729e75abfcb245d3681d111 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: libinih: Update to 57.

* gnu/packages/linux.scm (libinih): Update to 57.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 221293f5aa..4120355b84 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8858,7 +8858,7 @@ IP addresses and routes, and configure IPsec.")
 (define-public libinih
   (package
     (name "libinih")
-    (version "56")
+    (version "57")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -8867,7 +8867,7 @@ IP addresses and routes, and configure IPsec.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1fjqvf56yij15lgwj58dcmxlq5n98gzpbss0nnn1d2i5j7gf4kgf"))))
+                "03hpyahdkipm5wfalj2xkz6y9ncd9zrlhnf7vap6lr56jj2fz2bb"))))
     (build-system meson-build-system)
     ;; Install static libraries for use by the initrd's xfsprogs/static.
     (outputs (list "out" "static"))
-- 
cgit 1.4.1


From 32e022d574bdb7badca8b5c5d203297d2ffd2fcc Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: xfstests: Update to 1.1.0-2.87f90a2.

This fixes the build.

* gnu/packages/file-systems.scm (xfstests):
Update to 1.1.0-2.87f90a2.
---
 gnu/packages/file-systems.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index a957cc495a..bc286d3bea 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -1207,8 +1207,8 @@ APFS.")
 
 (define-public xfstests
   ;; The last release (1.1.0) is from 2011.
-  (let ((revision "1")
-        (commit "bae1d15f6421cbe99b3e2e134c39d50248e7c261"))
+  (let ((revision "2")
+        (commit "87f90a2dae7a4adb7a0a314e27abae9aa1de78fb"))
     (package
       (name "xfstests")
       (version (git-version "1.1.0" revision commit))
@@ -1220,7 +1220,7 @@ APFS.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "01y7dx5sx1xg3dycqlp2b6azclz3xcnx7vdy2rr6zmf210501xd9"))))
+          (base32 "11p690k7h4f00bd14r60xa8sw34x14bh5rfd6x7j8gbkpsgsidli"))))
       (build-system gnu-build-system)
       (arguments
        `(#:phases
-- 
cgit 1.4.1


From b2066b2ac2551b2e5ff6c3d8fdc51e9c65247dd2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: libbsd: Update to 0.11.7.

* gnu/packages/libbsd.scm (libbsd): Update to 0.11.7.
---
 gnu/packages/libbsd.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libbsd.scm b/gnu/packages/libbsd.scm
index 79f1389081..5abbb2feff 100644
--- a/gnu/packages/libbsd.scm
+++ b/gnu/packages/libbsd.scm
@@ -28,14 +28,14 @@
 (define-public libbsd
   (package
     (name "libbsd")
-    (version "0.11.6")
+    (version "0.11.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://libbsd.freedesktop.org/releases/"
                                   "libbsd-" version ".tar.xz"))
               (sha256
                (base32
-                "1pxmk42brddk43bj8lp4a64f9iwhc5ii91y6w7k97xpaf8qqzcqr"))))
+                "0q82iaynmal3dn132jgjq21p27x3zn8zks88cg02bgzbb5h1ialv"))))
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags #~'("--disable-static")
-- 
cgit 1.4.1


From fcf54c717fced066d173b57debb232d34e2d96fa Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: python-sshtunnel: Fix build.

* gnu/packages/python-xyz.scm (python-sshtunnel)[native-inputs]:
Add python-mock.
---
 gnu/packages/python-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 755b0af4b6..6b5291d0e0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6355,7 +6355,7 @@ utility, a static analysis tool (linter) for Robot Framework source files.")
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests? (invoke "pytest" "-vv" "tests")))))))
     (propagated-inputs (list python-paramiko))
-    (native-inputs (list openssh python-pytest))
+    (native-inputs (list openssh python-pytest python-mock))
     (home-page "https://github.com/pahaz/sshtunnel")
     (synopsis "Python SSH tunnels library")
     (description "@code{sshtunnel} is a Python module for easily creating SSH
-- 
cgit 1.4.1


From 7abf96a2ec4a06ee239c68f700c7e6b9fe3c06b5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:06 +0200
Subject: gnu: frama-c: Build verbosely.

As verbosely as most other packages, that is.

* gnu/packages/maths.scm (frama-c)[arguments]: Add "--enable-verbosemake"
to #:configure-flags.
---
 gnu/packages/maths.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 40c1433284..8bfcd3c4db 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8171,6 +8171,8 @@ of C, Java, or Ada programs.")
     (build-system ocaml-build-system)
     (arguments
      `(#:tests? #f; no test target in Makefile
+       #:configure-flags
+       (list "--enable-verbosemake")    ; to aid debugging
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'export-shell
-- 
cgit 1.4.1


From 29ff5d984dc121d1a93b14aab2004ff57805e885 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 19 Jul 2023 20:27:58 +0200
Subject: gnu: Add texlive-pdfcol.

* gnu/packages/tex.scm (texlive-pdfcol): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b207729919..60c0b0e7dc 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -26700,6 +26700,25 @@ that contain various elements (titles, bars, milestones, groups and links).
 Several keys customize the appearance of the chart elements.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pdfcol
+  (package
+    (name "texlive-pdfcol")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pdfcol/" "source/latex/pdfcol/"
+                   "tex/latex/pdfcol/")
+             (base32
+              "0mr09kyan59xlnxl4a97w2avp1p09w5yyv6v3p498xpjbq3dbwih")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pdfcol")
+    (synopsis "Macros for maintaining colour stacks under pdfTeX")
+    (description
+     "This package is intended for package writers.  It defines macros for
+setting and maintaining new colour stacks.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-pdfcolfoot
   (package
     (name "texlive-pdfcolfoot")
-- 
cgit 1.4.1


From ebb54e6a5fba36a571ed239398ee3e0307a91c26 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 19 Jul 2023 20:28:07 +0200
Subject: gnu: python-nbconvert: Fix build.

This fixes <https://issues.guix.gnu.org/64729>.

* gnu/packages/python-xyz.scm (python-nbconvert)[propagated-inputs]: Add
TEXLIVE-ENVIRON, TEXLIVE-PDFCOL, TEXLIVE-PGF, and TEXLIVE-XETEX.
---
 gnu/packages/python-xyz.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6b5291d0e0..3bb3aae446 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15206,12 +15206,16 @@ time.")
            texlive-xcolor
            (texlive-updmap.cfg
             (list texlive-eurosym
+                  texlive-environ
                   texlive-jknapltx
                   texlive-lm
                   texlive-lm-math
                   texlive-mathpazo
+                  texlive-pdfcol
+                  texlive-pgf
                   texlive-rsfs
                   texlive-ucs
+                  texlive-xetex
                   texlive-zapfding))))
     (home-page "https://jupyter.org")
     (synopsis "Converting Jupyter Notebooks")
-- 
cgit 1.4.1


From e401eff97706dc6cdaf20b01dd12e291d7d13c2b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 19 Jul 2023 21:10:56 +0200
Subject: gnu: python-nbconvert: Remove texlive-updmap.cfg as propagated input.

`texlive-updmap.cfg' builds "updmap.cfg" file for texlive packages in native
inputs, because those do not benefit from the profile hook doing the very same
thing.  Consequently, `texlive-updmap.cfg' should not appear in propagated
inputs.

Moreover, XeTeX do not rely on "updmap.cfg" to find fonts; this is a second
reason to remove it from propagated inputs in this particular package.

* gnu/packages/python-xyz.scm (python-nbconvert)[propagated-inputs]: Remove
TEXLIVE-UPDMAP.CFG call.  Add TEXLIVE-COLLECTION-BASIC.  Remove TEXLIVE-IFTEX,
which is already included in TEXLIVE-COLLECTION-BASIC.  Sort inputs
alphabetically.
---
 gnu/packages/python-xyz.scm | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3bb3aae446..db3e69fb45 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15184,39 +15184,38 @@ time.")
            texlive-adjustbox
            texlive-booktabs
            texlive-caption
+           texlive-collection-basic
            texlive-enumitem
-           texlive-fontspec
-           texlive-iftex
-           texlive-grffile
-           texlive-hyperref
+           texlive-environ
+           texlive-eurosym
            texlive-fancyvrb
            texlive-float
+           texlive-fontspec
            texlive-geometry
+           texlive-grffile
+           texlive-hyperref
+           texlive-jknapltx
            texlive-jknapltx
+           texlive-lm
+           texlive-lm-math
+           texlive-mathpazo
            texlive-ms
            texlive-parskip
-           texlive-trimspaces
-           texlive-upquote
+           texlive-pdfcol
+           texlive-pgf
+           texlive-rsfs
            texlive-stringenc
            texlive-tcolorbox
            texlive-titling
            texlive-tools
+           texlive-trimspaces
+           texlive-ucs
            texlive-ulem
            texlive-unicode-math
+           texlive-upquote
            texlive-xcolor
-           (texlive-updmap.cfg
-            (list texlive-eurosym
-                  texlive-environ
-                  texlive-jknapltx
-                  texlive-lm
-                  texlive-lm-math
-                  texlive-mathpazo
-                  texlive-pdfcol
-                  texlive-pgf
-                  texlive-rsfs
-                  texlive-ucs
-                  texlive-xetex
-                  texlive-zapfding))))
+           texlive-xetex
+           texlive-zapfding))
     (home-page "https://jupyter.org")
     (synopsis "Converting Jupyter Notebooks")
     (description "The @code{nbconvert} tool, @code{jupyter nbconvert}, converts
-- 
cgit 1.4.1


From 4b17711cbcd3e53e2eb1859af83800f78a15a0ab Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:09 +0200
Subject: gnu: setbfree: Update to 0.8.12.

* gnu/packages/music.scm (setbfree): Update to 0.8.12.
[arguments]: Don't explicitly return #t from phases.
---
 gnu/packages/music.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 458d4e827d..25a8e54809 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2635,7 +2635,7 @@ Paul), and specifically the PaulXStretch version from Xenakios.")
 (define-public setbfree
   (package
     (name "setbfree")
-    (version "0.8.11")
+    (version "0.8.12")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2644,7 +2644,7 @@ Paul), and specifically the PaulXStretch version from Xenakios.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1s3ps3cjwlm63ml4izb7mizy8ci5pl9a19lvz62xf0br089h3afc"))))
+                "1lzrrpm57pilvwxpr1qhnx6273md2k96ygxjlhi5gqjdl0nl3z95"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no "check" target
@@ -2663,7 +2663,7 @@ Paul), and specifically the PaulXStretch version from Xenakios.")
        #:phases
        (modify-phases %standard-phases
          (add-before 'build 'set-CC-variable
-           (lambda _ (setenv "CC" "gcc") #t))
+           (lambda _ (setenv "CC" "gcc")))
          (delete 'configure))))
     (inputs
      (list jack-1
-- 
cgit 1.4.1


From 12f0ffe2b85a0758a56146ef766f7a1ccf2e7d47 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: setbfree: Prepare for cross-compilation.

* gnu/packages/music.scm (setbfree)[arguments]: Use CC-FOR-TARGET.
---
 gnu/packages/music.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 25a8e54809..7674af7096 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2663,7 +2663,7 @@ Paul), and specifically the PaulXStretch version from Xenakios.")
        #:phases
        (modify-phases %standard-phases
          (add-before 'build 'set-CC-variable
-           (lambda _ (setenv "CC" "gcc")))
+           (lambda _ (setenv "CC" ,(cc-for-target))))
          (delete 'configure))))
     (inputs
      (list jack-1
-- 
cgit 1.4.1


From 1cf84fb13bae42554f0d37cacac0ad9a9d74cedd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: setbfree: Use G-expressions.

* gnu/packages/music.scm (setbfree)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/music.scm | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 7674af7096..324a800182 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2647,24 +2647,25 @@ Paul), and specifically the PaulXStretch version from Xenakios.")
                 "1lzrrpm57pilvwxpr1qhnx6273md2k96ygxjlhi5gqjdl0nl3z95"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f                      ; no "check" target
-       #:make-flags
-       (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
-             (string-append "FONTFILE="
-                            (assoc-ref %build-inputs "font-bitstream-vera")
-                            "/share/fonts/truetype/VeraBd.ttf")
-             ;; Disable unsupported optimization flags on non-x86
-             ,@(let ((system (or (%current-target-system)
-                                 (%current-system))))
-                 (if (or (string-prefix? "x86_64" system)
-                         (string-prefix? "i686" system))
-                     '()
-                     '("OPTIMIZATIONS=-ffast-math -fomit-frame-pointer -O3"))))
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'build 'set-CC-variable
-           (lambda _ (setenv "CC" ,(cc-for-target))))
-         (delete 'configure))))
+     (list
+      #:tests? #f                       ; no "check" target
+      #:make-flags
+      #~(cons* (string-append "PREFIX=" #$output)
+               (string-append "FONTFILE="
+                              #$(this-package-input "font-bitstream-vera")
+                              "/share/fonts/truetype/VeraBd.ttf")
+               ;; Disable unsupported optimization flags on non-x86
+               (let ((system #$(or (%current-target-system)
+                                   (%current-system))))
+                   (if (or (string-prefix? "x86_64" system)
+                           (string-prefix? "i686" system))
+                       '()
+                       '("OPTIMIZATIONS=-ffast-math -fomit-frame-pointer -O3"))))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'set-CC-variable
+            (lambda _ (setenv "CC" #$(cc-for-target))))
+          (delete 'configure))))
     (inputs
      (list jack-1
            lv2
-- 
cgit 1.4.1


From d6cb55b395cb2e613a26c1acceee3c8623ee5baf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: vc: Update to 1.4.3.

* gnu/packages/maths.scm (vc): Update to 1.4.3.
[arguments]: Don't explicitly return #t from phases.
---
 gnu/packages/maths.scm | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 8bfcd3c4db..12d802268e 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5932,14 +5932,14 @@ supports compressed MAT files, as well as newer (version 7.3) MAT files.")
 (define-public vc
   (package
     (name "vc")
-    (version "1.4.2")
+    (version "1.4.3")
     (source
-      (origin (method url-fetch)
-              (uri (string-append "https://github.com/VcDevel/Vc/releases/"
-                                  "download/" version "/Vc-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0lirdqzcxys9walz04bllsphydynk7973aimd5k1h1qbwi8z3lsh"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/VcDevel/Vc/releases/"
+                           "download/" version "/Vc-" version ".tar.gz"))
+       (sha256
+        (base32 "0zq37r8yisd4dwlb024l10wk2yq9kisa4xm79ia1ggrz7w2s13lq"))))
     (build-system cmake-build-system)
     (arguments
      '(#:configure-flags
@@ -5953,24 +5953,23 @@ supports compressed MAT files, as well as newer (version 7.3) MAT files.")
                     (lambda* (#:key inputs native-inputs #:allow-other-keys)
                       (let ((testdata (assoc-ref (or native-inputs inputs)
                                                  "testdata")))
-                        (copy-recursively testdata "tests/testdata")
-                        #t))))))
+                        (copy-recursively testdata "tests/testdata")))))))
     (native-inputs
      `(("virtest" ,virtest)
 
        ;; This is a submodule in the git project, but not part of the
        ;; released sources.  See the git branch for the commit to take.
-       ("testdata" ,(let ((commit "9ada1f34d6a41f1b5553d6223f277eae72c039d3"))
-                      (origin
-                        (method git-fetch)
-                        (uri (git-reference
-                              (url "https://github.com/VcDevel/vc-testdata")
-                              (commit "9ada1f34d6a41f1b5553d6223f277eae72c039d3")))
-                        (file-name (git-file-name "vc-testdata"
-                                                  (string-take commit 7)))
-                        (sha256
-                         (base32
-                          "1hkhqib03qlcq412ym2dciynfxcdr2ygqhnplz4l1vissr1wnqn2")))))))
+       ("testdata"
+        ,(let ((commit "9ada1f34d6a41f1b5553d6223f277eae72c039d3"))
+           (origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/VcDevel/vc-testdata")
+                   (commit "9ada1f34d6a41f1b5553d6223f277eae72c039d3")))
+             (file-name (git-file-name "vc-testdata" (string-take commit 7)))
+             (sha256
+              (base32
+               "1hkhqib03qlcq412ym2dciynfxcdr2ygqhnplz4l1vissr1wnqn2")))))))
     (synopsis "SIMD vector classes for C++")
     (description "Vc provides portable, zero-overhead C++ types for explicitly
 data-parallel programming.  It is a library designed to ease explicit
-- 
cgit 1.4.1


From 24d4e8182d0cb783d39240e0af4ee5dbf999593f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: vc: Use G-expressions.

* gnu/packages/maths.scm (vc)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/maths.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 12d802268e..8c30e49d8f 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5942,18 +5942,19 @@ supports compressed MAT files, as well as newer (version 7.3) MAT files.")
         (base32 "0zq37r8yisd4dwlb024l10wk2yq9kisa4xm79ia1ggrz7w2s13lq"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:configure-flags
-       '("-DBUILD_TESTING=ON"
-         ;; By default, Vc will optimize for the CPU of the build machine.
-         ;; Setting this to "none" makes it create portable binaries.  See
-         ;; "cmake/OptimizeForArchitecture.cmake".
-         "-DTARGET_ARCHITECTURE=none")
-       #:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'copy-testdata
-                    (lambda* (#:key inputs native-inputs #:allow-other-keys)
-                      (let ((testdata (assoc-ref (or native-inputs inputs)
-                                                 "testdata")))
-                        (copy-recursively testdata "tests/testdata")))))))
+     (list
+      #:configure-flags
+      #~(list "-DBUILD_TESTING=ON"
+              ;; By default, Vc will optimize for the CPU of the build machine.
+              ;; Setting this to "none" makes it create portable binaries.  See
+              ;; "cmake/OptimizeForArchitecture.cmake".
+              "-DTARGET_ARCHITECTURE=none")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'copy-testdata
+            (lambda _
+              (copy-recursively #$(this-package-native-input "testdata")
+                                "tests/testdata"))))))
     (native-inputs
      `(("virtest" ,virtest)
 
-- 
cgit 1.4.1


From 34dbcc1fcef01c58f787c516707f1616e19c6d2d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: strawberry: Update to 1.0.18.

* gnu/packages/music.scm (strawberry): Update to 1.0.18.
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 324a800182..5e4b5f257b 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -553,7 +553,7 @@ you create custom user interfaces for your MIDI hardware.")
 (define-public strawberry
   (package
     (name "strawberry")
-    (version "1.0.17")
+    (version "1.0.18")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -562,7 +562,7 @@ you create custom user interfaces for your MIDI hardware.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1xcf9jighb759kdh4p32wib2pipgcx3qdf5x7da6cjhxjbzgfrk7"))
+                "1knijckphq2jxrz8nmv4cb64zl1rz3bjyq5ipac09hnj2gvv5rmw"))
               (modules '((guix build utils)
                          (ice-9 regex)))
               (snippet
-- 
cgit 1.4.1


From 29394ec3ca7720932e90a4059c315d275658834f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:03 +0200
Subject: gnu: rxcpp: Update to 4.1.1.

* gnu/packages/machine-learning.scm (rxcpp): Update to 4.1.1.
---
 gnu/packages/machine-learning.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index f50398b555..897bf9f82a 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1159,7 +1159,7 @@ with a single function call.")
 (define-public rxcpp
   (package
     (name "rxcpp")
-    (version "4.1.0")
+    (version "4.1.1")
     (source
      (origin
        (method git-fetch)
@@ -1167,7 +1167,7 @@ with a single function call.")
              (url "https://github.com/ReactiveX/RxCpp")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "1rdpa3jlc181jd08nk437aar085h28i45s6nzrv65apb3xyyz0ij"))
+        (base32 "1blyjjw6szd74pckdc15ham9i48xf0vwwz5nhl9vyjfq8z7w3piy"))
        (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (arguments
-- 
cgit 1.4.1


From c94b3f72e95c702c2b65c822a2b60ed0c5bde4c8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: samplv1: Update to 0.9.31.

* gnu/packages/music.scm (samplv1): Update to 0.9.31.
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 5e4b5f257b..41013fa7f0 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2436,7 +2436,7 @@ effects.")
 (define-public samplv1
   (package
     (name "samplv1")
-    (version "0.9.27")
+    (version "0.9.31")
     (source (origin
               (method url-fetch)
               (uri
@@ -2444,7 +2444,7 @@ effects.")
                               "/samplv1-" version ".tar.gz"))
               (sha256
                (base32
-                "0wxdcw5qs58kjfnnl4lnmafj8qim8qmdfdzrgnxggyhjg5mrpyby"))))
+                "1jqblmb24vbnpm4a4wlvasz45h3zy00rrpf850yxaplyf0qb8klx"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f))                    ; there are no tests
-- 
cgit 1.4.1


From d7131751781ca5610faa20c47ca9c16e4fb3154b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: drumkv1: Update to 0.9.31.

* gnu/packages/music.scm (drumkv1): Update to 0.9.31.
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 41013fa7f0..ac9ba6276d 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2403,7 +2403,7 @@ oscillators and stereo effects.")
 (define-public drumkv1
   (package
     (name "drumkv1")
-    (version "0.9.27")
+    (version "0.9.31")
     (source (origin
               (method url-fetch)
               (uri
@@ -2411,7 +2411,7 @@ oscillators and stereo effects.")
                               "/drumkv1-" version ".tar.gz"))
               (sha256
                (base32
-                "0j96z5bqh1mnldsda6dyp0jqp01mf7p55yr956rzkzg6jivj8fs3"))))
+                "0cw0lqxd4igkb25vlivbi0hamn33d26nl96mzm59cda158r0jayl"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f))                    ; there are no tests
-- 
cgit 1.4.1


From 2dc441cf05d84578cdceca6e65ec404f86db1198 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: synthv1: Update to 0.9.31.

* gnu/packages/music.scm (synthv1): Update to 0.9.31.
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ac9ba6276d..04807e978d 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2371,7 +2371,7 @@ perform creative live mixes with digital music files.")
 (define-public synthv1
   (package
     (name "synthv1")
-    (version "0.9.27")
+    (version "0.9.31")
     (source (origin
               (method url-fetch)
               (uri
@@ -2379,7 +2379,7 @@ perform creative live mixes with digital music files.")
                               "/synthv1-" version ".tar.gz"))
               (sha256
                (base32
-                "13qcig5j69qzcxqs9w5x9shrbb6vyj00g2fz1jw1kxramppyvcvg"))))
+                "06yfiwnxdawyby63zqm1jv4ihi4fxzabpkba7v4d8lgwvhxa014k"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f))                    ; there are no tests
-- 
cgit 1.4.1


From a5049e6292387f152a69b4ed86921439da5e1af3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:04 +0200
Subject: gnu: padthv1: Update to 0.9.31.

* gnu/packages/music.scm (padthv1): Update to 0.9.31.
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 04807e978d..a632a4a765 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2469,7 +2469,7 @@ effects.")
 (define-public padthv1
   (package
     (name "padthv1")
-    (version "0.9.27")
+    (version "0.9.31")
     (source (origin
               (method url-fetch)
               (uri
@@ -2477,7 +2477,7 @@ effects.")
                               "/padthv1-" version ".tar.gz"))
               (sha256
                (base32
-                "0ydm09g0ibvp1nf4fzzj6bkwlxx46pjxqgg8h76hwi6l8k0rz5m4"))))
+                "1iqmjdxihil039c8g9kywd5dx3rd47ph2fs6f6kcyfwj9jz4aprh"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f))                    ; there are no tests
-- 
cgit 1.4.1


From d32dc2fe78d55c4058ba8e1b4a66461c6e488976 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: qtractor: Update to 0.9.31.

* gnu/packages/music.scm (qtractor): Update to 0.9.31.
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index a632a4a765..faa81ec631 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3482,14 +3482,14 @@ from the command line.")
 (define-public qtractor
   (package
     (name "qtractor")
-    (version "0.9.29")
+    (version "0.9.31")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://downloads.sourceforge.net/qtractor/"
                                   "qtractor-" version ".tar.gz"))
               (sha256
                (base32
-                "05g0zj5iy8knqccwglgql1flabgvpy4yqms4z1zqrkl9ws9bwc1x"))))
+                "0kyb1ylnwlc4vzhar669n6n9w0pbs9ixqnfanlzfwdbw1sn3gzyy"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f))                    ; no "check" target
-- 
cgit 1.4.1


From 40f9e720a27528f5de3079aba67f687be59a9f7f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:20 +0200
Subject: gnu: tome4: Remove obsolete snippet.

* gnu/packages/games.scm (tome4)[source]: Remove snippet.
---
 gnu/packages/games.scm | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index f58720e41a..a772519520 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7249,15 +7249,7 @@ Crowther & Woods, its original authors, in 1995.  It has been known as
                            version ".tar.bz2"))
        (sha256
         (base32 "197jmd99l3w3sig32pvdlq9fcgdjjx7g9csy08kz174cyhrlyly3"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           (substitute* '("src/music.h" "src/tSDL.h")
-             (("#elif defined(__FreeBSD__)" line)
-              (string-append
-               line " || defined(__GNUC__)")))
-           (substitute* '("src/tgl.h")
-             (("#include <GL/glext.h>") ""))))))
+       (modules '((guix build utils)))))
     (build-system gnu-build-system)
     (native-inputs
      (list unzip))
-- 
cgit 1.4.1


From 288a5294d78c283f759c9d8a077c0e2240904ccf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:03 +0200
Subject: gnu: Add perl-cryptx.

* gnu/packages/perl.scm (perl-cryptx): New public variable.
---
 gnu/packages/perl.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 57852a3cee..6f30bd0795 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -2560,6 +2560,25 @@ used in @code{crypt} are also supplied separately.")
     ;; Files in the 'fcrypt' directory are covered by a BSD licence.
     (license (list license:perl-license license:bsd-3))))
 
+(define-public perl-cryptx
+  (package
+  (name "perl-cryptx")
+  (version "0.078")
+  (source
+   (origin
+     (method url-fetch)
+     (uri (string-append "mirror://cpan/authors/id/M/MI/MIK/CryptX-"
+                         version ".tar.gz"))
+     (sha256
+      (base32 "1gdw33k8h7izjfb4zy9j1qfq4ffbqzpvhcf9ncy79mgp8890n5lk"))))
+  (build-system perl-build-system)
+  (home-page "https://metacpan.org/release/CryptX")
+  (synopsis "Self-contained cryptographic toolkit based on LibTomCrypt")
+  (description
+   "These self-contained Perl modules provide cryptography based on the
+LibTomCrypt library.")
+  (license license:perl-license)))
+
 (define-public perl-cwd-guard
   (package
     (name "perl-cwd-guard")
-- 
cgit 1.4.1


From 807fbccb25004ddfb5a0c75f9226744cf7a05c2b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:05 +0200
Subject: gnu: perl-mail-dkim: Update to 1.20230630.

* gnu/packages/mail.scm (perl-mail-dkim): Update to 1.20230630.
[propagated-inputs]: Add perl-cryptx.
---
 gnu/packages/mail.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index f6f03b0150..26892cf84e 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -2715,7 +2715,7 @@ Authentication-Results header seen in the wild.")
 (define-public perl-mail-dkim
   (package
     (name "perl-mail-dkim")
-    (version "1.20220520")
+    (version "1.20230630")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2724,13 +2724,17 @@ Authentication-Results header seen in the wild.")
                      ".tar.gz"))
               (sha256
                (base32
-                "0iiny8s1a60pksxzlpkk9b6x6z907m4pdxjbsaih1bdz9g4bii4a"))))
+                "1m6ka1smkcmv682pgqh7npg4fzdfcn1654bs068sqhqgl29rm80g"))))
     (build-system perl-build-system)
     (propagated-inputs
-     (list perl-crypt-openssl-rsa perl-mail-authenticationresults
-           perl-mailtools perl-net-dns))
+     (list perl-crypt-openssl-rsa
+           perl-cryptx
+           perl-mail-authenticationresults
+           perl-mailtools
+           perl-net-dns))
     (native-inputs
-     (list perl-net-dns-resolver-mock perl-test-requiresinternet
+     (list perl-net-dns-resolver-mock
+           perl-test-requiresinternet
            perl-yaml-libyaml))
     (home-page "https://metacpan.org/release/Mail-DKIM")
     (synopsis "Signs/verifies Internet mail with DKIM/DomainKey signatures")
-- 
cgit 1.4.1


From 283969d0c527aa41e65bb4f5c2a7fa3baf86c49a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: perl-mail-dkim: Mark up description.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/authentication.scm (perl-mail-dkim)[description]:
Use @acronym{}.  Drop ‘new’.
---
 gnu/packages/mail.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 26892cf84e..2cefb15de8 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -2738,8 +2738,8 @@ Authentication-Results header seen in the wild.")
            perl-yaml-libyaml))
     (home-page "https://metacpan.org/release/Mail-DKIM")
     (synopsis "Signs/verifies Internet mail with DKIM/DomainKey signatures")
-    (description "Mail::DKIM is a Perl module that implements the new Domain
-Keys Identified Mail (DKIM) standard, and the older Yahoo! DomainKeys standard,
+    (description "Mail::DKIM is a Perl module that implements the @acronym{DKIM,
+Domain Keys Identified Mail} standard, and the older Yahoo! DomainKeys standard,
 both of which sign and verify emails using digital signatures and DNS records.
 Mail-DKIM can be used by any Perl program that wants to provide support for
 DKIM and/or DomainKeys.")
-- 
cgit 1.4.1


From d6a53849935f8584e1df57faa79c18c23fbb2aa1 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Sat, 17 Jun 2023 20:14:17 -0700
Subject: gnu: arm-trusted-firmware: Update to 2.9.

* gnu/packages/firmware.scm (make-arm-trusted-firmware): Update to 2.9.
(arm-trusted-firmware-imx8mq): Keep at version 2.8.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/firmware.scm | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index d6ce893120..35d3100ac6 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -1025,7 +1025,7 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
                                        (gnu-triplet->nix-system triplet))))))
     (package
       (name (string-append "arm-trusted-firmware-" platform))
-      (version "2.8")
+      (version "2.9")
       (source
        (origin
          (method git-fetch)
@@ -1036,7 +1036,7 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
          (file-name (git-file-name "arm-trusted-firmware" version))
          (sha256
           (base32
-           "0grq3fgxi9xhcljnhwlxjvdghyz15gaq50raw41xy4lm8rkmnzp3"))
+           "16fjbn1zck0d8b554h8lk1svqqn0zlawvrlkjxry9l71s9h4vd0p"))
          (snippet
           #~(begin
               (use-modules (guix build utils))
@@ -1104,6 +1104,22 @@ such as:
   (let ((base (make-arm-trusted-firmware "imx8mq")))
     (package
       (inherit base)
+      ;; Newer versions do not build and are essentially not supported
+      ;; upstream.
+      ;; XXX: explore using NXP maintained branch
+      ;; https://github.com/nxp-imx/imx-atf
+      (version "2.8")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               ;; There are only GitHub generated release snapshots.
+               (url "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/")
+               (commit (string-append "v" version))))
+         (file-name (git-file-name "arm-trusted-firmware" version))
+         (sha256
+          (base32
+           "0grq3fgxi9xhcljnhwlxjvdghyz15gaq50raw41xy4lm8rkmnzp3"))))
       (arguments
        (substitute-keyword-arguments (package-arguments base)
          ((#:make-flags flags ''())
-- 
cgit 1.4.1


From b0d47d9e18e52ff7935aebe6ab37e702f58101be Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Sun, 2 Jul 2023 18:20:39 -0700
Subject: gnu: u-boot: Update to 2023.07.02.

* gnu/packages/patches/u-boot-infodocs-target.patch: Delete file.
* gnu/packages/patches/u-boot-patman-guix-integration.patch: Delete file.
* gnu/local.mk: De-register patches.
* gnu/packages/patches/u-boot-allow-disabling-openssl.patch: Refresh.
* gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch: Refresh.
* gnu/packages/bootloaders.scm (u-boot): Update to 2023.07.02.
[native-inputs]: Add python-pyelftools.
[source]: Remove patches.
(u-boot-tools)[phases]: Update substitution for python3-coverage.
Adjust 'patch to catch more openssl incompatibilities.
Split lines in 'patch phase.
[native-inputs]: Add python-filelock and python-pytest-xdist.
(make-u-boot-sunxi64-package): Set SCP environment variable.
(u-boot-sifive-unleashed): Update to use opensbi.
(u-boot-puma-rk3399)[inputs]: Add arm-trusted-firmware-rk3399 to
package-inputs instead of native-inputs.
(u-boot-rockpro64-rk3399): Disable CONFIG_SPL_FIT_SIGNATURE in config.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/local.mk                                       |    2 -
 gnu/packages/bootloaders.scm                       |   55 +-
 .../patches/u-boot-allow-disabling-openssl.patch   |   13 +-
 gnu/packages/patches/u-boot-infodocs-target.patch  |   84 --
 .../patches/u-boot-patman-guix-integration.patch   | 1244 --------------------
 .../u-boot-sifive-prevent-reloc-initrd-fdt.patch   |    8 +-
 6 files changed, 54 insertions(+), 1352 deletions(-)
 delete mode 100644 gnu/packages/patches/u-boot-infodocs-target.patch
 delete mode 100644 gnu/packages/patches/u-boot-patman-guix-integration.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index f2ef72c10a..cdce2666e5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2005,8 +2005,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/twinkle-bcg729.patch			\
   %D%/packages/patches/u-boot-allow-disabling-openssl.patch	\
   %D%/packages/patches/u-boot-fix-build-python-3.10.patch	\
-  %D%/packages/patches/u-boot-infodocs-target.patch		\
-  %D%/packages/patches/u-boot-patman-guix-integration.patch	\
   %D%/packages/patches/u-boot-nintendo-nes-serial.patch		\
   %D%/packages/patches/u-boot-rockchip-inno-usb.patch		\
   %D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch	\
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 01fd1093ff..966f1787f8 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -648,23 +648,21 @@ tree binary files.  These are board description files used by Linux and BSD.")
 (define u-boot
   (package
     (name "u-boot")
-    (version "2022.10")
+    (version "2023.07.02")
     (source (origin
               (patches
                (list %u-boot-rockchip-inno-usb-patch
                      %u-boot-allow-disabling-openssl-patch
                      %u-boot-sifive-prevent-relocating-initrd-fdt
                      %u-boot-rk3399-enable-emmc-phy-patch
-                     (search-patch "u-boot-fix-build-python-3.10.patch")
-                     (search-patch "u-boot-infodocs-target.patch")
-                     (search-patch "u-boot-patman-guix-integration.patch")))
+                     (search-patch "u-boot-fix-build-python-3.10.patch")))
               (method url-fetch)
               (uri (string-append
                     "https://ftp.denx.de/pub/u-boot/"
                     "u-boot-" version ".tar.bz2"))
               (sha256
                (base32
-                "1y5x8vxdgsqdqlsvq01mn8lmw53fqairkhvhhjx83hjva0m4id2h"))))
+                "1m91w3fpywllkwm000dqsw3294j0szs1lz6qbgwv1aql3ic4hskb"))))
     (build-system gnu-build-system)
     (native-inputs
      (list bison
@@ -676,6 +674,7 @@ tree binary files.  These are board description files used by Linux and BSD.")
            perl
            pkg-config                   ;for 'make menuconfig'
            python
+           python-pyelftools
            swig
            (list util-linux "lib")))
     (home-page "https://www.denx.de/wiki/U-Boot/")
@@ -726,7 +725,12 @@ Info manual.")))
     (name "u-boot-tools")
     (native-inputs
      (modify-inputs (package-native-inputs u-boot)
-       (prepend python-coverage python-pycryptodomex python-pytest sdl2)))
+       (prepend python-coverage
+                python-filelock
+                python-pycryptodomex
+                python-pytest
+                python-pytest-xdist
+                sdl2)))
     (arguments
      `(#:make-flags '("HOSTCC=gcc")
        #:test-target "tcheck"
@@ -739,7 +743,7 @@ Info manual.")))
                (("/bin/false") (which "false")))
              (substitute* "tools/dtoc/fdt_util.py"
                (("'cc'") "'gcc'"))
-             (substitute* "tools/patman/test_util.py"
+             (substitute* "tools/u_boot_pylib/test_util.py"
                ;; python3-coverage is simply called coverage in guix.
                (("python3-coverage") "coverage")
 
@@ -777,7 +781,16 @@ def test_ctrl_c"))
                            ;; See https://bugs.gnu.org/34717 for
                            ;; details.
                            (("CONFIG_FIT_SIGNATURE=y")
-                            "CONFIG_FIT_SIGNATURE=n\nCONFIG_UT_LIB_ASN1=n\nCONFIG_TOOLS_LIBCRYPTO=n")
+                            "CONFIG_FIT_SIGNATURE=n
+CONFIG_UT_LIB_ASN1=n
+CONFIG_TOOLS_LIBCRYPTO=n")
+                           ;; Catch instances of implied CONFIG_FIG_SIGNATURE
+                           ;; with VPL targets
+                           (("CONFIG_SANDBOX_VPL=y")
+                            "CONFIG_SANDBOX_VPL=y
+CONFIG_FIT_SIGNATURE=n
+CONFIG_VPL_FIT_SIGNATURE=n
+CONFIG_TOOLS_LIBCRYPTO=n")
                            ;; This test requires a sound system, which is un-used
                            ;; in u-boot-tools.
                            (("CONFIG_SOUND=y") "CONFIG_SOUND=n")))
@@ -1009,6 +1022,9 @@ removed so that it fits within common partitioning schemes.")))
           #~(modify-phases #$phases
               (add-after 'unpack 'set-environment
                 (lambda* (#:key native-inputs inputs #:allow-other-keys)
+                  ;; Avoid dependency on crust-firmware
+                  ;; https://issues.guix.gnu.org/48371
+                  (setenv "SCP" "/dev/null")
                   (setenv "BL31" (search-input-file inputs "bl31.bin"))))))))
       (inputs
        (modify-inputs (package-inputs base)
@@ -1104,7 +1120,7 @@ partition."))
               (delete 'strip)
               (delete 'validate-runpath)))))
       (inputs
-       (modify-inputs (package-native-inputs base)
+       (modify-inputs (package-inputs base)
          (append arm-trusted-firmware-rk3399))))))
 
 (define-public u-boot-qemu-arm
@@ -1170,7 +1186,20 @@ Documentation} for more information (for example by running @samp{info
                 (append sdl2))))))
 
 (define-public u-boot-sifive-unleashed
-  (make-u-boot-package "sifive_unleashed" "riscv64-linux-gnu"))
+  (let ((base (make-u-boot-package "sifive_unleashed" "riscv64-linux-gnu")))
+    (package
+      (inherit base)
+      (arguments
+       (substitute-keyword-arguments (package-arguments base)
+         ((#:phases phases)
+          #~(modify-phases #$phases
+              (add-after 'unpack 'set-environment
+                (lambda* (#:key inputs #:allow-other-keys)
+                  (setenv "OPENSBI" (search-input-file inputs
+                                                       "fw_dynamic.bin"))))))))
+      (inputs
+       (modify-inputs (package-inputs base)
+         (append opensbi-generic))))))
 
 (define-public u-boot-sifive-unmatched
   (let ((base (make-u-boot-package "sifive_unmatched" "riscv64-linux-gnu")))
@@ -1230,7 +1259,11 @@ Documentation} for more information (for example by running @samp{info
                                                "CONFIG_SATA_SIL=y"
                                                "CONFIG_SCSI=y"
                                                "CONFIG_SCSI_AHCI=y"
-                                               "CONFIG_DM_SCSI=y"))))
+                                               "CONFIG_DM_SCSI=y"
+                                               ;; Disable SPL FIT signatures,
+                                               ;; due to GPLv2 and Openssl
+                                               ;; license incompatibilities
+                                               "# CONFIG_SPL_FIT_SIGNATURE is not set"))))
     (package
       (inherit base)
       (arguments
diff --git a/gnu/packages/patches/u-boot-allow-disabling-openssl.patch b/gnu/packages/patches/u-boot-allow-disabling-openssl.patch
index 5f2856dbb4..5195a7a6f8 100644
--- a/gnu/packages/patches/u-boot-allow-disabling-openssl.patch
+++ b/gnu/packages/patches/u-boot-allow-disabling-openssl.patch
@@ -128,29 +128,28 @@ index 94b7685392..eec599b0ee 100644
  	datai = 0;
  	for (cfgi = 0; cfgi < cfgn; cfgi++) {
  		e = &image_cfg[cfgi];
-@@ -1552,9 +1568,11 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
+@@ -1624,10 +1640,12 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params,
  					      &datai, delay);
  	}
  
 +#if defined(CONFIG_KWB_SECURE)
- 	if (secure_hdr && add_secure_header_v1(params, ptr, payloadsz + headersz,
- 					       headersz, image, secure_hdr))
+ 	if (secure_hdr && add_secure_header_v1(params, ptr + *dataoff, payloadsz,
+ 					       image, headersz, secure_hdr))
  		return NULL;
 +#endif
  
- 	*imagesz = headersz;
+ 	/* Calculate and set the header checksum */
+ 	main_hdr->checksum = image_checksum8(main_hdr, headersz);
  
 --- a/tools/image-host.c
 +++ b/tools/image-host.c
-@@ -14,10 +14,12 @@
+@@ -14,8 +14,10 @@
  #include <image.h>
  #include <version.h>
  
 +#ifdef CONFIG_FIT_PRELOAD
  #include <openssl/pem.h>
  #include <openssl/evp.h>
- 
- #define IMAGE_PRE_LOAD_PATH                             "/image/pre-load/sig"
 +#endif
  
  /**
diff --git a/gnu/packages/patches/u-boot-infodocs-target.patch b/gnu/packages/patches/u-boot-infodocs-target.patch
deleted file mode 100644
index 5b21a99de3..0000000000
--- a/gnu/packages/patches/u-boot-infodocs-target.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Upstream status: https://patchwork.ozlabs.org/project/uboot/list/?series=333259
-
-diff --git a/Makefile b/Makefile
-index de5746399a..597a8886c3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2372,7 +2372,7 @@ tcheck:
- # Documentation targets
- # ---------------------------------------------------------------------------
- DOC_TARGETS := xmldocs latexdocs pdfdocs htmldocs epubdocs cleandocs \
--	       linkcheckdocs dochelp refcheckdocs
-+	       linkcheckdocs dochelp refcheckdocs texinfodocs infodocs
- PHONY += $(DOC_TARGETS)
- $(DOC_TARGETS): scripts_basic FORCE
- 	$(Q)$(MAKE) $(build)=doc $@
-diff --git a/doc/Makefile b/doc/Makefile
-index f5de65e927..d0904a9f99 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -69,6 +69,14 @@ quiet_cmd_sphinx = SPHINX  $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
- htmldocs:
- 	@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),,$(var)))
- 
-+texinfodocs:
-+	@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,texinfo,$(var),texinfo,$(var)))
-+
-+# Note: the 'info' Make target is generated by sphinx itself when
-+# running the texinfodocs target defined above.
-+infodocs: texinfodocs
-+	$(MAKE) -C $(BUILDDIR)/texinfo info
-+
- linkcheckdocs:
- 	@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,linkcheck,$(var),,$(var)))
- 
-@@ -109,6 +117,8 @@ cleandocs:
- dochelp:
- 	@echo  ' U-Boot documentation in different formats from ReST:'
- 	@echo  '  htmldocs        - HTML'
-+	@echo  '  texinfodocs     - Texinfo'
-+	@echo  '  infodocs        - Info'
- 	@echo  '  latexdocs       - LaTeX'
- 	@echo  '  pdfdocs         - PDF'
- 	@echo  '  epubdocs        - EPUB'
-diff --git a/doc/conf.py b/doc/conf.py
-index 62c8d31270..3db70f80c1 100644
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -449,7 +449,7 @@ for fn in os.listdir('.'):
- # One entry per manual page. List of tuples
- # (source start file, name, description, authors, manual section).
- man_pages = [
--    (master_doc, 'dasuboot', 'The U-Boot Documentation',
-+    (master_doc, 'u-boot', 'The U-Boot Documentation',
-      [author], 1)
- ]
- 
-@@ -463,8 +463,8 @@ man_pages = [
- # (source start file, target name, title, author,
- #  dir menu entry, description, category)
- texinfo_documents = [
--    (master_doc, 'DasUBoot', 'The U-Boot Documentation',
--     author, 'DasUBoot', 'One line description of project.',
-+    (master_doc, 'u-boot', 'The U-Boot Documentation',
-+     author, 'U-Boot', 'Boot loader for embedded systems',
-      'Miscellaneous'),
- ]
- 
-diff --git a/doc/media/Makefile b/doc/media/Makefile
-index b9b43a34c3..9b32258696 100644
---- a/doc/media/Makefile
-+++ b/doc/media/Makefile
-@@ -22,10 +22,11 @@ $(BUILDDIR)/linker_lists.h.rst: ${API}/linker_lists.h ${PARSER} $(SRC_DIR)/linke
- 
- # Media build rules
- 
--.PHONY: all html epub xml latex
-+.PHONY: all html texinfo epub xml latex
- 
- all: $(IMGDOT) $(BUILDDIR) ${TARGETS}
- html: all
-+texinfo: all
- epub: all
- xml: all
- latex: $(IMGPDF) all
diff --git a/gnu/packages/patches/u-boot-patman-guix-integration.patch b/gnu/packages/patches/u-boot-patman-guix-integration.patch
deleted file mode 100644
index 3472656c99..0000000000
--- a/gnu/packages/patches/u-boot-patman-guix-integration.patch
+++ /dev/null
@@ -1,1244 +0,0 @@
-These changes correspond to commits 9ff7500ace..3154de3dd6 already merged to
-the u-boot-dm custodian repo (at
-https://source.denx.de/u-boot/custodians/u-boot-dm/-/commits/next), scheduled
-to be pulled after the next release.
-
-diff --git a/tools/patman/__init__.py b/tools/patman/__init__.py
-index c9d3e35052..1b98ec7fee 100644
---- a/tools/patman/__init__.py
-+++ b/tools/patman/__init__.py
-@@ -1,6 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0+
- 
- __all__ = ['checkpatch', 'command', 'commit', 'control', 'cros_subprocess',
--           'func_test', 'get_maintainer', 'gitutil', 'main', 'patchstream',
-+           'func_test', 'get_maintainer', 'gitutil', '__main__', 'patchstream',
-            'project', 'series', 'setup', 'settings', 'terminal',
-            'test_checkpatch', 'test_util', 'tools', 'tout']
-diff --git a/tools/patman/main.py b/tools/patman/__main__.py
-similarity index 89%
-rename from tools/patman/main.py
-rename to tools/patman/__main__.py
-index 8067a288ab..749e6348b6 100755
---- a/tools/patman/main.py
-+++ b/tools/patman/__main__.py
-@@ -7,6 +7,7 @@
- """See README for more information"""
- 
- from argparse import ArgumentParser
-+import importlib.resources
- import os
- import re
- import sys
-@@ -19,6 +20,7 @@ if __name__ == "__main__":
- 
- # Our modules
- from patman import control
-+from patman import func_test
- from patman import gitutil
- from patman import project
- from patman import settings
-@@ -53,7 +55,8 @@ parser.add_argument('-H', '--full-help', action='store_true', dest='full_help',
-                     default=False, help='Display the README file')
- 
- subparsers = parser.add_subparsers(dest='cmd')
--send = subparsers.add_parser('send')
-+send = subparsers.add_parser(
-+    'send', help='Format, check and email patches (default command)')
- send.add_argument('-i', '--ignore-errors', action='store_true',
-        dest='ignore_errors', default=False,
-        help='Send patches email even if patch errors are found')
-@@ -62,6 +65,12 @@ send.add_argument('-l', '--limit-cc', dest='limit', type=int, default=None,
- send.add_argument('-m', '--no-maintainers', action='store_false',
-        dest='add_maintainers', default=True,
-        help="Don't cc the file maintainers automatically")
-+send.add_argument(
-+    '--get-maintainer-script', dest='get_maintainer_script', type=str,
-+    action='store',
-+    default=os.path.join(gitutil.get_top_level(), 'scripts',
-+                         'get_maintainer.pl') + ' --norolestats',
-+    help='File name of the get_maintainer.pl (or compatible) script.')
- send.add_argument('-n', '--dry-run', action='store_true', dest='dry_run',
-        default=False, help="Do a dry run (create but don't email patches)")
- send.add_argument('-r', '--in-reply-to', type=str, action='store',
-@@ -94,9 +103,11 @@ send.add_argument('--smtp-server', type=str,
- 
- send.add_argument('patchfiles', nargs='*')
- 
--test_parser = subparsers.add_parser('test', help='Run tests')
--test_parser.add_argument('testname', type=str, default=None, nargs='?',
--                         help="Specify the test to run")
-+# Only add the 'test' action if the test data files are available.
-+if os.path.exists(func_test.TEST_DATA_DIR):
-+    test_parser = subparsers.add_parser('test', help='Run tests')
-+    test_parser.add_argument('testname', type=str, default=None, nargs='?',
-+                             help="Specify the test to run")
- 
- status = subparsers.add_parser('status',
-                                help='Check status of patches in patchwork')
-@@ -113,7 +124,7 @@ status.add_argument('-f', '--force', action='store_true',
- argv = sys.argv[1:]
- args, rest = parser.parse_known_args(argv)
- if hasattr(args, 'project'):
--    settings.Setup(gitutil, parser, args.project, '')
-+    settings.Setup(parser, args.project)
-     args, rest = parser.parse_known_args(argv)
- 
- # If we have a command, it is safe to parse all arguments
-@@ -160,11 +171,8 @@ elif args.cmd == 'send':
-         fd.close()
- 
-     elif args.full_help:
--        tools.print_full_help(
--            os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])),
--                         'README.rst')
--        )
--
-+        with importlib.resources.path('patman', 'README.rst') as readme:
-+            tools.print_full_help(str(readme))
-     else:
-         # If we are not processing tags, no need to warning about bad ones
-         if not args.process_tags:
-diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py
-index d1b902dd96..012c0d895c 100644
---- a/tools/patman/checkpatch.py
-+++ b/tools/patman/checkpatch.py
-@@ -211,7 +211,7 @@ def check_patch(fname, verbose=False, show_types=False, use_tree=False):
-             stdout: Full output of checkpatch
-     """
-     chk = find_check_patch()
--    args = [chk]
-+    args = [chk, '--u-boot', '--strict']
-     if not use_tree:
-         args.append('--no-tree')
-     if show_types:
-diff --git a/tools/patman/control.py b/tools/patman/control.py
-index bf426cf7bc..38e98dab84 100644
---- a/tools/patman/control.py
-+++ b/tools/patman/control.py
-@@ -94,8 +94,8 @@ def check_patches(series, patch_files, run_checkpatch, verbose, use_tree):
- 
- 
- def email_patches(col, series, cover_fname, patch_files, process_tags, its_a_go,
--                  ignore_bad_tags, add_maintainers, limit, dry_run, in_reply_to,
--                  thread, smtp_server):
-+                  ignore_bad_tags, add_maintainers, get_maintainer_script, limit,
-+                  dry_run, in_reply_to, thread, smtp_server):
-     """Email patches to the recipients
- 
-     This emails out the patches and cover letter using 'git send-email'. Each
-@@ -123,6 +123,8 @@ def email_patches(col, series, cover_fname, patch_files, process_tags, its_a_go,
-         ignore_bad_tags (bool): True to just print a warning for unknown tags,
-             False to halt with an error
-         add_maintainers (bool): Run the get_maintainer.pl script for each patch
-+        get_maintainer_script (str): The script used to retrieve which
-+            maintainers to cc
-         limit (int): Limit on the number of people that can be cc'd on a single
-             patch or the cover letter (None if no limit)
-         dry_run (bool): Don't actually email the patches, just print out what
-@@ -134,7 +136,7 @@ def email_patches(col, series, cover_fname, patch_files, process_tags, its_a_go,
-         smtp_server (str): SMTP server to use to send patches (None for default)
-     """
-     cc_file = series.MakeCcFile(process_tags, cover_fname, not ignore_bad_tags,
--                                add_maintainers, limit)
-+                                add_maintainers, limit, get_maintainer_script)
- 
-     # Email the patches out (giving the user time to check / cancel)
-     cmd = ''
-@@ -174,8 +176,8 @@ def send(args):
-     email_patches(
-         col, series, cover_fname, patch_files, args.process_tags,
-         its_a_go, args.ignore_bad_tags, args.add_maintainers,
--        args.limit, args.dry_run, args.in_reply_to, args.thread,
--        args.smtp_server)
-+        args.get_maintainer_script, args.limit, args.dry_run,
-+        args.in_reply_to, args.thread, args.smtp_server)
- 
- def patchwork_status(branch, count, start, end, dest_branch, force,
-                      show_comments, url):
-diff --git a/tools/patman/func_test.py b/tools/patman/func_test.py
-index 7b92bc67be..c25a47bdeb 100644
---- a/tools/patman/func_test.py
-+++ b/tools/patman/func_test.py
-@@ -6,7 +6,9 @@
- 
- """Functional tests for checking that patman behaves correctly"""
- 
-+import contextlib
- import os
-+import pathlib
- import re
- import shutil
- import sys
-@@ -28,6 +30,21 @@ from patman.test_util import capture_sys_output
- import pygit2
- from patman import status
- 
-+PATMAN_DIR = pathlib.Path(__file__).parent
-+TEST_DATA_DIR = PATMAN_DIR / 'test/'
-+
-+
-+@contextlib.contextmanager
-+def directory_excursion(directory):
-+    """Change directory to `directory` for a limited to the context block."""
-+    current = os.getcwd()
-+    try:
-+        os.chdir(directory)
-+        yield
-+    finally:
-+        os.chdir(current)
-+
-+
- class TestFunctional(unittest.TestCase):
-     """Functional tests for checking that patman behaves correctly"""
-     leb = (b'Lord Edmund Blackadd\xc3\xabr <weasel@blackadder.org>'.
-@@ -57,8 +74,7 @@ class TestFunctional(unittest.TestCase):
-         Returns:
-             str: Full path to file in the test directory
-         """
--        return os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])),
--                            'test', fname)
-+        return TEST_DATA_DIR / fname
- 
-     @classmethod
-     def _get_text(cls, fname):
-@@ -200,6 +216,8 @@ class TestFunctional(unittest.TestCase):
-         text = self._get_text('test01.txt')
-         series = patchstream.get_metadata_for_test(text)
-         cover_fname, args = self._create_patches_for_test(series)
-+        get_maintainer_script = str(pathlib.Path(__file__).parent.parent.parent
-+                                    / 'get_maintainer.pl') + ' --norolestats'
-         with capture_sys_output() as out:
-             patchstream.fix_patches(series, args)
-             if cover_fname and series.get('cover'):
-@@ -207,7 +225,7 @@ class TestFunctional(unittest.TestCase):
-             series.DoChecks()
-             cc_file = series.MakeCcFile(process_tags, cover_fname,
-                                         not ignore_bad_tags, add_maintainers,
--                                        None)
-+                                        None, get_maintainer_script)
-             cmd = gitutil.email_patches(
-                 series, cover_fname, args, dry_run, not ignore_bad_tags,
-                 cc_file, in_reply_to=in_reply_to, thread=None)
-@@ -502,6 +520,37 @@ complicated as possible''')
-         finally:
-             os.chdir(orig_dir)
- 
-+    def test_custom_get_maintainer_script(self):
-+        """Validate that a custom get_maintainer script gets used."""
-+        self.make_git_tree()
-+        with directory_excursion(self.gitdir):
-+            # Setup git.
-+            os.environ['GIT_CONFIG_GLOBAL'] = '/dev/null'
-+            os.environ['GIT_CONFIG_SYSTEM'] = '/dev/null'
-+            tools.run('git', 'config', 'user.name', 'Dummy')
-+            tools.run('git', 'config', 'user.email', 'dumdum@dummy.com')
-+            tools.run('git', 'branch', 'upstream')
-+            tools.run('git', 'branch', '--set-upstream-to=upstream')
-+            tools.run('git', 'add', '.')
-+            tools.run('git', 'commit', '-m', 'new commit')
-+
-+            # Setup patman configuration.
-+            with open('.patman', 'w', buffering=1) as f:
-+                f.write('[settings]\n'
-+                        'get_maintainer_script: dummy-script.sh\n'
-+                        'check_patch: False\n')
-+            with open('dummy-script.sh', 'w', buffering=1) as f:
-+                f.write('#!/usr/bin/env python\n'
-+                        'print("hello@there.com")\n')
-+            os.chmod('dummy-script.sh', 0x555)
-+
-+            # Finally, do the test
-+            with capture_sys_output():
-+                output = tools.run(PATMAN_DIR / 'patman', '--dry-run')
-+                # Assert the email address is part of the dry-run
-+                # output.
-+                self.assertIn('hello@there.com', output)
-+
-     def test_tags(self):
-         """Test collection of tags in a patchstream"""
-         text = '''This is a patch
-diff --git a/tools/patman/get_maintainer.py b/tools/patman/get_maintainer.py
-index e1d15ff6ab..f7011be1e4 100644
---- a/tools/patman/get_maintainer.py
-+++ b/tools/patman/get_maintainer.py
-@@ -1,48 +1,61 @@
- # SPDX-License-Identifier: GPL-2.0+
- # Copyright (c) 2012 The Chromium OS Authors.
-+# Copyright (c) 2022 Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
- #
- 
- import os
-+import shlex
-+import shutil
- 
- from patman import command
-+from patman import gitutil
- 
--def find_get_maintainer(try_list):
--    """Look for the get_maintainer.pl script.
- 
--    Args:
--        try_list: List of directories to try for the get_maintainer.pl script
-+def find_get_maintainer(script_file_name):
-+    """Try to find where `script_file_name` is.
- 
--    Returns:
--        If the script is found we'll return a path to it; else None.
-+    It searches in PATH and falls back to a path relative to the top
-+    of the current git repository.
-     """
--    # Look in the list
--    for path in try_list:
--        fname = os.path.join(path, 'get_maintainer.pl')
--        if os.path.isfile(fname):
--            return fname
-+    get_maintainer = shutil.which(script_file_name)
-+    if get_maintainer:
-+        return get_maintainer
-+
-+    git_relative_script = os.path.join(gitutil.get_top_level(),
-+                                       script_file_name)
-+    if os.path.exists(git_relative_script):
-+        return git_relative_script
- 
--    return None
- 
--def get_maintainer(dir_list, fname, verbose=False):
--    """Run get_maintainer.pl on a file if we find it.
-+def get_maintainer(script_file_name, fname, verbose=False):
-+    """Run `script_file_name` on a file.
- 
--    We look for get_maintainer.pl in the 'scripts' directory at the top of
--    git.  If we find it we'll run it.  If we don't find get_maintainer.pl
--    then we fail silently.
-+    `script_file_name` should be a get_maintainer.pl-like script that
-+    takes a patch file name as an input and return the email addresses
-+    of the associated maintainers to standard output, one per line.
-+
-+    If `script_file_name` does not exist we fail silently.
- 
-     Args:
--        dir_list: List of directories to try for the get_maintainer.pl script
--        fname: Path to the patch file to run get_maintainer.pl on.
-+        script_file_name: The file name of the get_maintainer.pl script
-+            (or compatible).
-+        fname: File name of the patch to process with get_maintainer.pl.
- 
-     Returns:
-         A list of email addresses to CC to.
-     """
--    get_maintainer = find_get_maintainer(dir_list)
-+    # Expand `script_file_name` into a file name and its arguments, if
-+    # any.
-+    cmd_args = shlex.split(script_file_name)
-+    file_name = cmd_args[0]
-+    arguments = cmd_args[1:]
-+
-+    get_maintainer = find_get_maintainer(file_name)
-     if not get_maintainer:
-         if verbose:
-             print("WARNING: Couldn't find get_maintainer.pl")
-         return []
- 
--    stdout = command.output(get_maintainer, '--norolestats', fname)
-+    stdout = command.output(get_maintainer, *arguments, fname)
-     lines = stdout.splitlines()
--    return [ x.replace('"', '') for x in lines ]
-+    return [x.replace('"', '') for x in lines]
-diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py
-index ceaf2ce150..5e742102c2 100644
---- a/tools/patman/gitutil.py
-+++ b/tools/patman/gitutil.py
-@@ -2,21 +2,19 @@
- # Copyright (c) 2011 The Chromium OS Authors.
- #
- 
--import re
- import os
--import subprocess
- import sys
- 
- from patman import command
- from patman import settings
- from patman import terminal
--from patman import tools
- 
- # True to use --no-decorate - we check this in setup()
- use_no_decorate = True
- 
-+
- def log_cmd(commit_range, git_dir=None, oneline=False, reverse=False,
--           count=None):
-+            count=None):
-     """Create a command to perform a 'git log'
- 
-     Args:
-@@ -49,6 +47,7 @@ def log_cmd(commit_range, git_dir=None, oneline=False, reverse=False,
-     cmd.append('--')
-     return cmd
- 
-+
- def count_commits_to_branch(branch):
-     """Returns number of commits between HEAD and the tracking branch.
- 
-@@ -68,13 +67,14 @@ def count_commits_to_branch(branch):
-         rev_range = '@{upstream}..'
-     pipe = [log_cmd(rev_range, oneline=True)]
-     result = command.run_pipe(pipe, capture=True, capture_stderr=True,
--                             oneline=True, raise_on_error=False)
-+                              oneline=True, raise_on_error=False)
-     if result.return_code:
-         raise ValueError('Failed to determine upstream: %s' %
-                          result.stderr.strip())
-     patch_count = len(result.stdout.splitlines())
-     return patch_count
- 
-+
- def name_revision(commit_hash):
-     """Gets the revision name for a commit
- 
-@@ -91,6 +91,7 @@ def name_revision(commit_hash):
-     name = stdout.split(' ')[1].strip()
-     return name
- 
-+
- def guess_upstream(git_dir, branch):
-     """Tries to guess the upstream for a branch
- 
-@@ -109,7 +110,7 @@ def guess_upstream(git_dir, branch):
-     """
-     pipe = [log_cmd(branch, git_dir=git_dir, oneline=True, count=100)]
-     result = command.run_pipe(pipe, capture=True, capture_stderr=True,
--                             raise_on_error=False)
-+                              raise_on_error=False)
-     if result.return_code:
-         return None, "Branch '%s' not found" % branch
-     for line in result.stdout.splitlines()[1:]:
-@@ -121,6 +122,7 @@ def guess_upstream(git_dir, branch):
-             return name, "Guessing upstream as '%s'" % name
-     return None, "Cannot find a suitable upstream for branch '%s'" % branch
- 
-+
- def get_upstream(git_dir, branch):
-     """Returns the name of the upstream for a branch
- 
-@@ -135,10 +137,10 @@ def get_upstream(git_dir, branch):
-     """
-     try:
-         remote = command.output_one_line('git', '--git-dir', git_dir, 'config',
--                                       'branch.%s.remote' % branch)
-+                                         'branch.%s.remote' % branch)
-         merge = command.output_one_line('git', '--git-dir', git_dir, 'config',
--                                      'branch.%s.merge' % branch)
--    except:
-+                                        'branch.%s.merge' % branch)
-+    except Exception:
-         upstream, msg = guess_upstream(git_dir, branch)
-         return upstream, msg
- 
-@@ -149,7 +151,8 @@ def get_upstream(git_dir, branch):
-         return '%s/%s' % (remote, leaf), None
-     else:
-         raise ValueError("Cannot determine upstream branch for branch "
--                "'%s' remote='%s', merge='%s'" % (branch, remote, merge))
-+                         "'%s' remote='%s', merge='%s'"
-+                         % (branch, remote, merge))
- 
- 
- def get_range_in_branch(git_dir, branch, include_upstream=False):
-@@ -168,6 +171,7 @@ def get_range_in_branch(git_dir, branch, include_upstream=False):
-     rstr = '%s%s..%s' % (upstream, '~' if include_upstream else '', branch)
-     return rstr, msg
- 
-+
- def count_commits_in_range(git_dir, range_expr):
-     """Returns the number of commits in the given range.
- 
-@@ -180,12 +184,13 @@ def count_commits_in_range(git_dir, range_expr):
-     """
-     pipe = [log_cmd(range_expr, git_dir=git_dir, oneline=True)]
-     result = command.run_pipe(pipe, capture=True, capture_stderr=True,
--                             raise_on_error=False)
-+                              raise_on_error=False)
-     if result.return_code:
-         return None, "Range '%s' not found or is invalid" % range_expr
-     patch_count = len(result.stdout.splitlines())
-     return patch_count, None
- 
-+
- def count_commits_in_branch(git_dir, branch, include_upstream=False):
-     """Returns the number of commits in the given branch.
- 
-@@ -201,6 +206,7 @@ def count_commits_in_branch(git_dir, branch, include_upstream=False):
-         return None, msg
-     return count_commits_in_range(git_dir, range_expr)
- 
-+
- def count_commits(commit_range):
-     """Returns the number of commits in the given range.
- 
-@@ -215,6 +221,7 @@ def count_commits(commit_range):
-     patch_count = int(stdout)
-     return patch_count
- 
-+
- def checkout(commit_hash, git_dir=None, work_tree=None, force=False):
-     """Checkout the selected commit for this build
- 
-@@ -231,10 +238,11 @@ def checkout(commit_hash, git_dir=None, work_tree=None, force=False):
-         pipe.append('-f')
-     pipe.append(commit_hash)
-     result = command.run_pipe([pipe], capture=True, raise_on_error=False,
--                             capture_stderr=True)
-+                              capture_stderr=True)
-     if result.return_code != 0:
-         raise OSError('git checkout (%s): %s' % (pipe, result.stderr))
- 
-+
- def clone(git_dir, output_dir):
-     """Checkout the selected commit for this build
- 
-@@ -243,10 +251,11 @@ def clone(git_dir, output_dir):
-     """
-     pipe = ['git', 'clone', git_dir, '.']
-     result = command.run_pipe([pipe], capture=True, cwd=output_dir,
--                             capture_stderr=True)
-+                              capture_stderr=True)
-     if result.return_code != 0:
-         raise OSError('git clone: %s' % result.stderr)
- 
-+
- def fetch(git_dir=None, work_tree=None):
-     """Fetch from the origin repo
- 
-@@ -263,6 +272,7 @@ def fetch(git_dir=None, work_tree=None):
-     if result.return_code != 0:
-         raise OSError('git fetch: %s' % result.stderr)
- 
-+
- def check_worktree_is_available(git_dir):
-     """Check if git-worktree functionality is available
- 
-@@ -274,9 +284,10 @@ def check_worktree_is_available(git_dir):
-     """
-     pipe = ['git', '--git-dir', git_dir, 'worktree', 'list']
-     result = command.run_pipe([pipe], capture=True, capture_stderr=True,
--                             raise_on_error=False)
-+                              raise_on_error=False)
-     return result.return_code == 0
- 
-+
- def add_worktree(git_dir, output_dir, commit_hash=None):
-     """Create and checkout a new git worktree for this build
- 
-@@ -290,10 +301,11 @@ def add_worktree(git_dir, output_dir, commit_hash=None):
-     if commit_hash:
-         pipe.append(commit_hash)
-     result = command.run_pipe([pipe], capture=True, cwd=output_dir,
--                             capture_stderr=True)
-+                              capture_stderr=True)
-     if result.return_code != 0:
-         raise OSError('git worktree add: %s' % result.stderr)
- 
-+
- def prune_worktrees(git_dir):
-     """Remove administrative files for deleted worktrees
- 
-@@ -305,7 +317,8 @@ def prune_worktrees(git_dir):
-     if result.return_code != 0:
-         raise OSError('git worktree prune: %s' % result.stderr)
- 
--def create_patches(branch, start, count, ignore_binary, series, signoff = True):
-+
-+def create_patches(branch, start, count, ignore_binary, series, signoff=True):
-     """Create a series of patches from the top of the current branch.
- 
-     The patch files are written to the current directory using
-@@ -321,9 +334,7 @@ def create_patches(branch, start, count, ignore_binary, series, signoff = True):
-         Filename of cover letter (None if none)
-         List of filenames of patch files
-     """
--    if series.get('version'):
--        version = '%s ' % series['version']
--    cmd = ['git', 'format-patch', '-M' ]
-+    cmd = ['git', 'format-patch', '-M']
-     if signoff:
-         cmd.append('--signoff')
-     if ignore_binary:
-@@ -341,9 +352,10 @@ def create_patches(branch, start, count, ignore_binary, series, signoff = True):
- 
-     # We have an extra file if there is a cover letter
-     if series.get('cover'):
--       return files[0], files[1:]
-+        return files[0], files[1:]
-     else:
--       return None, files
-+        return None, files
-+
- 
- def build_email_list(in_list, tag=None, alias=None, warn_on_error=True):
-     """Build a list of email addresses based on an input list.
-@@ -385,40 +397,43 @@ def build_email_list(in_list, tag=None, alias=None, warn_on_error=True):
-         raw += lookup_email(item, alias, warn_on_error=warn_on_error)
-     result = []
-     for item in raw:
--        if not item in result:
-+        if item not in result:
-             result.append(item)
-     if tag:
-         return ['%s %s%s%s' % (tag, quote, email, quote) for email in result]
-     return result
- 
-+
- def check_suppress_cc_config():
-     """Check if sendemail.suppresscc is configured correctly.
- 
-     Returns:
-         True if the option is configured correctly, False otherwise.
-     """
--    suppresscc = command.output_one_line('git', 'config', 'sendemail.suppresscc',
--                                       raise_on_error=False)
-+    suppresscc = command.output_one_line(
-+        'git', 'config', 'sendemail.suppresscc', raise_on_error=False)
- 
-     # Other settings should be fine.
-     if suppresscc == 'all' or suppresscc == 'cccmd':
-         col = terminal.Color()
- 
-         print((col.build(col.RED, "error") +
--            ": git config sendemail.suppresscc set to %s\n"  % (suppresscc)) +
--            "  patman needs --cc-cmd to be run to set the cc list.\n" +
--            "  Please run:\n" +
--            "    git config --unset sendemail.suppresscc\n" +
--            "  Or read the man page:\n" +
--            "    git send-email --help\n" +
--            "  and set an option that runs --cc-cmd\n")
-+               ": git config sendemail.suppresscc set to %s\n"
-+               % (suppresscc)) +
-+              "  patman needs --cc-cmd to be run to set the cc list.\n" +
-+              "  Please run:\n" +
-+              "    git config --unset sendemail.suppresscc\n" +
-+              "  Or read the man page:\n" +
-+              "    git send-email --help\n" +
-+              "  and set an option that runs --cc-cmd\n")
-         return False
- 
-     return True
- 
-+
- def email_patches(series, cover_fname, args, dry_run, warn_on_error, cc_fname,
--        self_only=False, alias=None, in_reply_to=None, thread=False,
--        smtp_server=None):
-+                  self_only=False, alias=None, in_reply_to=None, thread=False,
-+                  smtp_server=None, get_maintainer_script=None):
-     """Email a patch series.
- 
-     Args:
-@@ -435,6 +450,7 @@ def email_patches(series, cover_fname, args, dry_run, warn_on_error, cc_fname,
-         thread: True to add --thread to git send-email (make
-             all patches reply to cover-letter or first patch in series)
-         smtp_server: SMTP server to use to send patches
-+        get_maintainer_script: File name of script to get maintainers emails
- 
-     Returns:
-         Git command that was/would be run
-@@ -487,9 +503,10 @@ send --cc-cmd cc-fname" cover p1 p2'
-                   "git config sendemail.to u-boot@lists.denx.de")
-             return
-     cc = build_email_list(list(set(series.get('cc')) - set(series.get('to'))),
--                        '--cc', alias, warn_on_error)
-+                          '--cc', alias, warn_on_error)
-     if self_only:
--        to = build_email_list([os.getenv('USER')], '--to', alias, warn_on_error)
-+        to = build_email_list([os.getenv('USER')], '--to',
-+                              alias, warn_on_error)
-         cc = []
-     cmd = ['git', 'send-email', '--annotate']
-     if smtp_server:
-@@ -565,7 +582,7 @@ def lookup_email(lookup_name, alias=None, warn_on_error=True, level=0):
-     if not alias:
-         alias = settings.alias
-     lookup_name = lookup_name.strip()
--    if '@' in lookup_name: # Perhaps a real email address
-+    if '@' in lookup_name:      # Perhaps a real email address
-         return [lookup_name]
- 
-     lookup_name = lookup_name.lower()
-@@ -581,7 +598,7 @@ def lookup_email(lookup_name, alias=None, warn_on_error=True, level=0):
-             return out_list
- 
-     if lookup_name:
--        if not lookup_name in alias:
-+        if lookup_name not in alias:
-             msg = "Alias '%s' not found" % lookup_name
-             if warn_on_error:
-                 print(col.build(col.RED, msg))
-@@ -589,11 +606,12 @@ def lookup_email(lookup_name, alias=None, warn_on_error=True, level=0):
-         for item in alias[lookup_name]:
-             todo = lookup_email(item, alias, warn_on_error, level + 1)
-             for new_item in todo:
--                if not new_item in out_list:
-+                if new_item not in out_list:
-                     out_list.append(new_item)
- 
-     return out_list
- 
-+
- def get_top_level():
-     """Return name of top-level directory for this git repo.
- 
-@@ -608,6 +626,7 @@ def get_top_level():
-     """
-     return command.output_one_line('git', 'rev-parse', '--show-toplevel')
- 
-+
- def get_alias_file():
-     """Gets the name of the git alias file.
- 
-@@ -615,7 +634,7 @@ def get_alias_file():
-         Filename of git alias file, or None if none
-     """
-     fname = command.output_one_line('git', 'config', 'sendemail.aliasesfile',
--            raise_on_error=False)
-+                                    raise_on_error=False)
-     if not fname:
-         return None
- 
-@@ -625,6 +644,7 @@ def get_alias_file():
- 
-     return os.path.join(get_top_level(), fname)
- 
-+
- def get_default_user_name():
-     """Gets the user.name from .gitconfig file.
- 
-@@ -634,6 +654,7 @@ def get_default_user_name():
-     uname = command.output_one_line('git', 'config', '--global', 'user.name')
-     return uname
- 
-+
- def get_default_user_email():
-     """Gets the user.email from the global .gitconfig file.
- 
-@@ -643,17 +664,19 @@ def get_default_user_email():
-     uemail = command.output_one_line('git', 'config', '--global', 'user.email')
-     return uemail
- 
-+
- def get_default_subject_prefix():
-     """Gets the format.subjectprefix from local .git/config file.
- 
-     Returns:
-         Subject prefix found in local .git/config file, or None if none
-     """
--    sub_prefix = command.output_one_line('git', 'config', 'format.subjectprefix',
--                 raise_on_error=False)
-+    sub_prefix = command.output_one_line(
-+        'git', 'config', 'format.subjectprefix', raise_on_error=False)
- 
-     return sub_prefix
- 
-+
- def setup():
-     """Set up git utils, by reading the alias files."""
-     # Check for a git alias file also
-@@ -666,6 +689,7 @@ def setup():
-     use_no_decorate = (command.run_pipe([cmd], raise_on_error=False)
-                        .return_code == 0)
- 
-+
- def get_head():
-     """Get the hash of the current HEAD
- 
-@@ -674,6 +698,7 @@ def get_head():
-     """
-     return command.output_one_line('git', 'show', '-s', '--pretty=format:%H')
- 
-+
- if __name__ == "__main__":
-     import doctest
- 
-diff --git a/tools/patman/patman b/tools/patman/patman
-index 11a5d8e18a..5a427d1942 120000
---- a/tools/patman/patman
-+++ b/tools/patman/patman
-@@ -1 +1 @@
--main.py
-\ No newline at end of file
-+__main__.py
-\ No newline at end of file
-diff --git a/tools/patman/patman.rst b/tools/patman/patman.rst
-index 8c5c9cc2cc..6113962fb4 100644
---- a/tools/patman/patman.rst
-+++ b/tools/patman/patman.rst
-@@ -1,6 +1,7 @@
- .. SPDX-License-Identifier: GPL-2.0+
- .. Copyright (c) 2011 The Chromium OS Authors
- .. Simon Glass <sjg@chromium.org>
-+.. Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
- .. v1, v2, 19-Oct-11
- .. revised v3 24-Nov-11
- .. revised v4 Independence Day 2020, with Patchwork integration
-@@ -68,13 +69,28 @@ this once::
- 
-     git config sendemail.aliasesfile doc/git-mailrc
- 
--For both Linux and U-Boot the 'scripts/get_maintainer.pl' handles figuring
--out where to send patches pretty well.
-+For both Linux and U-Boot the 'scripts/get_maintainer.pl' handles
-+figuring out where to send patches pretty well. For other projects,
-+you may want to specify a different script to be run, for example via
-+a project-specific `.patman` file::
-+
-+    # .patman configuration file at the root of some project
-+
-+    [settings]
-+    get_maintainer_script: etc/teams.scm get-maintainer
-+
-+The `get_maintainer_script` option corresponds to the
-+`--get-maintainer-script` argument of the `send` command.  It is
-+looked relatively to the root of the current git repository, as well
-+as on PATH.  It can also be provided arguments, as shown above.  The
-+contract is that the script should accept a patch file name and return
-+a list of email addresses, one per line, like `get_maintainer.pl`
-+does.
- 
- During the first run patman creates a config file for you by taking the default
- user name and email address from the global .gitconfig file.
- 
--To add your own, create a file ~/.patman like this::
-+To add your own, create a file `~/.patman` like this::
- 
-     # patman alias file
- 
-@@ -85,6 +101,12 @@ To add your own, create a file ~/.patman like this::
-     wolfgang: Wolfgang Denk <wd@denx.de>
-     others: Mike Frysinger <vapier@gentoo.org>, Fred Bloggs <f.bloggs@napier.net>
- 
-+As hinted above, Patman will also look for a `.patman` configuration
-+file at the root of the current project git repository, which makes it
-+possible to override the `project` settings variable or anything else
-+in a project-specific way. The values of this "local" configuration
-+file take precedence over those of the "global" one.
-+
- Aliases are recursive.
- 
- The checkpatch.pl in the U-Boot tools/ subdirectory will be located and
-@@ -680,6 +702,16 @@ them:
- 
-     $ tools/patman/patman test
- 
-+Note that since the test suite depends on data files only available in
-+the git checkout, the `test` command is hidden unless `patman` is
-+invoked from the U-Boot git repository.
-+
-+Alternatively, you can run the test suite via Pytest:
-+
-+.. code-block:: bash
-+
-+    $ cd tools/patman && pytest
-+
- Error handling doesn't always produce friendly error messages - e.g.
- putting an incorrect tag in a commit may provide a confusing message.
- 
-diff --git a/tools/patman/pytest.ini b/tools/patman/pytest.ini
-new file mode 100644
-index 0000000000..df3eb518d0
---- /dev/null
-+++ b/tools/patman/pytest.ini
-@@ -0,0 +1,2 @@
-+[pytest]
-+addopts = --doctest-modules
-diff --git a/tools/patman/series.py b/tools/patman/series.py
-index 3075378ac1..2eeeef71dc 100644
---- a/tools/patman/series.py
-+++ b/tools/patman/series.py
-@@ -235,7 +235,7 @@ class Series(dict):
-             print(col.build(col.RED, str))
- 
-     def MakeCcFile(self, process_tags, cover_fname, warn_on_error,
--                   add_maintainers, limit):
-+                   add_maintainers, limit, get_maintainer_script):
-         """Make a cc file for us to use for per-commit Cc automation
- 
-         Also stores in self._generated_cc to make ShowActions() faster.
-@@ -249,6 +249,8 @@ class Series(dict):
-                 True/False to call the get_maintainers to CC maintainers
-                 List of maintainers to include (for testing)
-             limit: Limit the length of the Cc list (None if no limit)
-+            get_maintainer_script: The file name of the get_maintainer.pl
-+                script (or compatible).
-         Return:
-             Filename of temp file created
-         """
-@@ -267,8 +269,9 @@ class Series(dict):
-             if type(add_maintainers) == type(cc):
-                 cc += add_maintainers
-             elif add_maintainers:
--                dir_list = [os.path.join(gitutil.get_top_level(), 'scripts')]
--                cc += get_maintainer.get_maintainer(dir_list, commit.patch)
-+
-+                cc += get_maintainer.get_maintainer(get_maintainer_script,
-+                                                    commit.patch)
-             for x in set(cc) & set(settings.bounces):
-                 print(col.build(col.YELLOW, 'Skipping "%s"' % x))
-             cc = list(set(cc) - set(settings.bounces))
-diff --git a/tools/patman/settings.py b/tools/patman/settings.py
-index 903d6fcb0b..636983e32d 100644
---- a/tools/patman/settings.py
-+++ b/tools/patman/settings.py
-@@ -1,18 +1,18 @@
- # SPDX-License-Identifier: GPL-2.0+
- # Copyright (c) 2011 The Chromium OS Authors.
-+# Copyright (c) 2022 Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
- #
- 
- try:
-     import configparser as ConfigParser
--except:
-+except Exception:
-     import ConfigParser
- 
- import argparse
- import os
- import re
- 
--from patman import command
--from patman import tools
-+from patman import gitutil
- 
- """Default settings per-project.
- 
-@@ -32,7 +32,8 @@ _default_settings = {
-     },
- }
- 
--class _ProjectConfigParser(ConfigParser.SafeConfigParser):
-+
-+class _ProjectConfigParser(ConfigParser.ConfigParser):
-     """ConfigParser that handles projects.
- 
-     There are two main goals of this class:
-@@ -83,14 +84,14 @@ class _ProjectConfigParser(ConfigParser.SafeConfigParser):
-     def __init__(self, project_name):
-         """Construct _ProjectConfigParser.
- 
--        In addition to standard SafeConfigParser initialization, this also loads
--        project defaults.
-+        In addition to standard ConfigParser initialization, this also
-+        loads project defaults.
- 
-         Args:
-             project_name: The name of the project.
-         """
-         self._project_name = project_name
--        ConfigParser.SafeConfigParser.__init__(self)
-+        ConfigParser.ConfigParser.__init__(self)
- 
-         # Update the project settings in the config based on
-         # the _default_settings global.
-@@ -102,31 +103,31 @@ class _ProjectConfigParser(ConfigParser.SafeConfigParser):
-             self.set(project_settings, setting_name, setting_value)
- 
-     def get(self, section, option, *args, **kwargs):
--        """Extend SafeConfigParser to try project_section before section.
-+        """Extend ConfigParser to try project_section before section.
- 
-         Args:
--            See SafeConfigParser.
-+            See ConfigParser.
-         Returns:
--            See SafeConfigParser.
-+            See ConfigParser.
-         """
-         try:
--            val = ConfigParser.SafeConfigParser.get(
-+            val = ConfigParser.ConfigParser.get(
-                 self, "%s_%s" % (self._project_name, section), option,
-                 *args, **kwargs
-             )
-         except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
--            val = ConfigParser.SafeConfigParser.get(
-+            val = ConfigParser.ConfigParser.get(
-                 self, section, option, *args, **kwargs
-             )
-         return val
- 
-     def items(self, section, *args, **kwargs):
--        """Extend SafeConfigParser to add project_section to section.
-+        """Extend ConfigParser to add project_section to section.
- 
-         Args:
--            See SafeConfigParser.
-+            See ConfigParser.
-         Returns:
--            See SafeConfigParser.
-+            See ConfigParser.
-         """
-         project_items = []
-         has_project_section = False
-@@ -134,7 +135,7 @@ class _ProjectConfigParser(ConfigParser.SafeConfigParser):
- 
-         # Get items from the project section
-         try:
--            project_items = ConfigParser.SafeConfigParser.items(
-+            project_items = ConfigParser.ConfigParser.items(
-                 self, "%s_%s" % (self._project_name, section), *args, **kwargs
-             )
-             has_project_section = True
-@@ -143,7 +144,7 @@ class _ProjectConfigParser(ConfigParser.SafeConfigParser):
- 
-         # Get top-level items
-         try:
--            top_items = ConfigParser.SafeConfigParser.items(
-+            top_items = ConfigParser.ConfigParser.items(
-                 self, section, *args, **kwargs
-             )
-         except ConfigParser.NoSectionError:
-@@ -155,6 +156,7 @@ class _ProjectConfigParser(ConfigParser.SafeConfigParser):
-         item_dict.update(project_items)
-         return {(item, val) for item, val in item_dict.items()}
- 
-+
- def ReadGitAliases(fname):
-     """Read a git alias file. This is in the form used by git:
- 
-@@ -170,7 +172,7 @@ def ReadGitAliases(fname):
-         print("Warning: Cannot find alias file '%s'" % fname)
-         return
- 
--    re_line = re.compile('alias\s+(\S+)\s+(.*)')
-+    re_line = re.compile(r'alias\s+(\S+)\s+(.*)')
-     for line in fd.readlines():
-         line = line.strip()
-         if not line or line[0] == '#':
-@@ -190,7 +192,8 @@ def ReadGitAliases(fname):
- 
-     fd.close()
- 
--def CreatePatmanConfigFile(gitutil, config_fname):
-+
-+def CreatePatmanConfigFile(config_fname):
-     """Creates a config file under $(HOME)/.patman if it can't find one.
- 
-     Args:
-@@ -200,12 +203,12 @@ def CreatePatmanConfigFile(gitutil, config_fname):
-         None
-     """
-     name = gitutil.get_default_user_name()
--    if name == None:
-+    if name is None:
-         name = input("Enter name: ")
- 
-     email = gitutil.get_default_user_email()
- 
--    if email == None:
-+    if email is None:
-         email = input("Enter email: ")
- 
-     try:
-@@ -220,7 +223,8 @@ me: %s <%s>
- [bounces]
- nxp = Zhikang Zhang <zhikang.zhang@nxp.com>
- ''' % (name, email), file=f)
--    f.close();
-+    f.close()
-+
- 
- def _UpdateDefaults(main_parser, config):
-     """Update the given OptionParser defaults based on config.
-@@ -242,8 +246,8 @@ def _UpdateDefaults(main_parser, config):
-     # Find all the parsers and subparsers
-     parsers = [main_parser]
-     parsers += [subparser for action in main_parser._actions
--                  if isinstance(action, argparse._SubParsersAction)
--                  for _, subparser in action.choices.items()]
-+                if isinstance(action, argparse._SubParsersAction)
-+                for _, subparser in action.choices.items()]
- 
-     # Collect the defaults from each parser
-     defaults = {}
-@@ -270,8 +274,9 @@ def _UpdateDefaults(main_parser, config):
-     # Set all the defaults and manually propagate them to subparsers
-     main_parser.set_defaults(**defaults)
-     for parser, pdefs in zip(parsers, parser_defaults):
--        parser.set_defaults(**{ k: v for k, v in defaults.items()
--                                    if k in pdefs })
-+        parser.set_defaults(**{k: v for k, v in defaults.items()
-+                               if k in pdefs})
-+
- 
- def _ReadAliasFile(fname):
-     """Read in the U-Boot git alias file if it exists.
-@@ -298,6 +303,7 @@ def _ReadAliasFile(fname):
-         if bad_line:
-             print(bad_line)
- 
-+
- def _ReadBouncesFile(fname):
-     """Read in the bounces file if it exists
- 
-@@ -311,6 +317,7 @@ def _ReadBouncesFile(fname):
-                     continue
-                 bounces.add(line.strip())
- 
-+
- def GetItems(config, section):
-     """Get the items from a section of the config.
- 
-@@ -323,31 +330,50 @@ def GetItems(config, section):
-     """
-     try:
-         return config.items(section)
--    except ConfigParser.NoSectionError as e:
-+    except ConfigParser.NoSectionError:
-         return []
--    except:
--        raise
- 
--def Setup(gitutil, parser, project_name, config_fname=''):
-+
-+def Setup(parser, project_name, config_fname=None):
-     """Set up the settings module by reading config files.
- 
-+    Unless `config_fname` is specified, a `.patman` config file local
-+    to the git repository is consulted, followed by the global
-+    `$HOME/.patman`. If none exists, the later is created. Values
-+    defined in the local config file take precedence over those
-+    defined in the global one.
-+
-     Args:
--        parser:         The parser to update
-+        parser:         The parser to update.
-         project_name:   Name of project that we're working on; we'll look
-             for sections named "project_section" as well.
--        config_fname:   Config filename to read ('' for default)
-+        config_fname:   Config filename to read.  An error is raised if it
-+            does not exist.
-     """
-     # First read the git alias file if available
-     _ReadAliasFile('doc/git-mailrc')
-     config = _ProjectConfigParser(project_name)
--    if config_fname == '':
-+
-+    if config_fname and not os.path.exists(config_fname):
-+        raise Exception(f'provided {config_fname} does not exist')
-+
-+    if not config_fname:
-         config_fname = '%s/.patman' % os.getenv('HOME')
-+    has_config = os.path.exists(config_fname)
-+
-+    git_local_config_fname = os.path.join(gitutil.get_top_level(), '.patman')
-+    has_git_local_config = os.path.exists(git_local_config_fname)
- 
--    if not os.path.exists(config_fname):
--        print("No config file found ~/.patman\nCreating one...\n")
--        CreatePatmanConfigFile(gitutil, config_fname)
-+    # Read the git local config last, so that its values override
-+    # those of the global config, if any.
-+    if has_config:
-+        config.read(config_fname)
-+    if has_git_local_config:
-+        config.read(git_local_config_fname)
- 
--    config.read(config_fname)
-+    if not (has_config or has_git_local_config):
-+        print("No config file found.\nCreating ~/.patman...\n")
-+        CreatePatmanConfigFile(config_fname)
- 
-     for name, value in GetItems(config, 'alias'):
-         alias[name] = value.split(',')
-@@ -358,6 +384,7 @@ def Setup(gitutil, parser, project_name, config_fname=''):
- 
-     _UpdateDefaults(parser, config)
- 
-+
- # These are the aliases we understand, indexed by alias. Each member is a list.
- alias = {}
- bounces = set()
-diff --git a/tools/patman/setup.py b/tools/patman/setup.py
-index 5643bf1503..2ff791da0f 100644
---- a/tools/patman/setup.py
-+++ b/tools/patman/setup.py
-@@ -7,6 +7,6 @@ setup(name='patman',
-       scripts=['patman'],
-       packages=['patman'],
-       package_dir={'patman': ''},
--      package_data={'patman': ['README']},
-+      package_data={'patman': ['README.rst']},
-       classifiers=['Environment :: Console',
-                    'Topic :: Software Development'])
-diff --git a/tools/patman/test_settings.py b/tools/patman/test_settings.py
-new file mode 100644
-index 0000000000..c768a2fc64
---- /dev/null
-+++ b/tools/patman/test_settings.py
-@@ -0,0 +1,67 @@
-+# SPDX-License-Identifier: GPL-2.0+
-+#
-+# Copyright (c) 2022 Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
-+#
-+
-+import argparse
-+import contextlib
-+import os
-+import sys
-+import tempfile
-+
-+from patman import settings
-+from patman import tools
-+
-+
-+@contextlib.contextmanager
-+def empty_git_repository():
-+    with tempfile.TemporaryDirectory() as tmpdir:
-+        os.chdir(tmpdir)
-+        tools.run('git', 'init', raise_on_error=True)
-+        yield tmpdir
-+
-+
-+@contextlib.contextmanager
-+def cleared_command_line_args():
-+    old_value = sys.argv[:]
-+    sys.argv = [sys.argv[0]]
-+    try:
-+        yield
-+    finally:
-+        sys.argv = old_value
-+
-+
-+def test_git_local_config():
-+    # Clearing the command line arguments is required, otherwise
-+    # arguments passed to the test running such as in 'pytest -k
-+    # filter' would be processed by _UpdateDefaults and fail.
-+    with cleared_command_line_args():
-+        with empty_git_repository():
-+            with tempfile.NamedTemporaryFile() as global_config:
-+                global_config.write(b'[settings]\n'
-+                                    b'project=u-boot\n')
-+                global_config.flush()
-+                parser = argparse.ArgumentParser()
-+                parser.add_argument('-p', '--project', default='unknown')
-+                subparsers = parser.add_subparsers(dest='cmd')
-+                send = subparsers.add_parser('send')
-+                send.add_argument('--no-check', action='store_false',
-+                                  dest='check_patch', default=True)
-+
-+                # Test "global" config is used.
-+                settings.Setup(parser, 'unknown', global_config.name)
-+                args, _ = parser.parse_known_args([])
-+                assert args.project == 'u-boot'
-+                send_args, _ = send.parse_known_args([])
-+                assert send_args.check_patch
-+
-+                # Test local config can shadow it.
-+                with open('.patman', 'w', buffering=1) as f:
-+                    f.write('[settings]\n'
-+                            'project: guix-patches\n'
-+                            'check_patch: False\n')
-+                settings.Setup(parser, 'unknown', global_config.name)
-+                args, _ = parser.parse_known_args([])
-+                assert args.project == 'guix-patches'
-+                send_args, _ = send.parse_known_args([])
-+                assert not send_args.check_patch
diff --git a/gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch b/gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch
index a5b92e3e8f..858f42efe7 100644
--- a/gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch
+++ b/gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch
@@ -5,12 +5,12 @@ Index: u-boot-2021.07~rc4+dfsg/include/configs/sifive-unmatched.h
 ===================================================================
 --- u-boot-2021.07~rc4+dfsg.orig/include/configs/sifive-unmatched.h
 +++ u-boot-2021.07~rc4+dfsg/include/configs/sifive-unmatched.h
-@@ -62,6 +62,8 @@
+@@ -55,6 +55,8 @@
  	"name=system,size=-,bootable,type=${type_guid_gpt_system};"
  
- #define CONFIG_EXTRA_ENV_SETTINGS \
+ #define CFG_EXTRA_ENV_SETTINGS \
 +	"fdt_high=0xffffffffffffffff\0" \
 +	"initrd_high=0xffffffffffffffff\0" \
  	"kernel_addr_r=0x84000000\0" \
- 	"fdt_addr_r=0x88000000\0" \
- 	"scriptaddr=0x88100000\0" \
+ 	"kernel_comp_addr_r=0x88000000\0" \
+ 	"kernel_comp_size=0x4000000\0" \
-- 
cgit 1.4.1


From ed5dc3a25d858a394bb7db937a51d866c3cdc6ed Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Tue, 11 May 2021 21:15:15 +0000
Subject: gnu: u-boot: Add crust firmware to pinebook, pine64_plus and
 pine64-lts.

* gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package): Take argument
for System Control Processor (SCP) firmware.
[native-inputs]: Add SCP firmware.
[phases]: Adjust 'set-environment to also set SCP variable.
(u-boot-pine64-plus, u-boot-pine64-lts, u-boot-pinebook): Pass appropriate
crust firmware as the SCP firmware.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/bootloaders.scm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 966f1787f8..ea69fc890b 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1010,7 +1010,7 @@ removed so that it fits within common partitioning schemes.")))
 (define-public u-boot-am335x-evm
   (make-u-boot-package "am335x_evm" "arm-linux-gnueabihf"))
 
-(define*-public (make-u-boot-sunxi64-package board triplet
+(define*-public (make-u-boot-sunxi64-package board triplet scp-firmware
                                              #:key defconfig configs)
   (let ((base (make-u-boot-package
                board triplet #:defconfig defconfig #:configs configs)))
@@ -1022,23 +1022,27 @@ removed so that it fits within common partitioning schemes.")))
           #~(modify-phases #$phases
               (add-after 'unpack 'set-environment
                 (lambda* (#:key native-inputs inputs #:allow-other-keys)
-                  ;; Avoid dependency on crust-firmware
-                  ;; https://issues.guix.gnu.org/48371
-                  (setenv "SCP" "/dev/null")
+                  (setenv "SCP" (search-input-file
+                                 native-inputs "libexec/scp.bin"))
                   (setenv "BL31" (search-input-file inputs "bl31.bin"))))))))
+      (native-inputs
+       (modify-inputs (package-native-inputs base)
+         (append scp-firmware)))
       (inputs
        (modify-inputs (package-inputs base)
          (append arm-trusted-firmware-sun50i-a64))))))
 
 (define-public u-boot-pine64-plus
-  (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu"))
+  (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu"
+                               crust-pine64-plus))
 
 (define-public u-boot-pine64-lts
-  (make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu"))
+  (make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu"
+                               crust-pine64-plus))
 
 (define-public u-boot-pinebook
   (make-u-boot-sunxi64-package
-   "pinebook" "aarch64-linux-gnu"
+   "pinebook" "aarch64-linux-gnu" crust-pinebook
    ;; Fix regression with LCD video output introduced in 2020.01
    ;; https://patchwork.ozlabs.org/patch/1225130/
    #:configs '("CONFIG_VIDEO_BPP32=y")))
-- 
cgit 1.4.1


From ffbcc113df02293e1676310dbf3bfb23df8cae10 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sat, 8 Jul 2023 00:03:17 -0400
Subject: gnu: Add python-u-boot-pylib.

* gnu/packages/bootloaders.scm (python-u-boot-pylib): New variable.
* gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.

Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
---
 gnu/local.mk                                       |  1 +
 gnu/packages/bootloaders.scm                       | 23 ++++++++++++++++++++-
 .../patches/u-boot-fix-u-boot-lib-build.patch      | 24 ++++++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index cdce2666e5..ad31e8d2de 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2005,6 +2005,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/twinkle-bcg729.patch			\
   %D%/packages/patches/u-boot-allow-disabling-openssl.patch	\
   %D%/packages/patches/u-boot-fix-build-python-3.10.patch	\
+  %D%/packages/patches/u-boot-fix-u-boot-lib-build.patch	\
   %D%/packages/patches/u-boot-nintendo-nes-serial.patch		\
   %D%/packages/patches/u-boot-rockchip-inno-usb.patch		\
   %D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch	\
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index ea69fc890b..8afb2c3293 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -655,7 +655,8 @@ tree binary files.  These are board description files used by Linux and BSD.")
                      %u-boot-allow-disabling-openssl-patch
                      %u-boot-sifive-prevent-relocating-initrd-fdt
                      %u-boot-rk3399-enable-emmc-phy-patch
-                     (search-patch "u-boot-fix-build-python-3.10.patch")))
+                     (search-patch "u-boot-fix-build-python-3.10.patch")
+                     (search-patch "u-boot-fix-u-boot-lib-build.patch")))
               (method url-fetch)
               (uri (string-append
                     "https://ftp.denx.de/pub/u-boot/"
@@ -841,6 +842,26 @@ CONFIG_TOOLS_LIBCRYPTO=n")
                   "  This package provides board-independent tools "
                   "of U-Boot."))))
 
+(define-public python-u-boot-pylib
+  (package
+    (inherit u-boot)
+    (name "python-u-boot-pylib")
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "tools/u_boot_pylib")))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "./u_boot_pylib")))))))
+    (synopsis "U-Boot Python library")
+    (description "This package provides common Python code used by some of the
+commands part of the U-Boot project, such as Patman.")))
+
 ;;; This is packaged separately, as it can be used in other contexts than for
 ;;; U-Boot development.
 (define-public patman
diff --git a/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch b/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch
new file mode 100644
index 0000000000..233c437de6
--- /dev/null
+++ b/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch
@@ -0,0 +1,24 @@
+Submitted upstream (see:
+https://lists.denx.de/pipermail/u-boot/2023-July/521984.html)
+
+diff --git a/tools/u_boot_pylib/pyproject.toml b/tools/u_boot_pylib/pyproject.toml
+index 3f33caf6f8..037c5d629e 100644
+--- a/tools/u_boot_pylib/pyproject.toml
++++ b/tools/u_boot_pylib/pyproject.toml
+@@ -9,7 +9,7 @@ authors = [
+   { name="Simon Glass", email="sjg@chromium.org" },
+ ]
+ description = "U-Boot python library"
+-readme = "README.md"
++readme = "README.rst"
+ requires-python = ">=3.7"
+ classifiers = [
+     "Programming Language :: Python :: 3",
+@@ -20,3 +20,7 @@ classifiers = [
+ [project.urls]
+ "Homepage" = "https://u-boot.readthedocs.io"
+ "Bug Tracker" = "https://source.denx.de/groups/u-boot/-/issues"
++
++[tool.setuptools.packages.find]
++where = [".."]
++include = ["u_boot_pylib*"]
-- 
cgit 1.4.1


From cf1216d8763adf3c5e9d79d7abd2c5ecc8861d60 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sat, 8 Jul 2023 00:03:18 -0400
Subject: gnu: patman: Add python-u-boot-pylib to inputs.

* gnu/packages/bootloaders.scm (patman) [inputs]: Add python-u-boot-pylib.
[phases]: Remove 'sanity-check.

Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
---
 gnu/packages/bootloaders.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 8afb2c3293..30ef673f7d 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -876,10 +876,13 @@ commands part of the U-Boot project, such as Patman.")))
       #:tests? #f
       #:phases
       #~(modify-phases %standard-phases
+          ;; Patman fails to run during 'sanity-check phase, as it needs to be
+          ;; run within a git directory.
+          (delete 'sanity-check)
           (add-after 'unpack 'chdir
             (lambda _
               (chdir "tools/patman"))))))
-    (inputs (list python-pygit2 python-requests))
+    (inputs (list python-pygit2 python-requests python-u-boot-pylib))
     (synopsis "Patch automation tool")
     (description "Patman is a patch automation script which:
 @itemize
-- 
cgit 1.4.1


From d4306847bf8736bf60a2ff435fd2d8ef763f769c Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 2 Jun 2023 09:03:07 +0200
Subject: Revert "gnu: libunistring: Fix make check for the Hurd."

This reverts commit 12e6a5923812abf180f03bea9e07dd99244a3fcd, which used
XFAIL_TESTS to have 'make check' pass with failing tests "test-perror2"
"test-strerror_r" that now pass with glibc-2.37 and libc-for-target in
commencement.
---
 gnu/packages/libunistring.scm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm
index e68b7d2378..eccd053a35 100644
--- a/gnu/packages/libunistring.scm
+++ b/gnu/packages/libunistring.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016, 2018, 2022 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -28,7 +28,6 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix gexp)
-  #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
   #:use-module (gnu packages base))
@@ -61,10 +60,7 @@
               (with-directory-excursion (string-append #$output "/lib")
                 (install-file "libunistring.a"
                               (string-append #$output:static "/lib"))
-                (delete-file "libunistring.a")))))
-      #:make-flags (if (target-hurd?)
-                       #~(list "XFAIL_TESTS=test-perror2 test-strerror_r")
-                       #~'())))
+                (delete-file "libunistring.a")))))))
    (synopsis "C library for manipulating Unicode strings")
    (description
     "GNU libunistring is a library providing functions to manipulate
-- 
cgit 1.4.1


From 360c8873ff693297a6a30c8142ec5698e05edf99 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 31 May 2023 11:18:32 +0200
Subject: gnu: guile: Skip hanging and failing pipe tests on the Hurd.

* gnu/packages/guile.scm (guile-3.0)[arguments]: When building on the Hurd,
add stage 'disable-popen.test-open-pipe' to avoid running the
open-input-pipe test (hangs) and open-output-pipe test (fails.
---
 gnu/packages/guile.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 48bee600a9..06ffc39f1d 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -378,6 +378,19 @@ without requiring the source code to be rewritten.")
                                (search-patch "guile-hurd-posix-spawn.patch")))
                           (invoke "patch" "--force" "-p1" "-i" patch))))
                    #~())
+            #$@(if (system-hurd?)
+                   #~((add-after 'unpack 'disable-popen.test-no-duplicate
+                        ;; This test hangs on the Hurd.
+                        (lambda _
+                          (substitute* "test-suite/tests/popen.test"
+                            (("\\(pass-if \"no duplicate\".*" all)
+                             (string-append
+                              all
+                              (object->string
+                               '(when (string-ci= "GNU"
+                                                  (vector-ref (uname) 0))
+                                  (throw 'unresolved)))))))))
+                   #~())
             #$@(if (target-ppc32?)
                    #~((add-after 'unpack 'adjust-bootstrap-flags
                         (lambda _
-- 
cgit 1.4.1


From e4721f7472ba9bc1d025a52edc96a568e9b574b8 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 31 May 2023 17:51:30 +0200
Subject: gnu: coreutils: Skip hanging and failing test on the Hurd.

* gnu/packages/base.scm (coreutils)[arguments]: When building natively on the
Hurd, remove "test/df/unreadable.sh" and "test-perror2" from #:make-flags's
XFAIL_TESTS as they now pass.  Move failing script tests from XFAIL_TESTS to
'remove-tests' phase.  In phase 'remove-tests' rewrite substitute* to skip
tests instead of removing them.  Add hanging and failing tests.
---
 gnu/packages/base.scm | 47 +++++++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 55fe70309c..e941853d20 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -397,23 +397,13 @@ used to apply commands with arbitrarily long arguments.")
    (outputs '("out" "debug"))
    (arguments
     `(#:parallel-build? #f            ; help2man may be called too early
-      ,@(if (target-hurd?)
+      ,@(if (system-hurd?)
             '(#:make-flags            ; these tests fail deterministically
-              (list (string-append "XFAIL_TESTS=tests/misc/env-S.pl"
-                                   " tests/misc/kill.sh"
-                                   " tests/misc/nice.sh"
-                                   " tests/misc/pwd-long.sh"
-                                   " tests/split/fail.sh"
-
-                                   ;; /hurd/fifo issue:
-                                   ;; <https://issues.guix.gnu.org/58803>.
-                                   " tests/df/unreadable.sh"
-
+              (list (string-append "XFAIL_TESTS="
                                    ;; Gnulib tests.
                                    " test-fdutimensat"
                                    " test-futimens"
                                    " test-linkat"
-                                   " test-perror2"
                                    " test-renameat"
                                    " test-renameatu"
                                    " test-utimensat")))
@@ -435,10 +425,35 @@ used to apply commands with arbitrarily long arguments.")
                        (("#!/bin/sh") (string-append "#!" (which "sh"))))))
                  (add-after 'unpack 'remove-tests
                    (lambda _
-                     ,@(if (target-hurd?)
-                           '((substitute* "Makefile.in"
-                               ;; this test hangs
-                               (("^ *tests/misc/timeout-group.sh.*") ""))
+                     ,@(if (system-hurd?)
+                           '((substitute*
+                                 ;; These tests hang
+                                 '("tests/cp/sparse-to-pipe.sh"
+                                   "tests/split/fail.sh"
+                                   ;; These tests error
+                                   "tests/dd/nocache.sh"
+                                   ;; These tests fail
+                                   "tests/cp/sparse.sh"
+                                   "tests/cp/special-f.sh"
+                                   "tests/dd/bytes.sh"
+                                   "tests/dd/stats.sh"
+                                   "tests/ls/dangle.sh"
+                                   "tests/ls/follow-slink.sh"
+                                   "tests/ls/hyperlink.sh"
+                                   "tests/ls/infloop.sh"
+                                   "tests/ls/inode.sh"
+                                   "tests/ls/selinux-segfault.sh"
+                                   "tests/misc/env-S.pl"
+                                   "tests/misc/factor-parallel.sh"
+                                   "tests/misc/ls-misc.pl"
+                                   "tests/misc/nice.sh"
+                                   "tests/misc/pwd-long.sh"
+                                   "tests/misc/shred-passes.sh"
+                                   "tests/misc/stat-slash.sh"
+                                   "tests/rm/fail-eperm.xpl"
+                                   "tests/split/filter.sh")
+                               (("^#!.*" all)
+                                (string-append all "exit 77;\n")))
                              (substitute* "gnulib-tests/Makefile.in"
                                ;; This test sometimes fails and sometimes
                                ;; passes, but it does this consistently, so
-- 
cgit 1.4.1


From f719a4086cabfadfd014e814e1cef6ae4dae94d1 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 2 Jun 2023 15:42:36 +0200
Subject: gnu: grep: Update hanging and failing tests on the Hurd.

* gnu/packages/base.scm (grep)[arguments]: When building natively on the Hurd,
remove Rename phase 'skip-triple-backref-test' to 'skip-tests'.  Remove
"tests/triple-backref" as it now passes.  Add the hanging
"tests/hash-collision-perf" test, and the failing "tests/file" test.
---
 gnu/packages/base.scm | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index e941853d20..f1b027b0dc 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -134,21 +134,17 @@ command-line arguments, multiple languages, and so on.")
                                  (string-append bin "/fgrep"))
                 (("^exec grep")
                  (string-append "exec " bin "/grep"))))))
-        ,@(if (target-hurd?)
-              '((add-before 'check 'skip-triple-backref-test
+        ,@(if (system-hurd?)
+              '((add-before 'check 'skip-test
                   (lambda _
-                    ;; This test is marked as malfunctioning on glibc systems
-                    ;; due to
-                    ;; <https://sourceware.org/bugzilla/show_bug.cgi?id=11053>
-                    ;; and it triggers a segfault with glibc 2.33 on GNU/Hurd.
-                    ;; Skip it.
-                    (substitute* "tests/triple-backref"
-                      (("^warn_" all)
-                       (string-append "exit 77\n" all))))))
-              '()))
-      #:make-flags ,(if (target-hurd?)
-                        ''("XFAIL_TESTS=test-perror2 equiv-classes") ;XXX
-                        ''())))
+                    (substitute*
+                        ;; This test hangs
+                        '("tests/hash-collision-perf"
+                          ;; This test fails
+                          "tests/file")
+                      (("^#!.*" all)
+                       (string-append all "exit 77;\n"))))))
+              '()))))
    (synopsis "Print lines matching a pattern")
    (description
      "grep is a tool for finding text inside files.  Text is found by
-- 
cgit 1.4.1


From 3cc72873d350da37576a68a46870c0ae3ed67cb4 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 2 Jun 2023 14:48:16 +0200
Subject: Revert "gnu: sed: Skip failing test on GNU/Hurd."

This reverts commit 779757047997d315d899b40c199be3709115cce4, as
the gnulib "tests-perror2" test now passes.
---
 gnu/packages/base.scm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index f1b027b0dc..00e59e6f46 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -183,10 +183,6 @@ including, for example, recursive directory searching.")
                     "  CONFIG_HEADER='$(CONFIG_HEADER)'\t\t\\\n")))))
             (modules '((guix build utils)))))
    (build-system gnu-build-system)
-   (arguments
-    `(#:make-flags ,(if (target-hurd?)
-                        ''("XFAIL_TESTS=test-perror2")
-                        ''())))
    (synopsis "Stream editor")
    (native-inputs (list perl))                    ;for tests
    (description
-- 
cgit 1.4.1


From bc8c6e23683d82b5d3bba49d488356478683ffc3 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 2 Jun 2023 16:47:36 +0200
Subject: gnu: findutils: Move test-strerror_r from XFAIL to skip on the Hurd.

* gnu/packages/base.scm (findutils)[arguments]: When building natively on the
Hurd, remove #:make-flags as "test-strerror_r" fails non-deterministically.
Instead, add 'skip-test' phase and skip it.
---
 gnu/packages/base.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 00e59e6f46..14479c4951 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -340,10 +340,16 @@ interactive means to merge two files.")
                      (substitute* '("tests/xargs/verbose-quote.sh"
                                     "tests/find/exec-plus-last-file.sh")
                        (("#!/bin/sh")
-                        (string-append "#!" (which "sh")))))))
-      #:make-flags ,(if (target-hurd?)
-                        ''("XFAIL_TESTS=test-strerror_r")
-                        ''())))
+                        (string-append "#!" (which "sh"))))))
+                 ,@(if (system-hurd?)
+                       '((add-after 'unpack 'skip-tests
+                           (lambda _
+                             (substitute*
+                                 ;; This test fails non-deterministically
+                                 "gnulib-tests/test-strerror_r.c"
+                               (("(^| )main *\\(.*" all)
+                                (string-append all "{\n  exit (77);//"))))))
+                       '()))))
    (synopsis "Operating on files matching given criteria")
    (description
     "Findutils supplies the basic file directory searching utilities of the
-- 
cgit 1.4.1


From 97677bbda07121887b22e12860499b6ad5fe0aa5 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 3 Jun 2023 08:47:34 +0200
Subject: gnu: diffutils: Remove test-perror2 from XFAIL_TESTS on the Hurd.

* gnu/packages/base.scm (diffutils)[arguments]: When building natively on the
Hurd, Move "large-subopt" test from #:make-flags' XFAIL_TESTS to a new
'skip-tests' phase.  Remove #:make-flags for the Hurd, as "test-perror2" now
passes.
---
 gnu/packages/base.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 14479c4951..1fdfaf8a57 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -303,9 +303,15 @@ differences.")
             (patches (search-patches "diffutils-fix-signal-processing.patch"))))
    (build-system gnu-build-system)
    (arguments
-    `(#:make-flags ,(if (target-hurd?)
-                        ''("XFAIL_TESTS=test-perror2 large-subopt")
-                        ''())))
+    (list
+     #:phases (if (system-hurd?)
+                  #~(modify-phases %standard-phases
+                      (add-after 'unpack 'skip-tests
+                        (lambda _
+                          (substitute* "tests/large-subopt"
+                            (("^#!.*" all)
+                             (string-append all "exit 77;\n"))))))
+                  #~%standard-phases)))
    (native-inputs (list perl))
    (synopsis "Comparing and merging files")
    (description
-- 
cgit 1.4.1


From 399c43d9ed2539315909073c7fefe13ca70d27ce Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 3 Jun 2023 08:55:57 +0200
Subject: gnu: gettext-minimal: Remove XFAIL_TESTS for the Hurd.

* gnu/packages/gettext.scm (gettext-minimal)[arguments]: When building for the
Hurd, remove XTESTS_FAIL from, as "test-perror2" now passes.
---
 gnu/packages/gettext.scm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 21ef05b811..947bffe3ba 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -133,10 +133,7 @@
                        #t)))))
 
        ;; When tests fail, we want to know the details.
-       #:make-flags #~'("VERBOSE=yes"
-                        #$@(if (target-hurd?)
-                               '("XFAIL_TESTS=test-perror2")
-                               '()))))
+       #:make-flags #~'("VERBOSE=yes")))
     (home-page "https://www.gnu.org/software/gettext/")
     (synopsis
      "Tools and documentation for translation (used to build other packages)")
-- 
cgit 1.4.1


From da9e4fd4347a31eaa5d92489e68b547466feb8bf Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 8 May 2023 14:09:55 +0200
Subject: gnu: m4: Skip gnulib stack-overflow tests for the Hurd.

* gnu/packages/m4.scm (m4)[arguments]: When building for the Hurd, add stage
'skip-stack-overflow-tests'.
---
 gnu/packages/m4.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/m4.scm b/gnu/packages/m4.scm
index fbc075a2cb..39b50b6800 100644
--- a/gnu/packages/m4.scm
+++ b/gnu/packages/m4.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,7 +24,8 @@
   #:use-module (gnu packages)
   #:use-module (guix packages)
   #:use-module (guix download)
-  #:use-module (guix build-system gnu))
+  #:use-module (guix build-system gnu)
+  #:use-module (guix utils))
 
 (define-public m4
   (package
@@ -54,6 +56,14 @@
             (substitute* "tests/test-execute.sh"
               (("4 5 6")
                "4 6"))))
+        ,@(if (target-hurd?)
+              '((add-after 'unpack 'skip-stack-overflow-tests
+                  (lambda _
+                    (substitute* '("tests/test-sigsegv-catch-stackoverflow1.c"
+                                   "tests/test-sigsegv-catch-stackoverflow2.c")
+                      (("(^| )main *\\(.*" all)
+                       (string-append all "{\n  exit (77);//"))))))
+              '())
         (add-after 'unpack 'configure-shell
           (lambda* (#:key native-inputs inputs #:allow-other-keys)
             (let ((/bin/sh (search-input-file (or native-inputs inputs)
-- 
cgit 1.4.1


From 378766dd2e7187d8ea48c47dd3fc53a7e66cf5c7 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 5 Jun 2023 16:21:19 +0200
Subject: gnu: openssl: Build fix for the Hurd.

* gnu/packages/tls.scm (openssl-3.0)[arguments]: When building on the Hurd,
add "hurd-x86" to #:configure-flags.
---
 gnu/packages/tls.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index d94b7c27f5..a2ed15ebdc 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -585,7 +585,12 @@ OpenSSL for TARGET."
               (lambda* (#:key native-inputs inputs #:allow-other-keys)
                 (setenv "HASHBANGPERL"
                         (search-input-file (or native-inputs inputs)
-                                           "/bin/perl"))))))))
+                                           "/bin/perl"))))))
+       ((#:configure-flags flags #~'())
+        (if (system-hurd?)
+            #~(append #$flags '("hurd-x86")) ;must not be used when
+                                             ;cross-compiling!
+            flags))))
     (license license:asl2.0)))
 
 (define-public openssl openssl-3.0)
-- 
cgit 1.4.1


From 60b1a230656386994bcfa5f6f7be72c2376341ed Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 5 Jun 2023 18:57:27 +0200
Subject: gnu: python: Support native build on the Hurd.

Running "test_concurrent_futures" and "test_venv" freeze the Hurd.  Tests
"test_multiprocessing_forkserver" and "test_multiprocessing_spawn" run over
10mins. Debian simply skips all tests on the Hurd.

* gnu/packages/python.scm (python-3.10)[arguments]: When building for the
Hurd, add hanging and failing to #:make-flags's --exclude flag.  Also, add
'disable-multi-processing' phase to avoid compileall.py hang during install.
---
 gnu/packages/python.scm | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 302f995b0f..51d5f598d7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -457,7 +457,7 @@ data types.")
                 (format #f "TESTOPTS=-j~d" (parallel-job-count))
                 ;; test_mmap fails on low-memory systems
                 " --exclude test_mmap test_socket"
-                ,@(if (target-hurd?)
+                ,@(if (system-hurd?)
                       '(" test_posix"      ;multiple errors
                         " test_time"
                         " test_pty"
@@ -487,12 +487,33 @@ data types.")
                         " test_open_unix_connection"
                         " test_open_unix_connection_error"
                         " test_read_pty_output"
-                        " test_write_pty")
+                        " test_write_pty"
+                        " test_concurrent_futures" ;freeze
+                        " test_venv"       ;freeze
+                        " test_multiprocessing_forkserver" ;runs over 10min
+                        " test_multiprocessing_spawn" ;runs over 10min
+                        " test_builtin"
+                        " test_capi"
+                        " test_dbm_ndbm"
+                        " test_exceptions"
+                        " test_faulthandler"
+                        " test_getopt"
+                        " test_importlib"
+                        " test_json"
+                        " test_multiprocessing_fork"
+                        " test_multiprocessing_main_handling"
+                        " test_pdb "
+                        " test_regrtest"
+                        " test_sqlite")
                       '()))))
        ((#:phases phases)
         `(modify-phases ,phases
            ,@(if (system-hurd?)
-                 `((delete 'patch-regen-for-hurd)) ;regen was removed after 3.5.9
+                 `((delete 'patch-regen-for-hurd)  ;regen was removed after 3.5.9
+                   (add-after 'unpack 'disable-multi-processing
+                     (lambda _
+                       (substitute* "Makefile.pre.in"
+                         (("-j0") "-j1")))))
                  '())
            (add-after 'unpack 'remove-windows-binaries
              (lambda _
-- 
cgit 1.4.1


From eb89957ba4c05db8c97ec7a12b51c29a49290ec5 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 6 Jun 2023 11:24:58 +0200
Subject: gnu: mpfr: Skip failing test on the Hurd.

* gnu/packages/multiprecision.scm (mpfr)[arguments]: When building natively on
the Hurd, add 'skip-tests' phase to skip "tsprintf".
---
 gnu/packages/multiprecision.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm
index 51ba21162c..3aa5dccfab 100644
--- a/gnu/packages/multiprecision.scm
+++ b/gnu/packages/multiprecision.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2018, 2019, 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -126,6 +127,17 @@ It is aimed at use in, for example, cryptography and computational algebra.")
                                 ".tar.xz"))
             (sha256 (base32
                      "14yr4sf4mys64nzbgnd997l6l4n8l9vsjnnvnb0lh4jh2ggpi8q6"))))
+   (arguments
+    (list
+     #:phases (if (system-hurd?)
+                  #~(modify-phases %standard-phases
+                      (add-after 'unpack 'skip-tests
+                        (lambda _
+                          (substitute*
+                              "tests/tsprintf.c"
+                            (("(^| )main *\\(.*" all)
+                             (string-append all "{\n  exit (77);//"))))))
+                  #~%standard-phases)))
    (build-system gnu-build-system)
    (outputs '("out" "debug"))
    (propagated-inputs (list gmp))            ; <mpfr.h> refers to <gmp.h>
-- 
cgit 1.4.1


From 8b74e7d52107d6ec9813b446b041838bd111c648 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 6 Jun 2023 16:11:03 +0200
Subject: gnu: elfutils: Skip failing tests on the Hurd.

* gnu/packages/elf.scm (elfutils)[arguments]:  When building natively on the Hurd,
add phase 'skip-tests'.
---
 gnu/packages/elf.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index d188099812..a100038f14 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -112,6 +113,28 @@
                      (("run-reverse-sections-self.sh") "")
                      (("run-strip-strmerge.sh") "")
                      (("run-elflint-self.sh") "")))))
+             '())
+         ,@(if (system-hurd?)
+             `((add-after 'unpack 'skip-tests
+                 (lambda _
+                   (substitute* '("tests/elfstrtab.c"
+                                  "tests/emptyfile.c")
+                     (("elf_version \\(EV_CURRENT\\);" all)
+                      "exit (77);"))
+                   (substitute* '("tests/run-all-dwarf-ranges.sh"
+                                  "tests/run-allfcts-multi.sh"
+                                  "tests/run-attr-integrate-skel.sh"
+                                  "tests/run-bug1-test.sh"
+                                  "tests/run-copyadd-sections.sh"
+                                  "tests/run-deleted.sh"
+                                  "tests/run-get-units-split.sh"
+                                  "tests/run-native-test.sh"
+                                  "tests/run-readelf-loc.sh"
+                                  "tests/run-readelf-ranges.sh"
+                                  "tests/run-unit-info.sh"
+                                  "tests/run-varlocs.sh")
+                               (("^#!.*" all)
+                                (string-append all "exit 77;\n"))))))
              '()))))
 
     (native-inputs (list m4))
-- 
cgit 1.4.1


From ee870c6abc18a5d71e8581c5e4c4e877ab214fdd Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 6 Jun 2023 16:53:09 +0200
Subject: gnu: libbsd: Skip failing test on the Hurd.

* gnu/packages/libbsd.scm (libbsd)[arguments]: When building natively on the
Hurd, add stage 'skip-tests'.
---
 gnu/packages/libbsd.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/libbsd.scm b/gnu/packages/libbsd.scm
index 5abbb2feff..558093564d 100644
--- a/gnu/packages/libbsd.scm
+++ b/gnu/packages/libbsd.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,6 +24,7 @@
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix gexp)
+  #:use-module (guix utils)
   #:use-module (gnu packages crypto))
 
 (define-public libbsd
@@ -64,7 +66,15 @@
                             ;; build container.
                             (substitute* "test/Makefile"
                               (("pwcache\\$\\(EXEEXT\\) ")
-                               "")))))))
+                               ""))))
+                        #$@(if (system-hurd?)
+                               #~((add-after 'unpack 'skip-tests
+                                  (lambda _
+                                    (substitute* "test/explicit_bzero.c"
+                                      (("(^| )main *\\(.*" all)
+                                       (string-append all
+                                                      "{\n  exit (77);//"))))))
+                               #~()))))
     (inputs
      (list libmd))
     (synopsis "Utility functions from BSD systems")
-- 
cgit 1.4.1


From bfcfe53c72f04e825f33269258c5ebbc33b70131 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 6 Jun 2023 18:33:19 +0200
Subject: gnu: c-ares: Skip failing tests on the Hurd.

* gnu/packages/adns.scm (c-ares)[arguments: When building natively on the
Hurd, add phases 'skip-tests' and 'filter-hurd-tests'.
---
 gnu/packages/adns.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm
index 913d885af4..ead40bce1b 100644
--- a/gnu/packages/adns.scm
+++ b/gnu/packages/adns.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015, 2016, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019, 2021 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,9 +21,11 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages adns)
+  #:use-module (guix gexp)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix utils)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages m4)
@@ -76,18 +79,69 @@ scripts.")
                 "1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'filter-live-tests
-           (lambda _
-             ;; Filter tests that require internet access.
-             (setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*"))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'filter-live-tests
+            (lambda _
+              ;; Filter tests that require internet access.
+              (setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*")))
+          #$@(if (system-hurd?)
+                 #~((add-after 'unpack 'skip-tests
+                      (lambda _
+                        (substitute* "test/ares-test-main.cc"
+                          (("(^| )main *\\(.*" all)
+                           (string-append all "  exit (77);\n")))))
+                    (add-after 'filter-live-tests 'filter-hurd-tests
+                      (lambda _
+                        (setenv "GTEST_FILTER"
+                                (string-append
+                                 (getenv "GTEST_FILTER")
+                                 ":.*Basic/2"
+                                 ":.*CancelImmediate/2"
+                                 ":.*CancelImmediateGetHostByAddr/2"
+                                 ":.*CancelLater/1"
+                                 ":.*FamilyUnspecified/2"
+                                 ":.*FamilyV6/2"
+                                 ":.*GetAddrInfoParallelLookups/1"
+                                 ":.*GetHostByAddrDestroy/2"
+                                 ":.*GetHostByNameCNAMENoData/2"
+                                 ":.*GetHostByNameDestroyAbsolute/2"
+                                 ":.*GetHostByNameDestroyRelative/2"
+                                 ":.*GetHostByNameParallelLookups/1"
+                                 ":.*HostAlias/2"
+                                 ":.*HostAliasMissing/2"
+                                 ":.*HostAliasMissingFile/2"
+                                 ":.*NotImplResponse/2"
+                                 ":.*RefusedResponse/2"
+                                 ":.*Resend/1"
+                                 ":.*RetryWithoutEDNS/2"
+                                 ":.*SearchDomains/2"
+                                 ":.*SearchDomainsBare/2"
+                                 ":.*SearchDomainsServFailOnAAAA/2"
+                                 ":.*SearchDomainsWithResentReply/1"
+                                 ":.*SearchHighNdots/2"
+                                 ":.*SearchNoDataThenFail/2"
+                                 ":.*SearchNoDataThenNoDataBare/2"
+                                 ":.*SearchNoDataThenSuccess/2"
+                                 ":.*ServFailResponse/2"
+                                 ":.*SimpleQuery/2"
+                                 ":.*SockCallback/2"
+                                 ":.*SockConfigureCallback/2"
+                                 ":.*SortListV4/2"
+                                 ":.*SortListV6/2"
+                                 ":.*ThirdServer/2"
+                                 ":.*TruncationRetry/1"
+                                 ":.*UnspecifiedFamilyCname6A4/2"
+                                 ":.*UnspecifiedFamilyV4/2"
+                                 ":.*UnspecifiedFamilyV6/2")))))
+                 #~()))))
     (native-inputs
      (list pkg-config))
     (home-page "https://c-ares.haxx.se/")
     (synopsis "C library for asynchronous DNS requests")
     (description
-      "C-ares is a C library that performs DNS requests and name resolution
+     "C-ares is a C library that performs DNS requests and name resolution
 asynchronously.  It is intended for applications which need to perform DNS
 queries without blocking, or need to perform multiple DNS queries in parallel.
 The primary examples of such applications are servers which communicate with
-- 
cgit 1.4.1


From c5991dfb921f1f5b5f3785eff611771896e965aa Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 6 Jun 2023 19:34:49 +0200
Subject: gnu: libgpg-error: Skip failing test on the Hurd.

* gnu/packages/gnupg.scm (libgpg-error)[arguments]: When building natively on
the Hurd, add phase 'skip-tests'.
---
 gnu/packages/gnupg.scm | 82 +++++++++++++++++++++++++++++---------------------
 1 file changed, 48 insertions(+), 34 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 49d29ed9bd..4a9a8fbb57 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2021 Nikita Domnitskii <nikita@domnitskii.me>
 ;;; Copyright © 2021 Aleksandr Vityazev <avityazev@posteo.org>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -94,40 +95,42 @@
     (version "1.45")
     (source
      (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-"
-                          version ".tar.bz2"))
-      (sha256
-       (base32
-        "09haz1kk48b8q0hd58g98whylah0fp121yfgjms7pzsbzgj8w3sp"))))
+       (method url-fetch)
+       (uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-"
+                           version ".tar.bz2"))
+       (sha256
+        (base32
+         "09haz1kk48b8q0hd58g98whylah0fp121yfgjms7pzsbzgj8w3sp"))))
     (build-system gnu-build-system)
     (arguments
-     (if (%current-target-system)
-         `(#:modules ((guix build gnu-build-system)
-                      (guix build utils))
-           #:phases
-           (modify-phases %standard-phases
-             ;; If this is left out, some generated header
-             ;; files will be sprinkled with ‘\c’, which
-             ;; the compiler won't like.
-             (add-after 'unpack 'fix-gen-lock-obj.sh
-               (lambda _
-                 (substitute* "src/gen-lock-obj.sh"
-                   (("if test -n `echo -n`") "if ! test -n `echo -n`"))))
-             ;; When cross-compiling, some platform specific properties cannot
-             ;; be detected. Create a symlink to the appropriate platform
-             ;; file if required. Note that these platform files depend on
-             ;; both the operating system and architecture!
-             ;;
-             ;; See Cross-Compiling section at:
-             ;; https://github.com/gpg/libgpg-error/blob/master/README
-             (add-after 'unpack 'cross-symlinks
-               (lambda _
-                 (define (link triplet source)
-                   (symlink (string-append "lock-obj-pub." triplet ".h")
-                            (string-append "src/syscfg/lock-obj-pub."
-                                           source ".h")))
-                 ,(let* ((target (%current-target-system))
+     (cond
+      ((%current-target-system)
+       (list
+        #:modules '((guix build gnu-build-system)
+                    (guix build utils))
+        #:phases
+        #~(modify-phases %standard-phases
+            ;; If this is left out, some generated header
+            ;; files will be sprinkled with ‘\c’, which
+            ;; the compiler won't like.
+            (add-after 'unpack 'fix-gen-lock-obj.sh
+              (lambda _
+                (substitute* "src/gen-lock-obj.sh"
+                  (("if test -n `echo -n`") "if ! test -n `echo -n`"))))
+            ;; When cross-compiling, some platform specific properties cannot
+            ;; be detected. Create a symlink to the appropriate platform
+            ;; file if required. Note that these platform files depend on
+            ;; both the operating system and architecture!
+            ;;
+            ;; See Cross-Compiling section at:
+            ;; https://github.com/gpg/libgpg-error/blob/master/README
+            (add-after 'unpack 'cross-symlinks
+              (lambda _
+                (define (link triplet source)
+                  (symlink (string-append "lock-obj-pub." triplet ".h")
+                           (string-append "src/syscfg/lock-obj-pub."
+                                          source ".h")))
+                #$(let* ((target (%current-target-system))
                          (architecture
                           (string-take target (string-index target #\-))))
                     (cond ((target-linux? target)
@@ -140,8 +143,19 @@
                              ;; configuration, as this is not correct for
                              ;; all architectures.
                              (_ #t)))
-                          (#t #t)))))))
-         '()))
+                          (#t #t))))))))
+      ((system-hurd?)
+       (list
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'skip-tests
+              (lambda _
+                (substitute*
+                    "tests/t-syserror.c"
+                  (("(^| )main *\\(.*" all)
+                   (string-append all "{\n  exit (77);//"))))))))
+      (else
+       '())))
     (native-inputs (list gettext-minimal))
     (home-page "https://gnupg.org")
     (synopsis "Library of error values for GnuPG components")
-- 
cgit 1.4.1


From ebc35c609649ef2a859307171aac17c0bf927b87 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 6 Jun 2023 20:39:50 +0200
Subject: gnu: libgcrypt: Skip hanging benchmark tests on the Hurd.

* gnu/packages/gnupg.scm (libgcrypt)[arguments]: When building natively on the
Hurd, add phase 'setenv' to set "GCRYPT_NO_BENCHMARKS".
---
 gnu/packages/gnupg.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 4a9a8fbb57..8d92c60bf2 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -204,7 +204,15 @@ Daemon and possibly more in the future.")
              ,@(if (%current-target-system)
                    ;; When cross-compiling, _gcry_mpih_lshift etc are undefined.
                    `("--disable-asm")
-                   '()))))
+                   '()))
+       ,@(if (system-hurd?)
+             (list
+              #:phases
+              #~(modify-phases %standard-phases
+                  (add-before 'configure 'setenv
+                    (lambda _
+                      (setenv "GCRYPT_NO_BENCHMARKS" "t")))))
+             '())))
     (outputs '("out" "debug"))
     (home-page "https://gnupg.org/")
     (synopsis "Cryptographic function library")
-- 
cgit 1.4.1


From a4367fae492d17421867c16eef1754ecdd9a36fd Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 6 Jun 2023 22:28:56 +0200
Subject: gnu: tcl: Remove failing tests on the Hurd..

* gnu/packages/tcl.scm (tcl)[arguments]: When building natively on the Hurd,
add phase 'delete-tests'.
---
 gnu/packages/tcl.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index 2a5fbc6fe8..b69dba2254 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
 ;;; Copyright © 2018, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
@@ -69,7 +69,13 @@
                        ;; Programs such as Ghostscript rely on it.
                        (with-directory-excursion bin
                          (symlink (car (find-files "." "tclsh"))
-                                  "tclsh"))))))
+                                  "tclsh")))))
+                 ,@(if (system-hurd?)
+                       '((add-after 'unpack 'delete-tests
+                           (lambda _
+                             (delete-file "tests/chanio.test")
+                             (delete-file "tests/socket.test"))))
+                       '()))
 
        ;; By default, man pages are put in PREFIX/man, but we want them in
        ;; PREFIX/share/man.  The 'validate-documentation-location' phase is
-- 
cgit 1.4.1


From e52743b458fef293a562fbb842b60e4bf3b06eff Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 7 Jun 2023 21:00:19 +0200
Subject: gnu: curl: Skip failing test on the Hurd.

* gnu/packages/curl.scm (curl)[arguments]: When building natively on the Hurd,
add phase 'skip-tests'.
---
 gnu/packages/curl.scm | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 76fcc115cf..4e3c563570 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; Copyright © 2020 Dale Mellor <guix-devel-0brg6b@rdmp.org>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me>
 ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
 ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
@@ -125,7 +125,22 @@
                 ;; The top-level "make check" does "make -C tests quiet-test", which
                 ;; is too quiet.  Use the "test" target instead, which is more
                 ;; verbose.
-                (invoke "make" "-C" "tests" "test")))))))
+                (invoke "make" "-C" "tests" "test"))))
+          #$@(if (system-hurd?)
+                 #~((add-after 'unpack 'skip-tests
+                      (lambda _
+                        (let ((port (open-file "tests/data/DISABLED" "a")))
+                          (display "526\n" port)
+                          (display "527\n" port)
+                          (display "532\n" port)
+                          (display "533\n" port)
+                          (display "537\n" port)
+                          (display "546\n" port)
+                          (display "575\n" port)
+                          (display "1021\n" port)
+                          (display "1501\n" port)
+                          (close port)))))
+                 #~()))))
     (synopsis "Command line tool for transferring data with URL syntax")
     (description
      "curl is a command line tool for transferring data with URL syntax,
-- 
cgit 1.4.1


From 6da096879c125ed7d5f2ee6c8392e63320f5949b Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 8 Jun 2023 07:15:07 +0200
Subject: gnu: git: Skip failing test on the Hurd.

* gnu/packages/version-control.scm (git)[arguments]: When building natively on
the Hurd, add stage 'delete-tests/hurd'.
---
 gnu/packages/version-control.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index ecdb1d1781..2f70655ac1 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -28,7 +28,7 @@
 ;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2020 John D. Boy <jboy@bius.moe>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
@@ -570,7 +570,14 @@ Python 3.3 and later, rather than on Python 2.")
                     (manpages (assoc-ref inputs "git-manpages")))
                (mkdir-p man)
                (with-directory-excursion man
-                 (invoke "tar" "xvf" manpages))))))))
+                 (invoke "tar" "xvf" manpages)))))
+         ,@(if (system-hurd?)
+               '((add-after 'unpack 'delete-tests/hurd
+                   (lambda _
+                     (delete-file "t/t0052-simple-ipc.sh")
+                     (delete-file "t/t5562-http-backend-content-length.sh")
+                     (delete-file "t/t9902-completion.sh"))))
+               '()))))
 
     (native-search-paths
      ;; For HTTPS access, Git needs a single-file certificate bundle, specified
-- 
cgit 1.4.1


From 7591fb0924dae0cf906ac9715c03a434c830933a Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 9 Jun 2023 07:17:48 +0200
Subject: gnu: procps: Skip linux-version test for the Hurd.

* gnu/packages/linux.scm (procps)[arguments]: When building natively on the
Hurd, add stage 'skip-tests'.
---
 gnu/packages/linux.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 4120355b84..1a3ccb610c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -42,7 +42,7 @@
 ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
@@ -2390,7 +2390,14 @@ parameters.")
                    (let* ((out #$output)
                           (dup (append-map (cut find-files out <>)
                                            '("^kill" "^uptime"))))
-                     (for-each delete-file dup)))))))
+                     (for-each delete-file dup))))
+               #$@(if (system-hurd?)
+                      #~((add-after 'unpack 'skip-tests
+                           (lambda _
+                             (substitute* "library/tests/test_version.c"
+                               (("^int main\\(.*" all)
+                                (string-append all "{\n  exit (77);//"))))))
+                      #~()))))
     (inputs (list ncurses))
     (native-inputs (list pkg-config))
     (home-page "https://gitlab.com/procps-ng/procps/")
-- 
cgit 1.4.1


From 760a80bf9b9d7e8f52251625b34c0d0c714304e2 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 9 Jun 2023 10:12:45 +0200
Subject: gnu: e2fsprogs: Skip failing tests on the Hurd.

* gnu/packages/linux.scm (e2fsprogs)[arguments]: When building natively on the
Hurd, add phase 'skip-tests'.
---
 gnu/packages/linux.scm | 74 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 72 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 1a3ccb610c..67128524ff 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2505,7 +2505,7 @@ module.")
                          perl
                          procps))
     (arguments
-     '(;; util-linux is the preferred source for some of the libraries and
+     `(;; util-linux is the preferred source for some of the libraries and
        ;; commands, so disable them (see, e.g.,
        ;; <http://git.buildroot.net/buildroot/commit/?id=e1ffc2f791b33633>.)
        #:configure-flags (list "--disable-libblkid"
@@ -2552,7 +2552,77 @@ module.")
                  (let ((archives (find-files lib "\\.a$")))
                    (for-each (lambda (file)
                                (chmod file #o666))
-                             archives))))))))
+                             archives)))))
+           ,@(if (system-hurd?)
+                 '((add-after 'unpack 'skip-tests
+                     (lambda _
+                       (with-directory-excursion "tests"
+                         (for-each
+                          (lambda (directory)
+                            (delete-file-recursively directory))
+                          '("d_bad_ostype"
+                            "f_detect_junk"
+                            "f_extent_oobounds"
+                            "j_ext_long_revoke_trans"
+                            "j_ext_long_trans"
+                            "j_long_revoke_trans"
+                            "j_long_revoke_trans_mcsum_32bit"
+                            "j_long_revoke_trans_mcsum_64bit"
+                            "j_long_trans"
+                            "j_long_trans_mcsum_32bit"
+                            "j_long_trans_mcsum_64bit"
+                            "j_short_revoke_trans"
+                            "j_short_revoke_trans_mcsum_64bit"
+                            "j_short_trans_64bit"
+                            "j_short_trans"
+                            "j_short_trans_mcsum_64bit"
+                            "j_short_trans_old_csum"
+                            "j_short_trans_open_recover"
+                            "j_short_trans_recover"
+                            "j_short_trans_recover_mcsum_64bit"
+                            "j_short_uncommitted_trans"
+                            "j_short_uncommitted_trans_mcsum_64bit"
+                            "m_error_behavior"
+                            "m_minrootdir"
+                            "m_rootdir"
+                            "r_32to64bit_expand_full"
+                            "r_expand_full"
+                            "r_fixup_lastbg_big"
+                            "t_change_uuid"
+                            "t_change_uuid_mcsum"
+                            "t_change_uuid_mcsum_mounted"
+                            "t_change_uuid_mcsum_seed_mounted"
+                            "t_change_uuid_mounted"
+                            "t_disable_changed_csum_seed"
+                            "t_disable_changed_csum_seed_mounted"
+                            "t_disable_csum_seed"
+                            "t_disable_meta_csum_and_seed"
+                            "t_enable_csum_seed"
+                            "t_format_csum_seed"
+                            "t_replay_and_set"
+                            "u_compound_rollback"
+                            "u_corrupt_blk_csum"
+                            "u_corrupt_blk_csum_force"
+                            "u_corrupt_key_csum"
+                            "u_debugfs_opt"
+                            "u_dryrun"
+                            "u_e2fsck_opt"
+                            "u_errorout"
+                            "u_force"
+                            "u_force_dryrun"
+                            "u_incomplete"
+                            "u_mke2fs_opt"
+                            "u_mke2fs_opt_oddsize"
+                            "u_offset"
+                            "u_onefile_bad"
+                            "u_resize2fs_opt"
+                            "u_revert_64bitmcsum_onefile"
+                            "u_revert_all_onefile"
+                            "u_revert_upgrade_to_64bitmcsum"
+                            "u_tune2fs_opt"
+                            "u_undo_undo"
+                            "u_wrong_fs"))))))
+                 '()))))
     (home-page "https://e2fsprogs.sourceforge.net/")
     (synopsis "Creating and checking ext2/ext3/ext4 file systems")
     (description
-- 
cgit 1.4.1


From f1a68cbb72406867e400b99cc66f516b0ae8580c Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 10 Jun 2023 10:08:42 +0200
Subject: gnu: parted: Disable tests for the Hurd.

* gnu/packages/disk.scm (parted)[argument]: Set #:tests? to #false when
building for the Hurd.
---
 gnu/packages/disk.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 6306504503..35ffcf173e 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -259,6 +259,7 @@ tmpfs/ramfs filesystems.")
       #:configure-flags (if (target-hurd?)
                             #~'("--disable-device-mapper")
                             #~'())
+      #:tests? (not (target-hurd?))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'fix-locales-and-python
-- 
cgit 1.4.1


From 784610d6d65bfb827e173ae087f2a902f5f80cee Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 11 Jun 2023 11:48:26 +0200
Subject: gnu: libpaper: Disable tests for the Hurd.

* gnu/packages/ghostscript.scm (libpaper)[arguments]: When building for the
Hurd, set #:tests? to #false.
---
 gnu/packages/ghostscript.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 8d35f1195c..94807fdd94 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018, 2020, 2022 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -89,9 +89,11 @@ Consortium standard (ICC), approved as ISO 15076-1.")
     (native-inputs
      (list help2man))
     (arguments
-     '(#:configure-flags '("--disable-static"
-                           ;; Tests require a relocatable build.
-                           "--enable-relocatable")))
+     (list #:configure-flags ''("--disable-static"
+                                 ;; Tests require a relocatable build.
+                                 "--enable-relocatable")
+           ;; --enable-relocate is broken on the Hurd
+           #:tests? (not (target-hurd?))))
     (outputs '("out" "debug"))
     (home-page "https://github.com/rrthomas/libpaper")
     (synopsis "Library for handling paper sizes")
-- 
cgit 1.4.1


From 69142dbea4eb5148ed165b494cae0ad730bf5514 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 11 Jun 2023 12:35:50 +0200
Subject: gnu: cairo: Support building for the Hurd.

Gobject-introspection and libdrm does not build for the Hurd.  Poppler depends
on nss, which does not build for the Hurd.

* gnu/packages/gtk.scm (cairo)[native-inputs]: When building for the Hurd, do
not include gobject-introspection.
[inputs]: Likewise, do not include libdrm, poppler.
---
 gnu/packages/gtk.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 8e9a9dc8b2..c5ec7bcdc2 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -35,6 +35,7 @@
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -194,15 +195,21 @@ such as mate-panel and xfce4-panel.")
                        (assoc-ref %outputs "doc")
                        "/share/gtk-doc/html"))))
     (native-inputs
-     `(("gobject-introspection" ,gobject-introspection)
+     `(,@(if (target-hurd?)
+             '()
+             `(("gobject-introspection" ,gobject-introspection)))
        ("pkg-config" ,pkg-config)
        ("python" ,python-wrapper)))
     (inputs
      `(("bash-minimal" ,bash-minimal)   ;for glib-or-gtk-wrap
-       ("drm" ,libdrm)
+       ,@(if (target-hurd?)
+             '()
+             `(("drm" ,libdrm)))
        ("ghostscript" ,ghostscript)
        ("libspectre" ,libspectre)
-       ("poppler" ,poppler)))
+       ,@(if (target-hurd?)
+             '()
+             `(("poppler" ,poppler)))))
     (propagated-inputs
      `( ;; ("cogl" ,cogl)
        ;; ("directfb" ,directfb)
-- 
cgit 1.4.1


From fb6f94864d1c1b3a6c46f3b880b8a51003854f89 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 11 Jun 2023 20:47:14 +0200
Subject: gnu: openssl-1.1: Fix shared build for the Hurd.

* gnu/packages/tls.scm (openssl-1.1)[arguments]: When building for the Hurd,
add phase 'patch-configure'.
(openssl)[arguments]: And delete it again.
---
 gnu/packages/tls.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index a2ed15ebdc..f51c47db04 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -470,6 +470,13 @@ OpenSSL for TARGET."
                                 #$(target->openssl-target
                                    (%current-target-system))))))
                  #~())
+          #$@(if (target-hurd?)
+                 #~((add-after 'unpack 'patch-configure
+                      (lambda _
+                        (substitute* "config"
+                          (("case \"\\$GUESSOS\" in.*" all)
+                           (string-append all "hurd-x86*) OUT=hurd-x86;;\n"))))))
+                 #~())
           (replace 'configure
             (lambda* (#:key configure-flags #:allow-other-keys)
               ;; It's not a shebang so patch-source-shebangs misses it.
@@ -585,7 +592,10 @@ OpenSSL for TARGET."
               (lambda* (#:key native-inputs inputs #:allow-other-keys)
                 (setenv "HASHBANGPERL"
                         (search-input-file (or native-inputs inputs)
-                                           "/bin/perl"))))))
+                                           "/bin/perl"))))
+            #$@(if (target-hurd?)
+                   #~((delete 'patch-configure))
+                   #~())))
        ((#:configure-flags flags #~'())
         (if (system-hurd?)
             #~(append #$flags '("hurd-x86")) ;must not be used when
-- 
cgit 1.4.1


From 7ab9c0f99b8a2d0a30bb9b3bf43db2238245205a Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 11 Jun 2023 18:39:19 +0200
Subject: gnu: ruby-2.6: Skip test on the Hurd.

* gnu/packages/ruby.scm (ruby-2.7)[arguments]: When building natively on the
Hurd, add phase 'skip-tests'.
---
 gnu/packages/ruby.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index b96daad0ff..e0dca646ac 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -33,6 +33,7 @@
 ;;; Copyright © 2022 Taiju HIGASHI <higashi@taiju.info>
 ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
 ;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -195,7 +196,13 @@ a focus on simplicity and productivity.")
                             "test/ruby/test_system.rb"
                             "tool/rbinstall.rb")
                (("/bin/sh") (which "sh")))
-             #t)))))
+             #t))
+         ,@(if (system-hurd?)
+               '((add-after 'unpack 'skip-tests
+                   (lambda _
+                     (delete-file "bootstraptest/test_io.rb")
+                     (delete-file "test/ruby/test_io.rb"))))
+               '()))))
     (native-inputs
      (list autoconf))))
 
-- 
cgit 1.4.1


From d04db1249c2feb6430e3f56bdcc36af0a1f8bce2 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 12 Jun 2023 07:26:11 +0200
Subject: gnu: tcsh: Skip substitution tests on the Hurd.

* gnu/packages/shells.scm (tcsh)[arguments]: When building natively on the
Hurd, add phase 'skip-tests'.
---
 gnu/packages/shells.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 0dae9ee954..aef22efd01 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2019 Meiyo Peng <meiyo.peng@gmail.com>
 ;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2019, 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
@@ -416,6 +416,13 @@ written by Paul Haahr and Byron Rakitzis.")
                           (("CC_FOR_GETHOST=\"cc\"")
                            "CC_FOR_GETHOST=\"gcc\"")))))
                  #~())
+          #$@(if (system-hurd?)
+                 #~((add-after 'unpack 'skip-tests
+                      (lambda _
+                        (substitute* "tests/testsuite.at"
+                          (("m4_include\\(\\[subst.at\\]\\)" all)
+                           (string-append "# " all))))))
+                 #~())
           (add-before 'check 'patch-test-scripts
             (lambda _
               ;; Take care of pwd
-- 
cgit 1.4.1


From 8236ed221870261e53b88ec6987427c2e0a54109 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 12 Jun 2023 13:29:00 +0200
Subject: gnu: swig: Skip tests when building for the Hurd.

* gnu/packages/swig.scm (swig)[arguments]: When building for the Hurd,
set #:tests? to #false.
---
 gnu/packages/swig.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm
index 6e2fb8b4e9..42996fa812 100644
--- a/gnu/packages/swig.scm
+++ b/gnu/packages/swig.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2018, 2021 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -25,6 +26,7 @@
   #:use-module (guix download)
   #:use-module (guix licenses)
   #:use-module (guix build-system gnu)
+  #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages guile)
@@ -54,6 +56,7 @@
                          perl))
                      ;;("python" ,python-wrapper)
     (inputs (list pcre))
+    (arguments (list #:tests? (not (target-hurd?))))
     (home-page "https://swig.org/")
     (synopsis
      "Interface compiler that connects C/C++ code to higher-level languages")
-- 
cgit 1.4.1


From d408d479336754bad0069e006093fa8cc8ebbbff Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 12 Jun 2023 16:19:02 +0200
Subject: gnu: zstd: Skip tests when building for the Hurd.

* gnu/packages/compression.scm(zstd)[arguments]: When building for the Hurd,
set #:tests? to #false.
:
---
 gnu/packages/compression.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 09ac57668d..e4d3293f9d 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -24,7 +24,7 @@
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
 ;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2019, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2020, 2021 Lars-Dominik Braun <lars@6xq.net>
@@ -1660,7 +1660,8 @@ or junctions, and always follows hard links.")
              "HAVE_LZMA=0"
              ;; Not currently detected, but be explicit & avoid surprises later.
              "HAVE_LZ4=0"
-             "HAVE_ZLIB=0")))
+             "HAVE_ZLIB=0")
+       #:tests? ,(not (target-hurd?))))
     (home-page "https://facebook.github.io/zstd/")
     (synopsis "Zstandard real-time compression algorithm")
     (description "Zstandard (@command{zstd}) is a lossless compression algorithm
-- 
cgit 1.4.1


From 07eff96a86670a693c1f9a5df52e5fc0062d4c78 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 12 Jun 2023 16:46:37 +0200
Subject: gnu: cmake-bootstrap: Fix build for the Hurd.

* gnu/packages/cmake.scm (%common-disabled-tests/hurd): New variable.
(cmake-bootstrap) [inputs]: Include libuv for the Hurd too.
[arguments]: Add %common-disabled-tests/hurd to #:make-flags for the Hurd.
Also add a 'patch-hurd' phase to fix the build.
---
 gnu/packages/cmake.scm | 43 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 821b8808f7..9064ca3822 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -136,6 +136,19 @@ using the CMake build system.")
     ;; This test fails for unknown reason.
     "RunCMake.file-GET_RUNTIME_DEPENDENCIES"))
 
+(define %common-disabled-tests/hurd
+  '("CTestTestTimeout"
+    "CTestTestRerunFailed"
+    "RunCMake.CompilerChange"
+    "RunCMake.ctest_test"
+    "RunCMake.file"
+    "RunCMake.BundleUtilities"
+    "RunCMake.configure_file"
+    "RunCMake.CTestTimeout"
+    "RunCMake.CTestTimeoutAfterMatch"
+    "RunCMake.CommandLine"
+    "RunCMake.CTestCommandLine"))
+
 (define %preserved-third-party-files
   '(;; 'Source/cm_getdate.c' includes archive_getdate.c wholesale, so it must
     ;; be available along with the required headers.
@@ -190,7 +203,10 @@ using the CMake build system.")
                      "CTestTestSubdir" ; This test fails to build 2 of the 3 tests.
                      ;; This test fails when ARGS (below) is in use, see
                      ;; <https://gitlab.kitware.com/cmake/cmake/issues/17165>.
-                     "CTestCoverageCollectGCOV")))
+                     "CTestCoverageCollectGCOV"
+                     #$@(if (target-hurd?)
+                            %common-disabled-tests/hurd
+                            #~()))))
           (list
            (string-append
             ;; These arguments apply for the tests only.
@@ -210,20 +226,17 @@ using the CMake build system.")
           ;; CMake uses its own configure script.
           (replace 'configure
             (lambda* (#:key (configure-flags '()) #:allow-other-keys)
-              (apply invoke "./configure" configure-flags))))))
+              (apply invoke "./configure" configure-flags)))
+          #$@(if (target-hurd?)
+                 #~((add-after 'unpack 'patch-hurd
+                      (lambda _
+                        ;; Version 3.25.0 has a similar fix.
+                        (substitute* "Utilities/cmlibuv/src/unix/udp.c"
+                          (("!defined\\(__QNX__\\)")
+                           "!defined(__GNU__)")))))
+                 #~()))))
     (inputs
-     (append
-      (if (target-hurd?)
-          '()
-          (list libuv))                 ;not supported on the Hurd
-      (list bzip2
-            curl
-            expat
-            file
-            jsoncpp
-            libarchive
-            rhash
-            zlib)))
+     (list libuv bzip2 curl expat file jsoncpp libarchive rhash zlib))
     (native-search-paths
      (list (search-path-specification
             (variable "CMAKE_PREFIX_PATH")
-- 
cgit 1.4.1


From 6f15b4204fb2205c1b6cae81d396b2a95bdd818e Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 12 Jun 2023 20:26:45 +0200
Subject: gnu: cmake-minimal: Skip tests on the Hurd.

* gnu/packages/cmake.scm (cmake-minimal)[arguments]: When building natively on
the Hurd, add %common-disabled-tests/hurd to skipped tests in phase 'check'.
---
 gnu/packages/cmake.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 9064ca3822..bc14286070 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -324,7 +324,10 @@ and workspaces that can be used in the compiler environment of your choice.")
             (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
               (let ((skipped-tests (list #$@%common-disabled-tests
                                          ;; This test requires the bundled libuv.
-                                         "BootstrapTest")))
+                                         "BootstrapTest"
+                                         #$@(if (system-hurd?)
+                                                %common-disabled-tests/hurd
+                                                #~()))))
                 (if tests?
                     (begin
                       (invoke "ctest" "-j" (if parallel-tests?
-- 
cgit 1.4.1


From d3a1684c8a092bb729d68a840abea28092dfc587 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 13 Jun 2023 07:18:26 +0200
Subject: gnu: doxygen: Fix build for the Hurd.

* gnu/packages/patches/doxygen-hurd.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/documentation.scm (doxygen)[arguments]: When building for the
Hurd, add new phase 'apply-patch' and use it.
---
 gnu/local.mk                            |  1 +
 gnu/packages/documentation.scm          | 12 +++++++++++-
 gnu/packages/patches/doxygen-hurd.patch | 30 ++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/doxygen-hurd.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index ad31e8d2de..0c1425a118 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1065,6 +1065,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/doc++-segfault-fix.patch			\
   %D%/packages/patches/dovecot-opensslv3.patch			\
   %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch	\
+  %D%/packages/patches/doxygen-hurd.patch			\
   %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch	\
   %D%/packages/patches/dstat-skip-devices-without-io.patch	\
   %D%/packages/patches/dune-common-skip-failing-tests.patch	\
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index ec70ca4d8f..5d455431d3 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2021, 2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.counoyer@gmail.com>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -40,6 +41,7 @@
   #:use-module (guix build-system python)
   #:use-module (guix build-system qt)
   #:use-module (guix deprecation)
+  #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages backup)
@@ -224,7 +226,15 @@ markup) can be customized and extended by the user.")
               (let ((/bin/sh (search-input-file inputs "/bin/sh")))
                 (substitute* "src/portable.cpp"
                   (("/bin/sh")
-                   /bin/sh))))))))
+                   /bin/sh)))))
+          #$@(if (target-hurd?)
+                 #~((add-after 'unpack 'apply-patch
+                      (lambda _
+                        (let ((patch-file
+                               #$(local-file
+                                  (search-patch "doxygen-hurd.patch"))))
+                          (invoke "patch" "--force" "-p1" "-i" patch-file)))))
+                 #~()))))
     (synopsis "Generate documentation from annotated sources")
     (description "Doxygen is the de facto standard tool for generating
 documentation from annotated C++ sources, but it also supports other popular
diff --git a/gnu/packages/patches/doxygen-hurd.patch b/gnu/packages/patches/doxygen-hurd.patch
new file mode 100644
index 0000000000..a40923184b
--- /dev/null
+++ b/gnu/packages/patches/doxygen-hurd.patch
@@ -0,0 +1,30 @@
+Upstream status: Adapted from upstream.
+
+From d3d968e5835f449d7ea715f45160db81ea906303 Mon Sep 17 00:00:00 2001
+From: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Tue, 16 Aug 2022 20:29:54 +0200
+Subject: [PATCH] Fix build on GNU/Hurd
+
+There is no path length limitation there, even via pathconf.  But glibc
+provides a getcwd function that allocates the buffer dynamically so we can
+just leverage that.
+---
+ include/ghc/filesystem.hpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/filesystem/filesystem.hpp.orig	2022-08-11 22:14:32.000000000 +0200
++++ b/filesystem/filesystem.hpp	2023-06-13 07:26:25.310000000 +0200
+@@ -4081,6 +4081,13 @@
+         return path();
+     }
+     return path(std::wstring(buffer.get()), path::native_format);
++#elif defined(__GLIBC__)
++    std::unique_ptr<char, decltype(&std::free)> buffer { ::getcwd(NULL, 0), std::free };
++    if (buffer == nullptr) {
++        ec = detail::make_system_error();
++        return path();
++    }
++    return path(buffer.get());
+ #else
+     size_t pathlen = static_cast<size_t>(std::max(int(::pathconf(".", _PC_PATH_MAX)), int(PATH_MAX)));
+     std::unique_ptr<char[]> buffer(new char[pathlen + 1]);
-- 
cgit 1.4.1


From 72fa5eb020d8d6e5fa89366ffba15e5d285f2445 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 13 Jun 2023 08:35:57 +0200
Subject: gnu: graphite2: Skip test on the Hurd.

* gnu/packages/fontutils.scm (graphite2)[arguments]: When building natively on
the Hurd, replace phase 'check' to set make-flags to skip "awamicmp3" test.
---
 gnu/packages/fontutils.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index e5170b5ae3..64b15fbf05 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
 ;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
 ;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1369,6 +1370,25 @@ applications should be.")
     (list python python-fonttools-minimal))
    (inputs
     (list freetype))
+   (arguments
+    (if (system-hurd?)
+        (list
+         #:phases
+         #~(modify-phases %standard-phases
+             (replace 'check
+               ;; cmake-build-system ignores #:make-flags for make check
+               (lambda* (#:key test-target tests? parallel-tests?
+                         #:allow-other-keys)
+                 (if tests?
+                     (let ((jobs (if parallel-tests?
+                                     (number->string (parallel-job-count))
+                                     "1")))
+                       (invoke "make"
+                               (string-append
+                                "ARGS=-j " jobs " --exclude-regex ^awamicmp3$")
+                               test-target))
+                     (format #t "test suite not run~%"))))))
+        '()))
    (synopsis "Reimplementation of the SIL Graphite text processing engine")
    (description
     "Graphite2 is a reimplementation of the SIL Graphite text processing
-- 
cgit 1.4.1


From c5a189d2abdbfe4c8dfeef764e3be055948b5c91 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 13 Jun 2023 09:37:07 +0200
Subject: gnu: guile-git: Skip http proxy test on the Hurd.

* gnu/packages/guile.scm (guile-git)[arguments]: When building natively on the
Hurd, add phase 'skip-tests/hurd'.
---
 gnu/packages/guile.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 06ffc39f1d..64a1b900de 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -842,7 +842,20 @@ type system, elevating types to first-class status.")
                  (lambda _
                    (substitute* "Makefile.am"
                      ((".*tests/blob\\.scm.*") ""))))))
-           '())))
+           '())
+       ,@(if (system-hurd?)
+             (list
+              #:phases
+              #~(modify-phases %standard-phases
+                  (add-after 'unpack 'skip-tests/hurd
+                    (lambda _
+                      (substitute* "tests/proxy.scm"
+                        (("\\(test-begin.*" all)
+                         (string-append
+                          all
+                          "(when (string-ci= \"GNU\" (vector-ref (uname) 0))\n"
+                          "  (test-skip 1))\n")))))))
+             '())))
     (native-inputs
      (list pkg-config autoconf automake texinfo guile-3.0 guile-bytestructures))
     (inputs
-- 
cgit 1.4.1


From e65647119e4791580ef50869d35be29d4010c6bb Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 13 Jun 2023 10:58:03 +0200
Subject: gnu: glib: Disable hanging and failing tests for the Hurd.

* gnu/packages/glib.scm (glib)[arguments]: When building for the Hurd,
in phase `disable-failing-tests', neutralize 20 hanging tests, and 37 more
failing tests.
---
 gnu/packages/glib.scm | 104 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 103 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index e988e8dc87..a0b85b15d1 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -14,7 +14,7 @@
 ;;; Copyright © 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
 ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Arthur Margerit <ruhtra.mar@gmail.com>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
@@ -285,6 +285,108 @@ information, refer to the @samp{dbus-daemon(1)} man page.")))
                           (string-append "//" all "\n"))
                          (("^  g_assert_cmpfloat \\(elapsed, ==.*" all)
                           (string-append "//" all "\n"))))
+                     '())
+              #$@(if (system-hurd?)
+                     '((with-directory-excursion "gio/tests"
+                         ;; TIMEOUT after 600s
+                         (substitute* '("actions.c"
+                                        "dbus-appinfo.c"
+                                        "debugcontroller.c"
+                                        "gdbus-bz627724.c"
+                                        "gdbus-connection-slow.c"
+                                        "gdbus-exit-on-close.c"
+                                        "gdbus-export.c"
+                                        "gdbus-introspection.c"
+                                        "gdbus-method-invocation.c"
+                                        "gdbus-non-socket.c"
+                                        "gdbus-proxy-threads.c"
+                                        "gdbus-proxy-unique-name.c"
+                                        "gdbus-proxy-well-known-name.c"
+                                        "gdbus-proxy.c"
+                                        "gdbus-test-codegen.c"
+                                        "gmenumodel.c"
+                                        "gnotification.c"
+                                        "stream-rw_all.c")
+                           (("return (g_test_run|session_bus_run)" all call)
+                            (string-append "return 0;// " call))
+                           ((" (ret|rtv|result) = (g_test_run|session_bus_run)"
+                             all var call)
+                            (string-append " " var " = 0;// " call))
+                           (("[ \t]*g_test_add_func.*;") ""))
+
+                         ;; commenting-out g_assert, g_test_add_func, g_test_run
+                         ;; does not help; special-case short-circuit.
+                         (substitute* "gdbus-connection-loss.c" ;; TODO?
+                           (("  gchar \\*path;.*" all)
+                            (string-append all "  return 0;\n")))
+
+                         ;; FAIL
+                         (substitute* '("appmonitor.c"
+                                        "async-splice-output-stream.c"
+                                        "autoptr.c"
+                                        "contexts.c"       
+                                        "converter-stream.c"
+                                        "file.c"
+                                        "g-file-info.c"
+                                        "g-file.c"
+                                        "g-icon.c"
+                                        "gapplication.c"
+                                        "gdbus-connection-flush.c"
+                                        "gdbus-connection.c"
+                                        "gdbus-names.c"    
+                                        "gdbus-server-auth.c"
+                                        "gsocketclient-slow.c"
+                                        "gsubprocess.c"
+                                        "io-stream.c"
+                                        "live-g-file.c"
+                                        "memory-monitor.c" 
+                                        "mimeapps.c"
+                                        "network-monitor-race.c"
+                                        "network-monitor.c"
+                                        "pollable.c"
+                                        "power-profile-monitor.c"
+                                        "readwrite.c"
+                                        "resources.c"
+                                        "socket-service.c"
+                                        "socket.c"
+                                        "tls-bindings.c"
+                                        "tls-certificate.c"
+                                        "tls-database.c"
+                                        "trash.c"
+                                        "vfs.c")
+                           (("return (g_test_run|session_bus_run)" all call)
+                            (string-append "return 0;// " call))
+                           ((" (ret|rtv|result) = (g_test_run|session_bus_run)"
+                             all var call)
+                            (string-append " " var " = 0;// " call))
+                           (("[ \t]*g_test_add_func.*;") ""))
+
+                         ;; commenting-out g_test_add_func, g_test_run does
+                         ;; not help; special-case short-circuit.
+                         (substitute* "gsettings.c"
+                           (("#ifdef TEST_LOCALE_PATH" all)
+                            (string-append "  return 0;\n" all)))
+
+                         ;; commenting-out g_test_add_func, ;; g_test_run does
+                         ;; not help; special-case short-circuit.
+                         (substitute* "proxy-test.c"
+                           (("  gint result.*;" all)
+                            (string-append all "  return 0;\n")))
+
+                         ;; commenting-out g_test_add_func, g_test_run
+                         ;; does not help; special-case short-circuit.
+                         (substitute* "volumemonitor.c"
+                           (("  gboolean ret;" all)
+                            (string-append all "  return 0;\n"))))
+
+                       (with-directory-excursion "glib/tests"
+                         ;; TIMEOUT after 600s
+                         (substitute* "thread-pool.c"
+                           (("[ \t]*g_test_add_func.*;") ""))
+
+                         ;; FAIL
+                         (substitute* "fileutils.c"
+                           (("[ \t]*g_test_add_func.*;") ""))))
                      '())))
           ;; Python references are not being patched in patch-phase of build,
           ;; despite using python-wrapper as input. So we patch them manually.
-- 
cgit 1.4.1


From 03f35ff390d5f77843d65a9df4bd763f82049d24 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 13 Jun 2023 12:41:08 +0200
Subject: gnu: ghostscript: Fix build for the Hurd.

* gnu/packages/patches/ghostscript-leptonica-hurd.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/ghostscript.scm (ghostscript)[arguments]: When building for the
Hurd, add phase 'patch-leptonica' and use it.
---
 gnu/local.mk                                       |  3 +-
 gnu/packages/ghostscript.scm                       | 10 +++
 .../patches/ghostscript-leptonica-hurd.patch       | 78 ++++++++++++++++++++++
 3 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/ghostscript-leptonica-hurd.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 0c1425a118..b3190b8bc2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1237,8 +1237,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghc-bloomfilter-ghc9.2.patch	\
   %D%/packages/patches/ghc-bytestring-handle-ghc9.patch	\
   %D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch	\
-  %D%/packages/patches/ghostscript-CVE-2023-36664.patch		\
-  %D%/packages/patches/ghostscript-CVE-2023-36664-fixup.patch	\
+  %D%/packages/patches/ghostscript-leptonica-hurd.patch		\
   %D%/packages/patches/ghostscript-no-header-id.patch		\
   %D%/packages/patches/ghostscript-no-header-uuid.patch		\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 94807fdd94..2d7f07fb40 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -201,6 +201,16 @@ printing, and psresize, for adjusting page sizes.")
                      '()))
       #:phases
       #~(modify-phases %standard-phases
+          #$@(if (target-hurd?)
+                 #~((add-after 'unpack 'patch-leptonica
+                      (lambda _
+                        (let ((patch-file
+                               #$(local-file
+                                  (search-patch
+                                   "ghostscript-leptonica-hurd.patch"))))
+                          (with-directory-excursion "leptonica"
+                            (invoke "patch" "--force" "-p1" "-i" patch-file))))))
+                 #~())
           (add-before 'configure 'create-output-directory
             (lambda _
               ;; The configure script refuses to function if the directory
diff --git a/gnu/packages/patches/ghostscript-leptonica-hurd.patch b/gnu/packages/patches/ghostscript-leptonica-hurd.patch
new file mode 100644
index 0000000000..124365b3e6
--- /dev/null
+++ b/gnu/packages/patches/ghostscript-leptonica-hurd.patch
@@ -0,0 +1,78 @@
+Upstream status: This patch was taken from leptonica upstream.
+
+Backported to ghostscripts bundled leptonica.
+
+From f04da7c816feb1d5f689c34f3d0e7e3621edf1f5 Mon Sep 17 00:00:00 2001
+From: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Wed, 1 Feb 2023 19:35:43 +0100
+Subject: [PATCH] Fix GNU/Hurd build
+
+There is no PATH_MAX limitation on GNU/Hurd, and realpath() can be
+safely be used with its second parameter set to NULL (as required by
+posix since its version 2001).
+---
+ src/sarray1.c | 29 +++++++++++++++++++++++------
+ 1 file changed, 23 insertions(+), 6 deletions(-)
+
+--- a/src/sarray1.c	2023-06-13 12:31:13.393672916 +0200
++++ a/src/sarray1.c	2023-06-13 12:34:13.574237149 +0200
+@@ -1953,7 +1953,11 @@
+ SARRAY *
+ getFilenamesInDirectory(const char  *dirname)
+ {
++#if _POSIX_VERSION >= 200112 || defined(__GLIBC__)
++char           *dir;
++#else
+ char            dir[PATH_MAX + 1];
++#endif
+ char           *realdir, *stat_path, *ignore;
+ size_t          size;
+ SARRAY         *safiles;
+@@ -1976,17 +1980,28 @@
+             * If the file or directory exists, realpath returns its path;
+               else it returns NULL.
+             * If the second arg to realpath is passed in, the canonical path
+-              is returned there.  Use a buffer of sufficient size.  If the
+-              second arg is NULL, the path is malloc'd and returned if the
+-              file or directory exists.
+-           We pass in a buffer for the second arg, and check that the canonical
+-           directory path was made.  The existence of the directory is checked
+-           later, after its actual path is returned by genPathname().  */
++              is returned there.  Use a buffer of sufficient size.
++              We pass in a buffer for the second arg, and check that the
++              canonical directory path was made.  The existence of the
++              directory is checked later, after its actual path is returned by
++              genPathname().
++              With GNU libc or Posix 2001, if the second arg is NULL, the path
++              is malloc'd and returned if the file or directory exists.
++           */
++#if _POSIX_VERSION >= 200112 || defined(__GLIBC__)
++    dir = realpath(dirname, NULL);
++    if (dir == NULL)
++        return (SARRAY *)ERROR_PTR("dir not made", __func__, NULL);
++#else
+     dir[0] = '\0';  /* init empty in case realpath() fails to write it */
+     ignore = realpath(dirname, dir);
+     if (dir[0] == '\0')
+         return (SARRAY *)ERROR_PTR("dir not made", procName, NULL);
++#endif
+     realdir = genPathname(dir, NULL);
++#if _POSIX_VERSION >= 200112 || defined(__GLIBC__)
++    LEPT_FREE(dir);
++#endif
+     if ((pdir = opendir(realdir)) == NULL) {
+         LEPT_FREE(realdir);
+         return (SARRAY *)ERROR_PTR("pdir not opened", procName, NULL);
+@@ -1998,10 +2013,12 @@
+         stat_ret = fstatat(dfd, pdirentry->d_name, &st, 0);
+ #else
+         size = strlen(realdir) + strlen(pdirentry->d_name) + 2;
++#if _POSIX_VERSION < 200112 && !defined(__GLIBC__)
+         if (size > PATH_MAX) {
+             L_ERROR("size = %zu too large; skipping\n", procName, size);
+             continue;
+         }
++#endif
+         stat_path = (char *)LEPT_CALLOC(size, 1);
+         snprintf(stat_path, size, "%s/%s", realdir, pdirentry->d_name);
+         stat_ret = stat(stat_path, &st);
-- 
cgit 1.4.1


From dd3f9a7a49616cd2db9a0cc2d4640aebde2664ef Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 13 Jun 2023 13:50:38 +0200
Subject: gnu: harfbuzz: Support build for the Hurd.

* gnu/packages/gtk.scm (harfbuzz)[native-inputs]: Do not include
gobject-introspection when building for the Hurd.
---
 gnu/packages/gtk.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index c5ec7bcdc2..5b88a9d31e 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -276,11 +276,13 @@ output.  Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
      ;; There are all in the Requires or Requires.private field of '.pc'.
      (list glib graphite2 icu4c))
     (native-inputs
-     (list `(,glib "bin")               ;for glib-mkenums
-           gobject-introspection
-           pkg-config
-           python-wrapper
-           which))
+     (append (list `(,glib "bin"))      ;for glib-mkenums
+             (if (target-hurd?)
+                 '()
+                 (list gobject-introspection))
+             (list pkg-config
+                   python-wrapper
+                   which)))
     (arguments
      (list #:configure-flags
            #~(list "--with-graphite2"
-- 
cgit 1.4.1


From 825a7be4316d27f8f34b0cbfa4970e1886a40e29 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 13 Jun 2023 13:52:24 +0200
Subject: gnu: pango: Support build for the Hurd.

* gnu/packages/gtk.scm (pango)[native-inputs]: Do not include
gobject-introspection when building for the Hurd.
---
 gnu/packages/gtk.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 5b88a9d31e..848ed91d96 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -401,12 +401,15 @@ applications.")
      (list bash-minimal
            zlib))
     (native-inputs
-     (list `(,glib "bin")               ;glib-mkenums, etc.
-           gobject-introspection        ;g-ir-compiler, etc.
-           help2man
-           perl
-           pkg-config
-           python-wrapper))
+     (append (list `(,glib "bin"))      ;glib-mkenums, etc.
+             (if (target-hurd?)
+                 '()
+                 (list gobject-introspection)) ;g-ir-compiler, etc.
+             (list
+              help2man
+              perl
+              pkg-config
+              python-wrapper)))
     (synopsis "Text and font handling library")
     (description "Pango is a library for laying out and rendering of text, with
 an emphasis on internationalization.  Pango can be used anywhere that text
-- 
cgit 1.4.1


From 8c5891d50ba90b1e00edd445e1cf9ab1e1e4a449 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 13 Jun 2023 14:49:10 +0200
Subject: gnu: fontforge: Support build on the Hurd.

* gnu/packages/patches/fontforge-hurd.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/fontutils.scm (fontforge)[arguments]: When building natively on
the Hurd, add new phase 'apply-hurd-patch' and use it, and replace phase
'check' to skip two tests.
---
 gnu/local.mk                              |  1 +
 gnu/packages/fontutils.scm                | 88 ++++++++++++++++++++-----------
 gnu/packages/patches/fontforge-hurd.patch | 82 ++++++++++++++++++++++++++++
 3 files changed, 141 insertions(+), 30 deletions(-)
 create mode 100644 gnu/packages/patches/fontforge-hurd.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index b3190b8bc2..f10713f126 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1146,6 +1146,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch	\
   %D%/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch	\
   %D%/packages/patches/fontconfig-cache-ignore-mtime.patch	\
+  %D%/packages/patches/fontforge-hurd.patch			\
   %D%/packages/patches/foobillard++-pkg-config.patch		\
   %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch	\
   %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch	\
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 64b15fbf05..2cfaa45c37 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -1534,37 +1534,65 @@ definitions.")
              ("python"          ,python)
              ("zlib"            ,zlib)))
    (arguments
-    '(#:configure-flags '(;; TODO: Provide GTK+ for the Wayland-friendly GDK
-                          ;; backend, instead of the legacy X11 backend.
-                          ;; Currently it introduces a circular dependency.
-                          "-DENABLE_X11=ON")
+    (list
+     #:configure-flags #~'( ;; TODO: Provide GTK+ for the Wayland-friendly GDK
+                           ;; backend, instead of the legacy X11 backend.
+                           ;; Currently it introduces a circular dependency.
+                           "-DENABLE_X11=ON")
       #:phases
-      (modify-phases %standard-phases
-        (add-after 'unpack 'do-not-override-RPATH
-          (lambda _
-            ;; Do not attempt to set a default RPATH, as our ld-wrapper
-            ;; already does the right thing.
-            (substitute* "CMakeLists.txt"
-              (("^set_default_rpath\\(\\)")
-               ""))
-            #t))
-        (add-after 'install 'set-library-path
-          (lambda* (#:key inputs outputs #:allow-other-keys)
-            (let ((out (assoc-ref outputs "out"))
-                  (potrace (dirname
-                            (search-input-file inputs "bin/potrace"))))
-              (wrap-program (string-append out "/bin/fontforge")
-                ;; Fontforge dynamically opens libraries.
-                `("LD_LIBRARY_PATH" ":" prefix
-                  ,(map (lambda (input)
-                          (string-append (assoc-ref inputs input)
-                                         "/lib"))
-                        '("libtiff" "libjpeg" "libpng" "libungif"
-                          "libxml2" "zlib" "libspiro" "freetype"
-                          "pango" "cairo" "fontconfig")))
-                ;; Checks for potrace program at runtime
-                `("PATH" ":" prefix (,potrace)))
-              #t))))))
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'do-not-override-RPATH
+            (lambda _
+              ;; Do not attempt to set a default RPATH, as our ld-wrapper
+              ;; already does the right thing.
+              (substitute* "CMakeLists.txt"
+                (("^set_default_rpath\\(\\)")
+                 ""))
+              #t))
+          #$@(if (target-hurd?)
+                 #~((add-after 'unpack 'apply-hurd-patch
+                      (lambda _
+                        (let ((patch-file
+                               #$(local-file
+                                  (search-patch "fontforge-hurd.patch"))))
+                          (invoke "patch" "--force" "-p1" "-i" patch-file)))))
+                 #~())
+          #$@(if (system-hurd?)
+                 #~((replace 'check
+                      ;; cmake-build-system ignores #:make-flags for make check
+                      (lambda* (#:key test-target tests? parallel-tests?
+                                #:allow-other-keys)
+                        (let ((skip '("test0001_py" "test0001_pyhook")))
+                          (if tests?
+                              (let ((jobs
+                                     (if parallel-tests?
+                                         (number->string (parallel-job-count))
+                                         "1")))
+                                (invoke "make"
+                                        (string-append "ARGS=-j " jobs
+                                                       " --exclude-regex ^"
+                                                       (string-join skip "\\|")
+                                                       "$")
+                                        test-target))
+                              (format #t "test suite not run~%"))))))
+                 #~())
+          (add-after 'install 'set-library-path
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out"))
+                    (potrace (dirname
+                              (search-input-file inputs "bin/potrace"))))
+                (wrap-program (string-append out "/bin/fontforge")
+                  ;; Fontforge dynamically opens libraries.
+                  `("LD_LIBRARY_PATH" ":" prefix
+                    ,(map (lambda (input)
+                            (string-append (assoc-ref inputs input)
+                                           "/lib"))
+                          '("libtiff" "libjpeg" "libpng" "libungif"
+                            "libxml2" "zlib" "libspiro" "freetype"
+                            "pango" "cairo" "fontconfig")))
+                  ;; Checks for potrace program at runtime
+                  `("PATH" ":" prefix (,potrace)))
+                #t))))))
    (synopsis "Outline font editor")
    (description
     "FontForge allows you to create and modify postscript, truetype and
diff --git a/gnu/packages/patches/fontforge-hurd.patch b/gnu/packages/patches/fontforge-hurd.patch
new file mode 100644
index 0000000000..20d62b8ce2
--- /dev/null
+++ b/gnu/packages/patches/fontforge-hurd.patch
@@ -0,0 +1,82 @@
+Upstream status: Taken from upstream.
+
+From dca87c025665f0f010f906a4eba96da9794a4d04 Mon Sep 17 00:00:00 2001
+From: Anthony Fok <foka@debian.org>
+Date: Thu, 16 Jun 2022 02:40:23 -0600
+Subject: [PATCH] Define PATH_MAX and MAXPATHLEN for GNU/Hurd compatibility
+
+Special thanks to @henrich, @ucko and @kilobyte for reporting the issue
+and offering suggestions on a fix.
+
+See also https://bugs.debian.org/877795
+
+Fixes #3119
+---
+ inc/basics.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/inc/basics.h b/inc/basics.h
+index b8d65823b..14590c5b1 100644
+--- a/inc/basics.h
++++ b/inc/basics.h
+@@ -123,5 +123,13 @@ static inline int imax(int a, int b)
+ 			last = newitem;		       \
+ 		    }
+ 
++#ifdef __GNU__
++# ifndef PATH_MAX
++#  define PATH_MAX 4096
++# endif
++# ifndef MAXPATHLEN
++#  define MAXPATHLEN 4096
++# endif
++#endif
+ 
+ #endif /* FONTFORGE_BASICS_H */
+-- 
+2.40.1
+
+From e0480f143f27f8f2686b5b14d7d302fe22f35002 Mon Sep 17 00:00:00 2001
+From: Anthony Fok <foka@debian.org>
+Date: Thu, 16 Jun 2022 03:06:56 -0600
+Subject: [PATCH] Undefine "extended" macro temporarily on GNU Hurd
+
+GNU Mach microkernel header files (gnumach-dev 1.8+git20201129) added to
+struct i386_xfp_save in /usr/include/i386-gnu/include/mach/i386/fp_reg.h
+a new "extended" field which happens to collide with the macro definition
+"#define extended double" in FontForge, leading to FTBFS on GNU Hurd.
+
+This issue may be circumvented by temporarily undefining the "extended"
+macro before loading `<gio/gio.h>` and friends, and redefining the
+"extended" macro right after.
+---
+ inc/ffglib.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/inc/ffglib.h b/inc/ffglib.h
+index f3419f0ab..25fe9ebde 100644
+--- a/inc/ffglib.h
++++ b/inc/ffglib.h
+@@ -26,11 +26,19 @@
+ #define GMenuItem GMenuItem_GIO
+ #define GTimer GTimer_GTK
+ 
++#ifdef __GNU__
++# undef extended
++#endif
++
+ #include <gio/gio.h>
+ #include <glib-object.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
+ 
++#ifdef __GNU__
++# define extended	double
++#endif
++
+ #undef GList
+ #undef GMenuItem
+ #undef GTimer
+-- 
+2.40.1
+
-- 
cgit 1.4.1


From 10059113431fc6fdbcd94351e14881af5dda907c Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 13 Jun 2023 18:39:06 +0200
Subject: gnu: po4a: Skip failing test on the Hurd.

* gnu/packages/gettext.scm (po4a)[arguments]: When building natively on the
Hurd, add phase 'skip-tests/hurd'.
---
 gnu/packages/gettext.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 947bffe3ba..b3dd844147 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -279,7 +279,14 @@ from Markdown files.")
           (add-before 'check 'disable-failing-tests
             (lambda _
               ;; FIXME: fails despite of importing SGMLS
-              (delete-file "t/fmt-sgml.t"))))))
+              (delete-file "t/fmt-sgml.t")))
+          #$@(if (system-hurd?)
+                 #~((add-after 'unpack 'skip-tests/hurd
+                      (lambda _
+                        (delete-file "t/cfg-multi.t")
+                        (delete-file "t/cfg-single.t")
+                        (delete-file "t/cfg-split.t"))))
+                 #~()))))
     (native-inputs
      (list gettext-minimal
            perl-module-build
-- 
cgit 1.4.1


From c4c08775a820868059b59c68d4dfd6be0c9d9010 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 13 Jun 2023 18:50:22 +0200
Subject: gnu: guile-2.0: Skip failing tests on the Hurd.

* gnu/packages/guile.scm (guile-2.0)[arguments]: When building natively on the
Hurd, add stage 'disable-threads.tests'...
(guile-2.2): ...and when building natively on the Hurd, delete it again.
---
 gnu/packages/guile.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 64a1b900de..1d36e3ee2a 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -212,8 +212,13 @@ without requiring the source code to be rewritten.")
                     (rename-file "test-suite/tests/srfi-18.test" "srfi-18.test")
                     ;; failed to remove 't-guild-compile-7215.go.tdL7yC
                     (substitute* "test-suite/standalone/Makefile.in"
-                      (("test-guild-compile ") ""))
-                    #t)))
+                      (("test-guild-compile ") "")))))
+              '())
+        ,@(if (system-hurd?)
+              '((add-after 'unpack 'disable-threads.tests
+                  (lambda _
+                    ;; Many tests hang, esp. (join-thread ..), also others.
+                    (rename-file "test-suite/tests/threads.test" "threads.test"))))
               '())
         (add-before 'configure 'pre-configure
           (lambda* (#:key inputs #:allow-other-keys)
@@ -286,7 +291,12 @@ without requiring the source code to be rewritten.")
         (if (target-x86-32?)            ;<https://issues.guix.gnu.org/49368>
             `(append '("--disable-static")
                  '("CFLAGS=-g -O2 -fexcess-precision=standard"))
-            flags))))
+            flags))
+       ((#:phases phases '%standard-phases)
+        #~(modify-phases #$phases
+            #$@(if (system-hurd?)
+                   #~((delete 'disable-threads.tests))
+                   '())))))
 
     (properties '((timeout . 72000)               ;20 hours
                   (max-silent-time . 36000)))     ;10 hours (needed on ARM
-- 
cgit 1.4.1


From 6547d3852b11966271535962110d9e68f50c95fc Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 20 Jun 2023 17:09:17 +0200
Subject: gnu: hurd: Support native build on the Hurd.

* gnu/packages/hurd.scm (hurd)[arguments]: In phases 'build-libdde-linux' and
'install-goodies', also look in inputs for dependencies.  There is no check
target, so set #:tests? to #false.
---
 gnu/packages/hurd.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 4064a9e2e8..f697694124 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -329,14 +329,14 @@ Hurd-minimal package which are needed for both glibc and GCC.")
                                        "hurd-rumpdisk-no-hd.patch"))))
     (version (package-version hurd-headers))
     (arguments
-     `(#:phases
+     `(#:tests? #f                      ;no "check" target
+       #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'prepare-addons
            (lambda* (#:key native-inputs inputs #:allow-other-keys)
              ;; First we import the things we want from dde.
              (for-each make-file-writable (find-files "."))
-             (let ((dde (or (assoc-ref inputs "dde-sources")
-                            (assoc-ref native-inputs "dde-sources"))))
+             (let ((dde (assoc-ref (or native-inputs inputs) "dde-sources")))
                (for-each (lambda (dir)
                            (copy-recursively
                             (string-append dde "/" dir ) dir))
@@ -466,13 +466,13 @@ exec ${system}/rc \"$@\"
                #t)))
          (add-after 'build 'build-libdde-linux
            (lambda* (#:key inputs native-inputs #:allow-other-keys)
-             (invoke (string-append (assoc-ref native-inputs "make")
+             (invoke (string-append (assoc-ref (or native-inputs inputs) "make")
                                     "/bin/make")
                      ;; XXX There can be a race condition because subdirs
                      ;; aren't interdependent targets in the Makefile.
                      "-j1" "-C" "libdde_linux26"
                      (string-append "SHELL="
-                                    (assoc-ref native-inputs "bash")
+                                    (assoc-ref (or native-inputs inputs) "bash")
                                     "/bin/bash")
                      (string-append "CC="
                                     ,(cc-for-target)))))
@@ -483,12 +483,12 @@ exec ${system}/rc \"$@\"
              (let* ((out (assoc-ref outputs "out"))
                     (datadir (string-append out "/share/hurd")))
                ;; Install libdde_linux26.
-               (invoke (string-append (assoc-ref native-inputs "make")
+               (invoke (string-append (assoc-ref (or native-inputs inputs) "make")
                                       "/bin/make")
                        "-C" "libdde_linux26" "install"
                        (string-append "SHELL="
-                                    (assoc-ref native-inputs "bash")
-                                    "/bin/bash")
+                                      (assoc-ref (or native-inputs inputs) "bash")
+                                      "/bin/bash")
                        (string-append "INSTALLDIR="
                                       out
                                       "/share/libdde_linux26/build/include"))
@@ -590,8 +590,7 @@ implementing them.")
            (add-after 'unpack 'prepare-dde
              (lambda* (#:key native-inputs inputs #:allow-other-keys)
                (for-each make-file-writable (find-files "."))
-               (let ((dde (or (assoc-ref inputs "dde-sources")
-                              (assoc-ref native-inputs "dde-sources"))))
+               (let ((dde (assoc-ref (or native-inputs inputs) "dde-sources")))
                  (for-each (lambda (dir)
                              (copy-recursively
                               (string-append dde "/" dir ) dir))
-- 
cgit 1.4.1


From 8227084dbe2041a4e4c24b6a69cb278cd4aeaaa0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:41:49 +0200
Subject: gnu: Add texlive-abbr.

* gnu/packages/tex.scm (texlive-abbr): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 60c0b0e7dc..be0548cf88 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1089,6 +1089,26 @@ works on TeX virtual fonts and @command{vpl2ovp} transforms a TeX font to an
 Omega one.")
     (license license:gpl3+)))
 
+(define-public texlive-abbr
+  (package
+    (name "texlive-abbr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/abbr/" "tex/generic/abbr/")
+             (base32
+              "0zi5qkgr2nnb3jp5adv42d84w7yav1dw0lgg2vdxfsz03j1bmlsb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/abbr")
+    (synopsis "Simple macros supporting abreviations for Plain and LaTeX")
+    (description
+     "The package provides some simple macros to support abbreviations in
+Plain TeX or LaTeX.  It allows writing, e.g., @samp{\\<TEX>} instead of
+@samp{\\TeX}, hence frees users from having to escape space after
+parameterless macros.")
+    (license license:public-domain)))
+
 (define-public texlive-adhocfilelist
   (package
     (name "texlive-adhocfilelist")
-- 
cgit 1.4.1


From bdfc3cfd11de3fbee038b47d40f8c1a9579c418a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:42:25 +0200
Subject: gnu: Add texlive-abstyles.

* gnu/packages/tex.scm (texlive-abstyles): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index be0548cf88..3e03abc13a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1109,6 +1109,32 @@ Plain TeX or LaTeX.  It allows writing, e.g., @samp{\\<TEX>} instead of
 parameterless macros.")
     (license license:public-domain)))
 
+(define-public texlive-abstyles
+  (package
+    (name "texlive-abstyles")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/abstyles/"
+                   "bibtex/bst/abstyles/"
+                   "doc/bibtex/abstyles/"
+                   "tex/generic/abstyles/")
+             (base32
+              "1ij4cp3pydfs4lch0f93gi2q7msafxyqfvv44whw1ppczidicnn2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/abstyles-orig")
+    (synopsis "Adaptable BibTeX styles")
+    (description
+     "This package provides a family of modifications of the standard BibTeX
+styles whose behaviour may be changed by changing the user document, without
+change to the styles themselves.  The package is largely used nowadays in its
+adaptation for working with Babel.")
+    (license
+     (list license:isc                  ;apreamble
+           license:knuth                ;bxabst
+           license:public-domain))))    ;docmac
+
 (define-public texlive-adhocfilelist
   (package
     (name "texlive-adhocfilelist")
-- 
cgit 1.4.1


From 778872bd95b27d7df4087665c990abf752b3c0a8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:42:57 +0200
Subject: gnu: Add texlive-apnum.

* gnu/packages/tex.scm (texlive-apnum): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3e03abc13a..9024c5bfe3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1204,6 +1204,26 @@ ligatures, but also offers additional control over them.")
 a given (Unicode) glyph.  It relies on Fontconfig.")
     (license license:bsd-3)))
 
+(define-public texlive-apnum
+  (package
+    (name "texlive-apnum")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/apnum/" "tex/generic/apnum/")
+             (base32
+              "0s6nklimzbqc1z1vhgffzp76d1kl2shz1xkf119bck482rvn3x61")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/apnum")
+    (synopsis "Arbitrary precision numbers implemented by TeX macros")
+    (description
+     "The basic operations (addition, subtraction, multiplication,
+division, power to an integer) are implemented by TeX macros in this package.
+Operands may be numbers with arbitrary numbers of digits; scientific notation
+is allowed.  The expression scanner is also provided.")
+    (license license:public-domain)))
+
 (define-public texlive-arara
   (package
     (name "texlive-arara")
-- 
cgit 1.4.1


From 590ec4c616cd01e53cb14de1a15ccda7b1094466 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:43:14 +0200
Subject: gnu: Add texlive-autoaligne.

* gnu/packages/tex.scm (texlive-autoaligne): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9024c5bfe3..fe37d93021 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1258,6 +1258,25 @@ on indirect resources, such as log file analysis.  Arara requires a Java
 virtual machine.")
     (license license:bsd-3)))
 
+(define-public texlive-autoaligne
+  (package
+    (name "texlive-autoaligne")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/autoaligne/"
+                   "tex/generic/autoaligne/")
+             (base32
+              "138d030zgzpdwqxx55gjw35y0c3v794fpa3c6znc9kv1vj8cs9d3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/autoaligne")
+    (synopsis "Align terms and members in math expressions")
+    (description
+     "This package allows to align terms and members between lines containing
+math expressions.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From b3f27e353a1673688ac9370b69dc0030317b5df2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:43:37 +0200
Subject: gnu: Add texlive-barr.

* gnu/packages/tex.scm (texlive-barr): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fe37d93021..9a93a477e2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1277,6 +1277,24 @@ virtual machine.")
 math expressions.")
     (license license:lppl1.3c)))
 
+(define-public texlive-barr
+  (package
+    (name "texlive-barr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/barr/" "tex/generic/barr/")
+             (base32
+              "1l532g0nxigbllv2lf74bwx78sf4jsfr1cad0hpq7i7kq820wbii")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/diagxy")
+    (synopsis "Diagram macros by Michael Barr")
+    (description
+     "Diagxy is a general diagramming package, useful for diagrams in a number
+of mathematical disciplines.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From 03fbcf1eace55f26e6ec0a0bfb3ad69f4e552ba6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:43:51 +0200
Subject: gnu: Add texlive-bitelist.

* gnu/packages/tex.scm (texlive-bitelist): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9a93a477e2..8d1f71dc89 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1295,6 +1295,31 @@ math expressions.")
 of mathematical disciplines.")
     (license license:lppl1.3+)))
 
+(define-public texlive-bitelist
+  (package
+    (name "texlive-bitelist")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/bitelist/"
+                   "source/generic/bitelist/"
+                   "tex/generic/bitelist/")
+             (base32
+              "1jv9w2jgx8q2k9xx0n4azlngsh26zs37ihavq0xy4n62ajf64ps6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bitelist")
+    (synopsis "Split list, in TeX's mouth")
+    (description
+     "The package provides commands for splitting a token list at the first
+occurrence of another (specified) token list.  The package's mechanism differs
+from those of packages providing similar features, in the following ways: the
+method uses TeX's mechanism of reading delimited macro parameters; splitting
+macros work by pure expansion, without assignments; the operation is carried
+out in a single macro call.  A variant of the operation is provided, that
+retains outer braces.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From 2d41b12cf6656965f93732145cc3cf0b03008a1c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:44:16 +0200
Subject: gnu: Add texlive-borceux.

* gnu/packages/tex.scm (texlive-borceux): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8d1f71dc89..0dc6a08dfd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1320,6 +1320,32 @@ out in a single macro call.  A variant of the operation is provided, that
 retains outer braces.")
     (license license:lppl1.3+)))
 
+(define-public texlive-borceux
+  (package
+    (name "texlive-borceux")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/borceux/"
+                   "tex/generic/borceux/")
+             (base32
+              "1fil90jsiqg7b0if3yq0jxv4rh7vanj2yj9pv8pnfkhvqii4p821")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/borceux")
+    (synopsis "Diagram macros by Francois Borceux")
+    (description
+     "The macros support the construction of diagrams, such as those that
+appear in category theory texts.  The user gives the list of vertices and
+arrows to be included, just as when composing a matrix, and the program takes
+care of computing the dimensions of the arrows and realizing the page setting.
+All the user has to do about the arrows is to specify their
+type (monomorphism, pair of adjoint arrows, etc.) and their direction (north,
+south-east, etc.); 12 types and 32 directions are available.")
+    ;; "You may freely use, modify, and/or distribute each of the
+    ;; files in this package without limitation."
+    (license (license:fsf-free "file://doc/generic/borceux/README"))))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From da14c67d79cfd29573d2949d68f4b54c839586f1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:44:25 +0200
Subject: gnu: Add texlive-c-pascal.

* gnu/packages/tex.scm (texlive-c-pascal): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0dc6a08dfd..85637199f2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1346,6 +1346,25 @@ south-east, etc.); 12 types and 32 directions are available.")
     ;; files in this package without limitation."
     (license (license:fsf-free "file://doc/generic/borceux/README"))))
 
+(define-public texlive-c-pascal
+  (package
+    (name "texlive-c-pascal")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/c-pascal/"
+                   "tex/generic/c-pascal/")
+             (base32
+              "0kmxki1yclk7lzlidcvsdry7mzm58zzwq3rxgvmpawq2hs8hpcra")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/c-pascal")
+    (synopsis "Typeset Python, C and Pascal programs")
+    (description
+     "This package provides a TeX macro package for easy typesetting programs
+in Python, C and Pascal.  Program source files may also be input.")
+    (license license:public-domain)))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From 32ab7ef34a5207b5813289311e03e8aa3dba0a7c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:44:42 +0200
Subject: gnu: Add texlive-catcodes.

* gnu/packages/tex.scm (texlive-catcodes): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 85637199f2..9fbf6fef3f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1365,6 +1365,34 @@ south-east, etc.); 12 types and 32 directions are available.")
 in Python, C and Pascal.  Program source files may also be input.")
     (license license:public-domain)))
 
+(define-public texlive-catcodes
+  (package
+    (name "texlive-catcodes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/catcodes/"
+                   "source/generic/catcodes/"
+                   "tex/generic/catcodes/")
+             (base32
+              "0di6rd5c0viiwvc6ncwndah38q318l3s1pf47ddmzjdq6rys9s33")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/catcodes")
+    (synopsis "Generic handling of TeX category codes")
+    (description
+     "The bundle deals with category code switching; the packages of the
+bundle should work with any TeX format (with the support of the
+@code{plainpkg} package).  The bundle provides:
+@itemize
+@item @file{stacklet.sty}, which supports stacks that control the use of
+different catcodes;
+@item @file{actcodes.sty}, which deals with active characters;
+@item @file{catchdq.sty}, which provides a simple quotation character control
+mechanism.
+@end itemize")
+    (license license:lppl1.3+)))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From 45e916cb95a14c41d26338f457b03160ab865337 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:44:53 +0200
Subject: gnu: Add texlive-chronosys.

* gnu/packages/tex.scm (texlive-chronosys): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9fbf6fef3f..baf125ad6f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1393,6 +1393,25 @@ mechanism.
 @end itemize")
     (license license:lppl1.3+)))
 
+(define-public texlive-chronosys
+  (package
+    (name "texlive-chronosys")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/chronosys/"
+                   "tex/generic/chronosys/")
+             (base32
+              "145ap67ykdkp2f0ahasp9sjccrv1wzxdfl05nq6hbi6z65pk56s5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chronosys")
+    (synopsis "Drawing time-line diagrams")
+    (description
+     "This package provides macros to produce time line diagrams.
+Interfaces for Plain TeX, ConTeXt and LaTeX are provided.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From 72ab0870fa4cb764e79c253984042ef2eb1f09c2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:45:07 +0200
Subject: gnu: Add texlive-colorsep.

* gnu/packages/tex.scm (texlive-colorsep): New variable.
---
 gnu/packages/tex.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index baf125ad6f..5ed94cd03a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1412,6 +1412,22 @@ mechanism.
 Interfaces for Plain TeX, ConTeXt and LaTeX are provided.")
     (license license:lppl1.3+)))
 
+(define-public texlive-colorsep
+  (package
+    (name "texlive-colorsep")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/colorsep/")
+             (base32
+              "0nf72pf2bjn8pcps45sn5dcjf1dkrww9wlpp1xbzl1h9i68p3h3h")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/colorsep")
+    (synopsis "Color separation")
+    (description
+     "This package provides support for colour separation when using Dvips.")
+    (license license:public-domain)))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From 1810b5b12d3ad123294e88caf46c0f12c1943544 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:45:22 +0200
Subject: gnu: Add texlive-compare.

* gnu/packages/tex.scm (texlive-compare): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5ed94cd03a..e53c3f9ab9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1428,6 +1428,25 @@ Interfaces for Plain TeX, ConTeXt and LaTeX are provided.")
      "This package provides support for colour separation when using Dvips.")
     (license license:public-domain)))
 
+(define-public texlive-compare
+  (package
+    (name "texlive-compare")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/generic/compare/")
+             (base32
+              "0isr7gmskv55cr4f1fa7s478v6fh65q9ijxkmbpxj0448g9817w4")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/compare")
+    (synopsis "Compare two strings")
+    (description
+     "The file defines a macro @code{\\compare}, which takes two arguments;
+the macro expands to @samp{-1}, @samp{0}, @samp{1}, according as the first
+argument is less than, equal to, or greater than the second argument.  Sorting
+is alphabetic, using ASCII collating order.")
+    (license license:public-domain)))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From 3adf1d1ac3e831f82732764d1c073a7ec5e46a55 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:45:48 +0200
Subject: gnu: Add texlive-crossrefenum.

* gnu/packages/tex.scm (texlive-crossrefenum): New variable.
---
 gnu/packages/tex.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e53c3f9ab9..148ebb9437 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1447,6 +1447,41 @@ argument is less than, equal to, or greater than the second argument.  Sorting
 is alphabetic, using ASCII collating order.")
     (license license:public-domain)))
 
+(define-public texlive-crossrefenum
+  (package
+    (name "texlive-crossrefenum")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/crossrefenum/"
+                   "tex/generic/crossrefenum/")
+             (base32
+              "07h7d47fxjj70h4bxd5sqz8abjnvgvkrnsy13a26imbarzg14db4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/crossrefenum")
+    (synopsis
+     "Smart typesetting of enumerated cross-references for various TeX formats")
+    (description
+     "@code{crossrefenum} lets TeX manage the formatting of bunches of
+cross-references for you.  It features:
+
+@itemize
+@item automatic collapsing of references;
+@item support for references by various criteria, including page and note
+number, line number in ConTeXt, and @code{edpage} and @code{edline} when used
+in conjunction with @code{reledmac};
+@item handling of references combining two criteria (e.g., by page and note
+number);
+@item extension mechanisms to add support to other types of references without
+modifying the internal macros.  Note that sorting is not supported.
+@end itemize
+
+It is written in Plain TeX as much as possible in order to make it compatible
+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-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From 187391a65f0d43e56558915526e5d6c4d2d01151 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:45:59 +0200
Subject: gnu: Add texlive-cweb-old.

* gnu/packages/tex.scm (texlive-cweb-old): New variable.
---
 gnu/packages/tex.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 148ebb9437..c14e54561d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1482,6 +1482,22 @@ 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-cweb-old
+  (package
+    (name "texlive-cweb-old")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/plain/cweb-old/")
+             (base32
+              "0vx235zpflqpnrfa9kqq7wmc1rylg5bw1r26knfzvh3w1swbp4ai")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cweb-old")
+    (synopsis "Obsolete files from CWEB")
+    (description
+     "This package contains parts of CWEB that are no longer useful.")
+    (license license:knuth)))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From d7156e3d43b5ed1851cd327ca4be0ded71c60807 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:46:13 +0200
Subject: gnu: Add texlive-dinat.

* gnu/packages/tex.scm (texlive-dinat): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c14e54561d..31302a2a49 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1498,6 +1498,25 @@ ConTeXt and LaTeX.")
      "This package contains parts of CWEB that are no longer useful.")
     (license license:knuth)))
 
+(define-public texlive-dinat
+  (package
+    (name "texlive-dinat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/dinat/" "doc/bibtex/dinat/")
+             (base32
+              "05ab7aq8h08a8pcl3si2lki569sf201bygf3ra95dpqhs1ijxaag")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dinat")
+    (synopsis "Bibliography style for German texts")
+    (description
+     "This package provides bibliography style files intended for texts in
+german.  They draw up bibliographies in accordance with the german DIN 1505,
+parts 2 and 3.")
+    (license license:public-domain)))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From 9aeddf892a4133d9cf6d9d8baccc1e0186ce08af Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:46:23 +0200
Subject: gnu: Add texlive-dirtree.

* gnu/packages/tex.scm (texlive-dirtree): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 31302a2a49..45af13ce50 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1517,6 +1517,28 @@ german.  They draw up bibliographies in accordance with the german DIN 1505,
 parts 2 and 3.")
     (license license:public-domain)))
 
+(define-public texlive-dirtree
+  (package
+    (name "texlive-dirtree")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/dirtree/"
+                   "source/generic/dirtree/"
+                   "tex/generic/dirtree/")
+             (base32
+              "1righlip75ry0yc6kbpijq423k4m625byzgb55d32s7c0imvj41v")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dirtree")
+    (synopsis "Display trees in the style of Windows Explorer")
+    (description
+     "This package is designed to emulate the way Windows Explorer displays
+directory and file trees, with the root at top left, and each level of subtree
+displaying one step in to the right.  The macros work equally well with Plain
+TeX and with LaTeX.")
+    (license license:lppl)))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From bac73b47bd97c4d07cc09087d41cff6b3a0b002b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:46:41 +0200
Subject: gnu: Add texlive-docbytex.

* gnu/packages/tex.scm (texlive-docbytex): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 45af13ce50..3d590d2f57 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1539,6 +1539,27 @@ displaying one step in to the right.  The macros work equally well with Plain
 TeX and with LaTeX.")
     (license license:lppl)))
 
+(define-public texlive-docbytex
+  (package
+    (name "texlive-docbytex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/docbytex/"
+                   "tex/generic/docbytex/")
+             (base32
+              "09x4xpyq89jjjsp4yzrifcazz0p2f5w7785g8pvss8v0wwsb0lav")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/docbytex")
+    (synopsis "Creating documentation from source code")
+    (description
+     "The package creates documentation from C source code, or other
+programming languages.")
+    ;; README states: "You can do anything with the files from DocBy.TeX
+    ;; package without any limit".
+    (license (license:fsf-free "file://doc/generic/docbytex/README"))))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
-- 
cgit 1.4.1


From a4da766149afa50929c7cf9e4f61389fedf88780 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:47:16 +0200
Subject: gnu: Add texlive-dowith.

* gnu/packages/tex.scm (texlive-dowith): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3d590d2f57..3d59146b6d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1590,6 +1590,28 @@ 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-dowith
+  (package
+    (name "texlive-dowith")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/dowith/"
+                   "source/generic/dowith/"
+                   "tex/generic/dowith/")
+             (base32
+              "1qlrcjac1qszgrap5v4g0d27g9k5ajqgyy493hmc9yh5wa9wmkmp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dowith")
+    (synopsis "Apply a command to a list of items")
+    (description
+     "The package provides macros for applying a command to all elements of
+a list without separators, and also for extending and reducing macros storing
+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-bibtex8
   (package
     (name "texlive-bibtex8")
-- 
cgit 1.4.1


From 0b2a07c101216b8ef56b84444fb49061a6abccfa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:47:48 +0200
Subject: gnu: Add texlive-eijkhout.

* gnu/packages/tex.scm (texlive-eijkhout): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3d59146b6d..3e7a51a013 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2327,6 +2327,26 @@ 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-eijkhout
+  (package
+    (name "texlive-eijkhout")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/generic/eijkhout/")
+             (base32
+              "00y3y01jpgzww1x6zjh748hpvizlrbgrv04p8aq3cm2pzs0g17qk")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/eijkhout")
+    (synopsis "Victor Eijkhout's packages")
+    (description
+     "The package provides three unrelated tools: @code{DB_process}, to parse
+and process database output; @code{CD_labeler}, to typeset user text to fit on
+a CD label; and @code{repeat}, a nestable, generic loop macro.")
+    (license
+     (list license:gpl2+                ;CD_labeler and DB_process.tex
+           license:lppl))))             ;repeat.tex
+
 (define-public texlive-findhyph
   (package
     (name "texlive-findhyph")
-- 
cgit 1.4.1


From 11a51001b92de0d9c85c0b5d176a15de123258bd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:48:08 +0200
Subject: gnu: Add texlive-encxvlna.

* gnu/packages/tex.scm (texlive-encxvlna): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3e7a51a013..b7e374617e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2347,6 +2347,27 @@ a CD label; and @code{repeat}, a nestable, generic loop macro.")
      (list license:gpl2+                ;CD_labeler and DB_process.tex
            license:lppl))))             ;repeat.tex
 
+(define-public texlive-encxvlna
+  (package
+    (name "texlive-encxvlna")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/encxvlna/"
+                   "tex/latex/encxvlna/" "tex/plain/encxvlna/")
+             (base32
+              "01lgh560xhn56k5pps65lq9c5rn0kbrcfvqfikrqq83g3n7k2p8v")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/encxvlna")
+    (synopsis "Insert nonbreakable spaces, using encTeX")
+    (description
+     "The package provides tools for inserting nonbreakable spaces after
+nonsyllabic prepositions and single letter conjunctions as required by Czech
+and Slovak typographical rules.  It is implemented using encTeX and provides
+files both for plain TeX and LaTeX.")
+    (license license:lppl)))
+
 (define-public texlive-findhyph
   (package
     (name "texlive-findhyph")
-- 
cgit 1.4.1


From c37da0c23a8d7ec87dfae3e35abeae8a3e61edd6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:48:20 +0200
Subject: gnu: Add texlive-epigram.

* gnu/packages/tex.scm (texlive-epigram): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b7e374617e..ac8f49f616 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2368,6 +2368,24 @@ and Slovak typographical rules.  It is implemented using encTeX and provides
 files both for plain TeX and LaTeX.")
     (license license:lppl)))
 
+(define-public texlive-epigram
+  (package
+    (name "texlive-epigram")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/generic/epigram/")
+             (base32
+              "1zps5067mgi7xq3fpjvjln8i0rz53j7qn660khraq8ribv4glnpf")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/epigram")
+    (synopsis "Display short quotations")
+    (description
+     "The package determines (on the basis of the width of the text of the
+epigram, laid out on a single line) whether to produce a line or a displayed
+paragraph.")
+    (license license:public-domain)))
+
 (define-public texlive-findhyph
   (package
     (name "texlive-findhyph")
-- 
cgit 1.4.1


From 80a0fd737f78200a1a9ce01317af51dbd57f6163 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:48:36 +0200
Subject: gnu: Add texlive-epsf-dvipdfmx.

* gnu/packages/tex.scm (texlive-epsf-dvipdfmx): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ac8f49f616..787192c8b7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2386,6 +2386,27 @@ epigram, laid out on a single line) whether to produce a line or a displayed
 paragraph.")
     (license license:public-domain)))
 
+(define-public texlive-epsf-dvipdfmx
+  (package
+    (name "texlive-epsf-dvipdfmx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/epsf-dvipdfmx/"
+                   "tex/plain/epsf-dvipdfmx/")
+             (base32
+              "0xj4hag3nldxxjcpympvra5cdn19nk76af9dxq07ci585gcki3x5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/epsf-dvipdfmx")
+    (synopsis "Plain TeX file for using epsf.tex with (x)dvipdfmx")
+    (description
+     "@file{epsf-dvipdfmx.tex} is a plain TeX file to be @code{\\input} after
+@file{epsf.tex} when using plain TeX with @code{dvipdfmx}.  It is needed when
+an @file{.eps} file has anything except the origin for the lower-left of its
+bounding box.")
+    (license license:public-domain)))
+
 (define-public texlive-findhyph
   (package
     (name "texlive-findhyph")
-- 
cgit 1.4.1


From f340fd2acc9a72c0bdf10b02f3283b75f99666b2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:49:02 +0200
Subject: gnu: Add texlive-expex-acro.

* gnu/packages/tex.scm (texlive-expex-acro): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 787192c8b7..002b05d219 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2407,6 +2407,28 @@ an @file{.eps} file has anything except the origin for the lower-left of its
 bounding box.")
     (license license:public-domain)))
 
+(define-public texlive-expex-acro
+  (package
+    (name "texlive-expex-acro")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/expex-acro/"
+                   "source/generic/expex-acro/"
+                   "tex/generic/expex-acro/")
+             (base32
+              "04ckyr574bs10xd2a0fg6x30325a4dbbbjl1axzlhaq1kn07r7kh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/expex-acro")
+    (synopsis "Wrapper for the expex package")
+    (description
+     "This is a small wrapper for the @code{expex} package, adding ways to
+define, use, and summarize glossing abbreviations.  It also provides commands
+to refer to examples, as well as some inline formatting commands commonly used
+in linguistics.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-findhyph
   (package
     (name "texlive-findhyph")
-- 
cgit 1.4.1


From 8601f0c5ddb63eee4e15b143060326a3184b3176 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:49:23 +0200
Subject: gnu: Add texlive-expkv-bundle.

* gnu/packages/tex.scm (texlive-expkv-bundle): New variable.
---
 gnu/packages/tex.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 002b05d219..7930954293 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2429,6 +2429,46 @@ to refer to examples, as well as some inline formatting commands commonly used
 in linguistics.")
     (license license:lppl1.3+)))
 
+(define-public texlive-expkv-bundle
+  (package
+    (name "texlive-expkv-bundle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/expkv-bundle/"
+                   "source/latex/expkv-bundle/"
+                   "tex/context/third/expkv-bundle/"
+                   "tex/generic/expkv-bundle/"
+                   "tex/latex/expkv-bundle/")
+             (base32
+              "09ijb71w69bnhi38i8z2bnv8d4r4sdg337v61yi66y94z8d9iid9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/expkv-bundle")
+    (synopsis "Expandable @samp{key=val} implementation and friends")
+    (description
+     "This is a collection of different packages that provide @samp{key=value}
+functionality in plainTeX, LaTeX, and ConTeXt.
+
+At the core, the @code{expkv} package implements two expandable
+@samp{key=value} parsers that are somewhat fast and robust against common bugs
+in many key=value implementations (no accidental brace stripping, no fragility
+for active commas or equals signs).
+
+@code{expkv-cs} enables users to define expandable @samp{key=value} macros in
+a comfortable and straightforward way.
+
+@code{expkv-def} provides an interface to define common key types for
+@code{expkv} similar to the key defining interfaces of widespread
+@samp{key=value} implementations.
+
+@code{expkv-opt} allows to parse package or class options in LaTeX via
+@code{expkv}.
+
+@code{expkv-pop} is a utility package to define prefix oriented parsers that
+allow a somewhat natural formulation.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-findhyph
   (package
     (name "texlive-findhyph")
-- 
cgit 1.4.1


From c7e08aa26fd35bc965693d24b3931f0a5b7f2b25 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:49:38 +0200
Subject: gnu: Add texlive-fenixpar.

* gnu/packages/tex.scm (texlive-fenixpar): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7930954293..787c1dcc30 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2469,6 +2469,33 @@ a comfortable and straightforward way.
 allow a somewhat natural formulation.")
     (license license:lppl1.3c)))
 
+(define-public texlive-fenixpar
+  (package
+    (name "texlive-fenixpar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/fenixpar/"
+                   "tex/generic/fenixpar/")
+             (base32
+              "1363dr8fnhflw0mysv23mpp2vf02vfxs43nnv95yqkbsvp9fj502")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fenixpar")
+    (synopsis "One-shot changes to token registers such as @code{\\everypar}")
+    (description
+     "The bundle provides two packages, @code{fenxitok} and
+@code{fenixpar}.  The @code{fenixtok} package provides user macros to
+add material to a token register; the material will be
+(automatically) removed from the token register when the register is executed.
+Material may be added either to the left or to the right, and care is taken
+not to override any redefinition that may be included in the token register
+itself.  The @code{fenixpar} package uses the macros of @code{fenixtok} to
+provide a user interface to manipulation of the @code{\\everypar} token
+register.  The packages require the e-TeX extensions; with them, they work
+either with Plain TeX or with LaTeX.")
+    (license license:lppl)))
+
 (define-public texlive-findhyph
   (package
     (name "texlive-findhyph")
-- 
cgit 1.4.1


From 4575ae283fbc425f434670f9d1a672ccbacf1c8a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:49:58 +0200
Subject: gnu: Add texlive-figflow.

* gnu/packages/tex.scm (texlive-figflow): New variable.
---
 gnu/packages/tex.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 787c1dcc30..3921b1c7d9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2496,6 +2496,30 @@ register.  The packages require the e-TeX extensions; with them, they work
 either with Plain TeX or with LaTeX.")
     (license license:lppl)))
 
+(define-public texlive-figflow
+  (package
+    (name "texlive-figflow")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/figflow/" "tex/plain/figflow/")
+             (base32
+              "1vsrsw5rrqjym0flca9537m41vs7wlk8mhl9zmqjfaxgi8jvc9ml")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/figflow")
+    (synopsis "Flow text around a figure")
+    (description
+     "This package provides a Plain TeX macro @code{\\figflow} that allows one
+to insert a figure into an area inset into a paragraph.  Command arguments are
+width and height of the figure, and the figure (and its caption) itself.  The
+package does not work with LaTeX; packages such as @code{wrapfig},
+@code{floatflt} and @code{picins} support the needs of LaTeX users in this
+area.")
+    ;; README states: "You may freely use, modify, and/or distribute this
+    ;; file, without limitation."
+    (license (license:fsf-free "file://doc/plain/figflow/README"))))
+
 (define-public texlive-findhyph
   (package
     (name "texlive-findhyph")
-- 
cgit 1.4.1


From 5df0245cc7ae28f2fba70438336beac14379ef5c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:50:12 +0200
Subject: gnu: Add texlive-fixpdfmag.

* gnu/packages/tex.scm (texlive-fixpdfmag): New variable.
---
 gnu/packages/tex.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3921b1c7d9..b5ed30db9f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2544,6 +2544,23 @@ enough context to enable you to find the hyphenated word that's being
 referenced.")
     (license license:gpl2)))
 
+(define-public texlive-fixpdfmag
+  (package
+    (name "texlive-fixpdfmag")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/plain/fixpdfmag/")
+             (base32
+              "0s5ilsmnhvi57x9cqwp7nwpagfribmgkbl0z1ci55aw2a6bff9hn")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fixpdfmag")
+    (synopsis "Fix magnification in pdfTeX")
+    (description
+     "This package provides a recent change to pdfTeX has caused magnification
+to apply to page dimensions.")
+    (license license:public-domain)))
+
 (define-public texlive-fontools
   (package
     (name "texlive-fontools")
-- 
cgit 1.4.1


From f4e823f17c5d23957160dd100187e41ae51b77b3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:50:22 +0200
Subject: gnu: Add texlive-fltpoint.

* gnu/packages/tex.scm (texlive-fltpoint): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b5ed30db9f..9fc2109abc 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2561,6 +2561,26 @@ referenced.")
 to apply to page dimensions.")
     (license license:public-domain)))
 
+(define-public texlive-fltpoint
+  (package
+    (name "texlive-fltpoint")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/fltpoint/"
+                   "source/generic/fltpoint/"
+                   "tex/generic/fltpoint/")
+             (base32
+              "0k85cyh39rxr3jrgyxcj1lrya5zss5da62pj7q8412naaklkhd7n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fltpoint")
+    (synopsis "Simple floating point arithmetic")
+    (description
+     "The package provides simple floating point operations (addition,
+subtraction, multiplication, division and rounding).")
+    (license license:lppl1.2+)))
+
 (define-public texlive-fontools
   (package
     (name "texlive-fontools")
-- 
cgit 1.4.1


From 23ea3e8a405b78cd2b376cd05bfeca222b3fa016 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:50:38 +0200
Subject: gnu: Add texlive-fntproof.

* gnu/packages/tex.scm (texlive-fntproof): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9fc2109abc..b26cec97fa 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2581,6 +2581,29 @@ to apply to page dimensions.")
 subtraction, multiplication, division and rounding).")
     (license license:lppl1.2+)))
 
+(define-public texlive-fntproof
+  (package
+    (name "texlive-fntproof")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/fntproof/"
+                   "tex/generic/fntproof/")
+             (base32
+              "0pw0nw0dalnxqxpfgpw4pglngz3iff8sxxfdn89ygz46sv6427n5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fntproof")
+    (synopsis "Programmable font test pattern generator")
+    (description
+     "The package implements all the font testing commands of Knuth's
+@file{testfont.tex}, but arranges that information necessary for each command
+is supplied as arguments to that command, rather than prompted for.  This
+makes it possible to type all the tests in one command line, and easy to input
+the package in a file and to use the commands there.  A few additional
+commands supporting this last purpose are also made available.")
+    (license license:public-domain)))
+
 (define-public texlive-fontools
   (package
     (name "texlive-fontools")
-- 
cgit 1.4.1


From 776f81828ca9128357e22bc444d1d95088d9b200 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:50:48 +0200
Subject: gnu: Add texlive-font-change.

* gnu/packages/tex.scm (texlive-font-change): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b26cec97fa..fcc4d3a2f8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2604,6 +2604,29 @@ the package in a file and to use the commands there.  A few additional
 commands supporting this last purpose are also made available.")
     (license license:public-domain)))
 
+(define-public texlive-font-change
+  (package
+    (name "texlive-font-change")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/font-change/"
+                   "tex/plain/font-change/")
+             (base32
+              "1b2i3gwrwfa2ab95m2ksmypiwc5dmfyirymhm18g1h0zpj86ccza")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/font-change")
+    (synopsis "Macros to change text and mathematics fonts in plain TeX")
+    (description
+     "This package provides macros to change text and mathematics fonts in
+TeX.  The macros are written for plain TeX and may be used with other packages
+like AmSTeX, eplain, etc.  They also work with XeTeX. The macros allow users
+to change the fonts (for both text and mathematics) in their TeX document with
+only one statement.  The fonts may be used readily at various predefined
+sizes.")
+    (license license:cc-by-sa3.0)))
+
 (define-public texlive-fontools
   (package
     (name "texlive-fontools")
-- 
cgit 1.4.1


From eb1d39e74fa80d4f2f7a2478d978fdf468edb277 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:50:59 +0200
Subject: gnu: Add texlive-fontch.

* gnu/packages/tex.scm (texlive-fontch): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fcc4d3a2f8..71dfa0aed3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2627,6 +2627,29 @@ only one statement.  The fonts may be used readily at various predefined
 sizes.")
     (license license:cc-by-sa3.0)))
 
+(define-public texlive-fontch
+  (package
+    (name "texlive-fontch")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/fontch/" "tex/plain/fontch/")
+             (base32
+              "19v8l76181yhan6ybc47i5sq4mirc8lc7x1zxqxmk15wyvax9lm9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fontch")
+    (synopsis "Changing fonts, sizes and encodings in Plain TeX")
+    (description
+     "The fontch macros allow the user to change font size and family anywhere
+in a plain TeX document.  Sizes of 8, 10, 12, 14, 20 and 24 points are
+available.  A sans serif family is defined in addition to the families already
+defined in plain TeX. Optional support for Latin Modern T1 and TS1 fonts is
+given.  There are macros for non-latin1 letters and for most TS1 symbols.
+Math mode always uses CM fonts.  A command for producing doubled-spaced
+documents is also provided.")
+    (license license:lppl)))
+
 (define-public texlive-fontools
   (package
     (name "texlive-fontools")
-- 
cgit 1.4.1


From fcc06aec35a081ee32e80a777b6f3bc9f90f4cc7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:51:38 +0200
Subject: gnu: Add texlive-getoptk.

* gnu/packages/tex.scm (texlive-getoptk): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 71dfa0aed3..8a19c6d141 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2741,6 +2741,25 @@ EPS files and @command{psfrag} substitution definition files, and produces PDF
 and EPS files with the substitutions included.")
     (license license:gpl3+)))
 
+(define-public texlive-getoptk
+  (package
+    (name "texlive-getoptk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/getoptk/" "tex/plain/getoptk/")
+             (base32
+              "19ndqi977wk6f9ikcvbllcbxmmfzdanjfznzx6pkq41caf4mj91y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/getoptk")
+    (synopsis "Define macros with sophisticated options")
+    (description
+     "The package provides a means of defining macros whose options are taken
+from a dictionary, which includes options which themselves have arguments.
+The package was designed for use with Plain TeX.")
+    (license license:cecill-b)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From f2179ba604a4d3b87de8ed9f35dbcdc937a84b9e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:51:49 +0200
Subject: gnu: Add texlive-gfnotation.

* gnu/packages/tex.scm (texlive-gfnotation): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8a19c6d141..f76e96c82a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2760,6 +2760,27 @@ from a dictionary, which includes options which themselves have arguments.
 The package was designed for use with Plain TeX.")
     (license license:cecill-b)))
 
+(define-public texlive-gfnotation
+  (package
+    (name "texlive-gfnotation")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/gfnotation/"
+                   "tex/plain/gfnotation/")
+             (base32
+              "18yl6qhwd3fk6fyi6plj0bcb6iwzr4yx9aqmhs77rs5k4j2rgxsf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gfnotation")
+    (synopsis "Typeset Gottlob Frege's notation in plain TeX")
+    (description
+     "The package implements macros for plain TeX to typeset the notation
+invented by Gottlob Frege in 1879 for his books @emph{Begriffsschrift} and
+@emph{Grundgesetze der Arithmetik} (two volumes).  The output styles of both
+books are supported.")
+    (license license:gpl3)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 72794f220334dc6ff2524f6c5926101f43655714 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:52:00 +0200
Subject: gnu: Add texlive-gobble.

* gnu/packages/tex.scm (texlive-gobble): New variable.
---
 gnu/packages/tex.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f76e96c82a..5145dac52a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2781,6 +2781,36 @@ invented by Gottlob Frege in 1879 for his books @emph{Begriffsschrift} and
 books are supported.")
     (license license:gpl3)))
 
+(define-public texlive-gobble
+  (package
+    (name "texlive-gobble")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/gobble/"
+                   "source/generic/gobble/"
+                   "tex/generic/gobble/")
+             (base32
+              "02g40fx99xn80af6bqv7zn16l8dnqihqd42vn5hbphfx85b3p49q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-ydoc))
+    (home-page "https://ctan.org/pkg/gobble")
+    (synopsis "More gobble macros for PlainTeX and LaTeX")
+    (description
+     "The LaTeX package @code{gobble} includes several gobble macros not
+included in the LaTeX kernel.  These macros remove a number of arguments after
+them, a feature regulary used inside other macros.  This includes gobble
+macros for optional arguments.
+
+The LaTeX package @code{gobble-user} provides these macros at the user level,
+i.e.  using names without @samp{@@@@} so that these can be used without
+@code{\\makeatletter} and @code{\\makeatother}.  The same macros are provided
+inside @file{.tex} files for use with plain-TeX or other TeX formats.
+However, the gobble macros for optional macros require @code{\\@@@@ifnextchar}
+to be defined.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 2ba8ec6623f75c3d6fa200b85da079f1e193f421 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:52:10 +0200
Subject: gnu: Add texlive-graphics-pln.

* gnu/packages/tex.scm (texlive-graphics-pln): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5145dac52a..0ee7a1c8ce 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2811,6 +2811,28 @@ However, the gobble macros for optional macros require @code{\\@@@@ifnextchar}
 to be defined.")
     (license license:lppl1.3+)))
 
+(define-public texlive-graphics-pln
+  (package
+    (name "texlive-graphics-pln")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/graphics-pln/"
+                   "tex/plain/graphics-pln/")
+             (base32
+              "1iv3g76dzkpr2qak79bj9sdm6w9lb0n2md32cc23szrhgv6q7il3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/graphics-pln")
+    (synopsis "LaTeX-style graphics for Plain TeX users")
+    (description
+     "The Plain TeX graphics package is mostly a thin shell around the LaTeX
+@code{graphicx} and @code{color} packages, with support of the LaTeX-isms in
+those packages provided by @code{miniltx}.  The bundle also contains a file
+@file{picture.tex}, which is a wrapper around the @file{autopict.sty}, and
+provides the LaTeX picture mode to Plain TeX users.")
+    (license license:lppl1.0+)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 90faa7d63aca8ad4aa83cbf966b8c38f1e978714 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:52:19 +0200
Subject: gnu: Add texlive-gtl.

* gnu/packages/tex.scm (texlive-gtl): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0ee7a1c8ce..83b5919e77 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2833,6 +2833,27 @@ 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-gtl
+  (package
+    (name "texlive-gtl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/gtl/" "source/generic/gtl/"
+                   "tex/generic/gtl/")
+             (base32
+              "066g0zmndj7dda1by6jsxqccfkglmf2xq2sn0xk5f8x900h2wbbz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gtl")
+    (synopsis "Manipulating generalized token lists")
+    (description
+     "The package provides tools for simple operations on lists of tokens
+which are not necessarily balanced.  It is in particular used a lot in the
+@code{unravel} package, to go through tokens one at a time rather than having
+to work with entire braced groups at a time.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From bd9580625bdf6c4de1c24e8aded73efc10eeb413 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:52:28 +0200
Subject: gnu: Add texlive-hlist.

* gnu/packages/tex.scm (texlive-hlist): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 83b5919e77..0891063bd7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2854,6 +2854,24 @@ 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-hlist
+  (package
+    (name "texlive-hlist")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/hlist/" "tex/generic/hlist/")
+             (base32
+              "14rm9npzcanw4p4nkqd0rrm4655f9yhw58zf0qfa5azs305ba687")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hlist")
+    (synopsis "Horizontal and columned lists")
+    (description
+     "This plain TeX and LaTeX package provides the @code{hlist} environment
+in which @code{\\hitem} starts a horizontal and columned item.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From f3528a9c34af0fe37c4066c618fdd3153d46a767 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:52:42 +0200
Subject: gnu: Add texlive-hyplain.

* gnu/packages/tex.scm (texlive-hyplain): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0891063bd7..ffabfdea8f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2872,6 +2872,25 @@ to work with entire braced groups at a time.")
 in which @code{\\hitem} starts a horizontal and columned item.")
     (license license:lppl1.3c)))
 
+(define-public texlive-hyplain
+  (package
+    (name "texlive-hyplain")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/hyplain/" "tex/plain/hyplain/")
+             (base32
+              "1xj23zhv0sapjvchlcp013d32kayjf48wq5ywdak5n0fkb09mzl2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hyplain")
+    (synopsis "Basic support for multiple languages in Plain TeX")
+    (description
+     "The package offers a means to set up hyphenation suitable for several
+languages and/or dialects, and to select them or switch between them while
+typesetting.")
+    (license license:public-domain)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 749e2bb6a980f67de616075cf7aef25047abbdc9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:53:00 +0200
Subject: gnu: Add texlive-inputnormalization.

* gnu/packages/tex.scm (texlive-inputnormalization): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ffabfdea8f..3a6b18960e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2891,6 +2891,26 @@ languages and/or dialects, and to select them or switch between them while
 typesetting.")
     (license license:public-domain)))
 
+(define-public texlive-inputnormalization
+  (package
+    (name "texlive-inputnormalization")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/inputnormalization/"
+                   "source/latex/inputnormalization/"
+                   "tex/latex/inputnormalization/")
+             (base32
+              "0nfvcmr0lp7nig8mz3j1lwi0wbk8yf1ibdnz3lq22pysfjjl3200")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/inputnormalization")
+    (synopsis "Wrapper for XeTeX's and LuaTeX's input normalization")
+    (description
+     "This package provides a cross engine interface to normalizing input
+before it's read by TeX.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 7792c8c0aa501b785565d3e1b2b84ee2dfb8fc4f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:53:49 +0200
Subject: gnu: Add texlive-insbox.

* gnu/packages/tex.scm (texlive-insbox): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3a6b18960e..d1f4ddac9d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2911,6 +2911,24 @@ typesetting.")
 before it's read by TeX.")
     (license license:lppl1.3+)))
 
+(define-public texlive-insbox
+  (package
+    (name "texlive-insbox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/insbox/" "tex/generic/insbox/")
+             (base32
+              "0br6xpn9y11nw2pdjxck6mijbw2q6g2v31p64hwn65bwnx1fnc25")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/insbox")
+    (synopsis "Insert pictures/boxes into paragraphs")
+    (description
+     "The package provides convenient bundling of the @code{\\parshape}
+primitive.  This is a TeX package.")
+    (license license:public-domain)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From d5b37fda2fa5f075dcfb846b86e3b08748948007 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:53:58 +0200
Subject: gnu: Add texlive-js-misc.

* gnu/packages/tex.scm (texlive-js-misc): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d1f4ddac9d..be8af6317a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2929,6 +2929,25 @@ before it's read by TeX.")
 primitive.  This is a TeX package.")
     (license license:public-domain)))
 
+(define-public texlive-js-misc
+  (package
+    (name "texlive-js-misc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/js-misc/" "tex/plain/js-misc/")
+             (base32
+              "03cixw6rbg787ma8v43py07vrmhijf9cfg965ndahbzyhi6vkc96")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/js-misc")
+    (synopsis "Miscellaneous macros from Joachim Schrod")
+    (description
+     "This package provides a bunch of packages, including: @file{idverb.tex},
+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-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From f1ad95b0ad116e52d4762314c50f4129f7da0974 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:54:17 +0200
Subject: gnu: Add texlive-lambda-lists.

* gnu/packages/tex.scm (texlive-lambda-lists): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index be8af6317a..e8de5a9ae8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2948,6 +2948,26 @@ 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-lambda-lists
+  (package
+    (name "texlive-lambda-lists")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/lambda-lists/"
+                   "tex/plain/lambda-lists/")
+             (base32
+              "1dlm6yr0z7d2j4wn1i1khf47sf79y4h2aahymm3y11ljr5pg012r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lambda-lists")
+    (synopsis "Lists in ``TeX's mouth''")
+    (description
+     "These list-processing macros avoid the reassignments employed in the
+macros shown in Appendix D of the TeXbook: all the manipulations take place in
+what Knuth is pleased to call ``TeX's mouth''.")
+    (license license:lppl)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 210b753d8c47b439030fef8e5ab9fc1abe0e08ae Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:54:30 +0200
Subject: gnu: Add texlive-langcode.

* gnu/packages/tex.scm (texlive-langcode): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e8de5a9ae8..69c81eb828 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2968,6 +2968,29 @@ macros shown in Appendix D of the TeXbook: all the manipulations take place in
 what Knuth is pleased to call ``TeX's mouth''.")
     (license license:lppl)))
 
+(define-public texlive-langcode
+  (package
+    (name "texlive-langcode")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/langcode/"
+                   "source/generic/langcode/"
+                   "tex/generic/langcode/")
+             (base32
+              "0ygshcc0iszaldzc8ygz4bgvz05c3kv81v3m7i4q46l57x2kfx6x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/langcode")
+    (synopsis "Simple language-dependent settings based on language codes")
+    (description
+     "The package provides a command @code{\\uselangcode@{<code>@}} to adjust
+language-dependent settings such as key words, typographical conventions and
+language codes (ISO 639-1).  The package provides a means of selecting macros
+according to the specified code, for preparing a document that is to be
+separately typeset in different languages.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 26741f5cfd2e4fd48f890d193a875014d18cf630 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:55:04 +0200
Subject: gnu: Add texlive-lecturer.

* gnu/packages/tex.scm (texlive-lecturer): New variable.
---
 gnu/packages/tex.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 69c81eb828..5fce27bd23 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2991,6 +2991,44 @@ according to the specified code, for preparing a document that is to be
 separately typeset in different languages.")
     (license license:lppl1.3+)))
 
+(define-public texlive-lecturer
+  (package
+    (name "texlive-lecturer")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/lecturer/"
+                   "tex/generic/lecturer/")
+             (base32
+              "0ry4r1zcq71kk672dnnpzah0aw2axj7frajbv6xwy6hf2hzzs0ln")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lecturer")
+    (synopsis "On-screen presentations for (almost) all formats")
+    (description
+     "The package creates slides for on-screen presentations based on PDF
+features without manipulating TeX's typesetting process.  The presentation
+flow relies on PDF's abilities to display content step by step.  Features
+include:
+
+@itemize
+@item Free positioning of anything anywhere in painted areas on the slide, as
+well as in the main text block;
+@item Numerous attributes to control the layout and the presentation flow,
+from TeX's primitive dimensions to the visibility of steps;
+@item Feature inheritance from global to local settings, with intermediate
+types; Basic drawing facilities to produce symbols, e.g., for list items or
+buttons;
+@item Colours, transparency, shades, and pictures;
+@item Navigation with links, pop-up menus, and customizable bookmarks;
+@item Easy switch between presentation and handout; and PDF transitions.
+@end itemize
+
+Besides the traditional documentation, the distribution includes visual
+documentation and six demo presentations ranging from geometric abstraction to
+classic style to silly video game.")
+    (license license:lppl)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 3f6c9b70d5a03745e27cb123bbe6ac896a6ba74a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:55:14 +0200
Subject: gnu: Add texlive-letterspacing.

* gnu/packages/tex.scm (texlive-letterspacing): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5fce27bd23..be0bc10c60 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3029,6 +3029,26 @@ documentation and six demo presentations ranging from geometric abstraction to
 classic style to silly video game.")
     (license license:lppl)))
 
+(define-public texlive-letterspacing
+  (package
+    (name "texlive-letterspacing")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/generic/letterspacing/")
+             (base32
+              "0ry7rri76dgbrkzr6na2kkh7bn0jpwkhh9b5qw0cl5xwyp81rddg")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/letterspacing")
+    (synopsis "Letter spacing")
+    (description
+     "This package helps spacing out the letters of text; the command is
+@code{\\letterspace<\\hbox modifier>@{<text>@}}: the text is placed in an
+@code{\\hbox} of the specified size, and space is inserted between each glyph
+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-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 3342f91035e1a5f49a8f54970b8c1e7822359f75 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:55:24 +0200
Subject: gnu: Add texlive-localloc.

* gnu/packages/tex.scm (texlive-localloc): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index be0bc10c60..6f88c45b3f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3049,6 +3049,27 @@ 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-localloc
+  (package
+    (name "texlive-localloc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/localloc/"
+                   "source/generic/localloc/"
+                   "tex/generic/localloc/")
+             (base32
+              "0vcfdxh800ksr4wrrvykdm27qvlhqkylbik4j93pr59g13h9g90f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/localloc")
+    (synopsis "Macros for localizing TeX register allocations")
+    (description
+     "This package approaches the problem of the shortage of registers, by
+providing a mechanism for local allocation.  The package works with Plain TeX
+and LaTeX.")
+    (license license:knuth)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 0f26b7d2f015c586d648b7bbf2bcf70e2686e268 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:55:34 +0200
Subject: gnu: Add texlive-metatex.

* gnu/packages/tex.scm (texlive-metatex): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6f88c45b3f..20b9a20581 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3070,6 +3070,28 @@ providing a mechanism for local allocation.  The package works with Plain TeX
 and LaTeX.")
     (license license:knuth)))
 
+(define-public texlive-metatex
+  (package
+    (name "texlive-metatex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/metatex/" "tex/plain/metatex/")
+             (base32
+              "0pdgx59ckp9qdfidl37y8mv3dyvza9lxmhgbqk69ckywm3kbb2n9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/metatex")
+    (synopsis "Incorporate Metafont pictures in TeX source")
+    (description
+     "METATeX is a set of plain TeX and Metafont macros that you can use to
+define both the text and the figures in a single source file.  Because METATeX
+sets up two way communication, from TeX to Metafont and back from Metafont to
+TeX, drawing dimensions can be controlled by TeX and labels can be located by
+Metafont.  Only standard features of TeX and Metafont are used, but two runs
+of TeX and one of Metafont are needed.")
+    (license license:gpl3+)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From a3d88bfc75541e27532aa40d9b8ea227cb76b573 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:56:08 +0200
Subject: gnu: Add texlive-midnight.

* gnu/packages/tex.scm (texlive-midnight): New variable.
---
 gnu/packages/tex.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 20b9a20581..df0a8d65c4 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3092,6 +3092,36 @@ Metafont.  Only standard features of TeX and Metafont are used, but two runs
 of TeX and one of Metafont are needed.")
     (license license:gpl3+)))
 
+(define-public texlive-midnight
+  (package
+    (name "texlive-midnight")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/midnight/"
+                   "tex/generic/midnight/")
+             (base32
+              "024g170k8cfcddch2c0qvq1als0ncp9v2zqv77yzay5jqx4iv1d7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/midnight")
+    (synopsis "Set of useful macro tools")
+    (description
+     "This package provides macro tools:
+@itemize
+@item @code{quire}: making booklets, etc.;
+@item @code{gloss}: vertically align words in consecutive sentences;
+@item @code{loop}: a looping construct;
+@item @code{dolines}: meta'-macros to separate arguments by newlines;
+@item @code{labels}: address labels and bulk mail letters;
+@item @code{styledef}: selectively input part of a file;
+@item @code{border}: borders around boxes.
+@end itemize")
+    ;; All files share the same license, which is Knuth's with additional
+    ;; requirements about documentation and references to the original source
+    ;; when modified.
+    (license (license:fsf-free "file://tex/generic/midnight/border.tex"))))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 7cba4caa1e53777775afcb88328109a90443e442 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:56:26 +0200
Subject: gnu: Add texlive-modulus.

* gnu/packages/tex.scm (texlive-modulus): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index df0a8d65c4..9c6eff6e8a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3122,6 +3122,29 @@ of TeX and one of Metafont are needed.")
     ;; when modified.
     (license (license:fsf-free "file://tex/generic/midnight/border.tex"))))
 
+(define-public texlive-modulus
+  (package
+    (name "texlive-modulus")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/modulus/"
+                   "source/generic/modulus/"
+                   "tex/generic/modulus/")
+             (base32
+              "07sa8bnbgclfz4p3sb00cl1b3i51nvhhlmb4p6hcyaca1n1xsn8d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/modulus")
+    (synopsis "Non-destructive modulus and integer quotient operator for TeX")
+    (description
+     "The package provides an easy way to take the remainder of a division
+operation without destroying the values of the counters containing the
+dividend and divisor.  It also provides a way to take the integer quotient of
+a division operation without destroying the values of the counters containing
+the dividend and divisor.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 71a23462d9526bf383494016bc868b82ea88129f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:56:34 +0200
Subject: gnu: Add texlive-namedef.

* gnu/packages/tex.scm (texlive-namedef): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9c6eff6e8a..94696d721d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3145,6 +3145,29 @@ a division operation without destroying the values of the counters containing
 the dividend and divisor.")
     (license license:lppl1.3c)))
 
+(define-public texlive-namedef
+  (package
+    (name "texlive-namedef")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/namedef/"
+                   "source/generic/namedef/"
+                   "tex/generic/namedef/")
+             (base32
+              "1rc97c8zn1gb1cfqf70q5iphnbkgay4xmw1a2h55kc9wj4ql2j5d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-l3kernel))
+    (home-page "https://ctan.org/pkg/namedef")
+    (synopsis "TeX definitions with named parameters")
+    (description
+     "This package provides a prefix @code{\\named} to be used in TeX
+definitions so that parameters can be identified by their name rather than by
+number, giving parameters a semantic rather than syntactic meaning, making it
+easy to understand long definitions.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From a6c7cfc6e6ee0ba1ae90463865e5ea1c21ed8fac Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:57:21 +0200
Subject: gnu: Add texlive-navigator.

* gnu/packages/tex.scm (texlive-navigator): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 94696d721d..3b683d653a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3168,6 +3168,29 @@ number, giving parameters a semantic rather than syntactic meaning, making it
 easy to understand long definitions.")
     (license license:lppl1.3c)))
 
+(define-public texlive-navigator
+  (package
+    (name "texlive-navigator")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/navigator/"
+                   "tex/generic/navigator/")
+             (base32
+              "17rs718rvp9f6dakdl99abgq5rcflsw6kyxjknhjya019l2y23m3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/navigator")
+    (synopsis "PDF features across formats and engines")
+    (description
+     "Navigator implements PDF features for all formats (with some limitations
+in ConTeXt) with pdfTeX, LuaTeX and XeTeX.  Its features include: customizable
+outlines (i.e.  bookmarks); anchors; links and actions (e.g., JavaScript or
+user-defined PDF actions); file embedding (not in ConTeXt); document
+information and PDF viewer's display (not in ConTeXt); and commands to create
+and use raw PDF objects.")
+    (license license:lppl)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 6370d2f9c515a3b225a1ae0e2c36882c4eb98e93 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:57:39 +0200
Subject: gnu: Add texlive-newsletr.

* gnu/packages/tex.scm (texlive-newsletr): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3b683d653a..dc20f29841 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3191,6 +3191,25 @@ information and PDF viewer's display (not in ConTeXt); and commands to create
 and use raw PDF objects.")
     (license license:lppl)))
 
+(define-public texlive-newsletr
+  (package
+    (name "texlive-newsletr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/newsletr/" "tex/plain/newsletr/")
+             (base32
+              "0c7ggyx1jnw05vn589awxxbpfqkwf7kq4qn9pm61ycb6p9n3nn0h")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/newsletr")
+    (synopsis "Macros for making newsletters with Plain TeX")
+    (description
+     "This package provides macros for making newsletters with Plain TeX.")
+    ;; License is almost Knuth's, but requires marking modifications
+    ;; explicitly instead of simply renaming the file.
+    (license (license:fsf-free "file://doc/plain/newsletr/read.me"))))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 17619e9b484c22df49922a54351eadaa53ac3c95 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:58:50 +0200
Subject: gnu: Add texlive-ofs.

* gnu/packages/tex.scm (texlive-ofs): New variable.
---
 gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dc20f29841..291b15e865 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3210,6 +3210,33 @@ 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-ofs
+  (package
+    (name "texlive-ofs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/ofs/" "tex/generic/ofs/")
+             (base32
+              "0dcsa9xlcdvwd4qd6n6yli8arcy3s6896svgk5nbmgplan2nz1cw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ofs")
+    (synopsis "Macros for managing large font collections")
+    (description
+     "OFS (Olsak's Font System) is a set of Plain TeX and LaTeX macros for
+managing large font collections.  Its main features include:
+
+@itemize
+@item mapping from long names of fonts to the metric file name.  The user can
+specify only exact long names in documents;
+@item support for many font encodings;
+@item printing of catalogues of fonts and test samples of font families; the
+interactive macro @code{\\showfonts} shows all font families you have
+installed via OFS.
+@end itemize")
+    (license license:knuth)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From c486dde4cac640eace0bc799bae92e8a05565df9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:59:22 +0200
Subject: gnu: Add texlive-olsak-misc.

* gnu/packages/tex.scm (texlive-olsak-misc): New variable.
---
 gnu/packages/tex.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 291b15e865..d465382e56 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3237,6 +3237,44 @@ installed via OFS.
 @end itemize")
     (license license:knuth)))
 
+(define-public texlive-olsak-misc
+  (package
+    (name "texlive-olsak-misc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/olsak-misc/"
+                   "tex/generic/olsak-misc/")
+             (base32
+              "0kl83yvj299w7v69a20i5yi91h46n0k080rg6z1jjwdxm0g893a0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/olsak-misc")
+    (synopsis "Collection of plain TeX macros written by Petr Olsak")
+    (description
+     "This is a collection of various single-file plain TeX macros written
+by Petr Olsak:
+
+@itemize
+@item @file{booklet.tex}: re-orders PDF pages and collects them for booklet
+printing;
+@item @file{cnv.tex}: conversion of texts;
+@item @file{cnv-pu.tex}: example of usage of @file{cnv.tex} --- pdf outlines
+in Unicode;
+@item @file{cnv-word.tex}: example of usage of @file{cnv.tex} --- word to word
+conversion;
+@item @file{eparam.tex}: full expansion during parameter scanning;
+@item @file{fun-coffee.tex}: generates splotches in the document;
+@item @file{openclose.tex}: repairs balanced text between @code{\\Open} and
+@code{\\Close} pair;
+@item @file{qrcode.tex}: QR code generated at TeX level;
+@item @file{scanbase.tex}: parser of text-style MySQL outputs;
+@item @file{scancsv.tex}: parser of CSV format;
+@item @file{seplist.tex}: macros with alternative separators of a parameter;
+@item @file{xmlparser.tex}: parser of XML language.
+@end itemize")
+    (license license:public-domain)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 92f40b4e5badc18950fad4f4f66fe4f4b0e35aed Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:59:31 +0200
Subject: gnu: Add texlive-outerhbox.

* gnu/packages/tex.scm (texlive-outerhbox): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d465382e56..f3325e24c9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3275,6 +3275,25 @@ conversion;
 @end itemize")
     (license license:public-domain)))
 
+(define-public texlive-outerhbox
+  (package
+    (name "texlive-outerhbox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/generic/outerhbox/")
+             (base32
+              "1867xhxlbskiysifmwlr10lay8khragzi36fm552cwc4vjz2ybcz")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/outerhbox")
+    (synopsis "Collect horizontal material for contributing to a paragraph")
+    (description
+     "The package provides the @code{\\outerhbox} command, which is similar to
+@code{\\hbox}, except that material is set in outer horizontal mode.  This
+prevents TeX from optimising away maths penalties and the like, that are
+needed when the material is @code{\\unhbox}'ed.")
+    (license license:gpl3+)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From c4a4d71f577d0514f5eee8e8b649d0823203a4e2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:59:40 +0200
Subject: gnu: Add texlive-path.

* gnu/packages/tex.scm (texlive-path): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f3325e24c9..26bcf35111 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3294,6 +3294,26 @@ prevents TeX from optimising away maths penalties and the like, that are
 needed when the material is @code{\\unhbox}'ed.")
     (license license:gpl3+)))
 
+(define-public texlive-path
+  (package
+    (name "texlive-path")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/path/" "tex/generic/path/")
+             (base32
+              "09m1f9si97hrfqsyj0mzbi9djgk0w4vq13yd3v0af9v3240h1ps2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/path")
+    (synopsis "Typeset paths, making them breakable")
+    (description
+     "This package defines a macro @code{\\path|...|}, similar to the LaTeX
+@code{\\verb|...|}, that sets the text in typewriter font and allows
+hyphen-less breaks at punctuation characters.  The set of characters to be
+regarded as punctuation may be changed from the package's default.")
+    (license license:knuth)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 224f18ace1f88eaf1cff6614271626a8bcd34ed6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 10:59:49 +0200
Subject: gnu: Add texlive-pdf-trans.

* gnu/packages/tex.scm (texlive-pdf-trans): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 26bcf35111..bb73435a91 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3314,6 +3314,25 @@ hyphen-less breaks at punctuation characters.  The set of characters to be
 regarded as punctuation may be changed from the package's default.")
     (license license:knuth)))
 
+(define-public texlive-pdf-trans
+  (package
+    (name "texlive-pdf-trans")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pdf-trans/"
+                   "tex/generic/pdf-trans/")
+             (base32
+              "1n7l0p1950lk3n5jm3si0qqhb8b7mm7jh33fm97l2r7d3qn9jac8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pdf-trans")
+    (synopsis "Macros for various transformations of TeX boxes")
+    (description
+     "@code{pdf-trans} is a set of macros offering various transformations of
+TeX boxes (based on plain and pdfeTeX primitives).")
+    (license license:public-domain)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 80d1e1e63cafec91fe17e91862e277464cee6fc9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:00:02 +0200
Subject: gnu: Add texlive-pdfmsym.

* gnu/packages/tex.scm (texlive-pdfmsym): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bb73435a91..0ea8f0c8a8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3333,6 +3333,29 @@ regarded as punctuation may be changed from the package's default.")
 TeX boxes (based on plain and pdfeTeX primitives).")
     (license license:public-domain)))
 
+(define-public texlive-pdfmsym
+  (package
+    (name "texlive-pdfmsym")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pdfmsym/"
+                   "tex/generic/pdfmsym/")
+             (base32
+              "128lhj72s2ddzbl7w3pl6cw84qqmx322rw1jb4m2db8whj8d2fbz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pdfmsym")
+    (synopsis "PDF Math Symbols --- various drawn mathematical symbols")
+    (description
+     "This package defines a handful of mathematical symbols many of which are
+implemented via PDF's builtin drawing utility.  It is intended for use with
+pdfTeX and LuaTeX and is supported by XeTeX to a lesser extent.  Among the
+symbols it defines are some variants of commonly used ones, as well as more
+obscure symbols which cannot be as easily found in other TeX or LaTeX
+packages.")
+    (license license:expat)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 1b860eda04cef713925cd8dd0584aafa53d6a185 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:00:11 +0200
Subject: gnu: Add texlive-pitex.

* gnu/packages/tex.scm (texlive-pitex): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 0ea8f0c8a8..de416fa554 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3356,6 +3356,25 @@ obscure symbols which cannot be as easily found in other TeX or LaTeX
 packages.")
     (license license:expat)))
 
+(define-public texlive-pitex
+  (package
+    (name "texlive-pitex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/pitex/" "tex/plain/pitex/")
+             (base32
+              "1rqawfqmh9sh7rfpfrhbmysmn1rlzmbs26nla8fj0xr45vx60219")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pitex")
+    (synopsis "Documentation macros")
+    (description
+     "The bundle provides macros that the author uses when writing
+documentation (for example, that of the @code{texapi} and @code{yax}
+packages).")
+    (license license:lppl)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 0742cf2499efc03a20c7b57baeeb9c18e2af08a2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:00:20 +0200
Subject: gnu: Add texlive-placeins-plain.

* gnu/packages/tex.scm (texlive-placeins-plain): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index de416fa554..a83d214695 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3375,6 +3375,25 @@ documentation (for example, that of the @code{texapi} and @code{yax}
 packages).")
     (license license:lppl)))
 
+(define-public texlive-placeins-plain
+  (package
+    (name "texlive-placeins-plain")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/plain/placeins-plain/")
+             (base32
+              "1lhc72zdm2cjynx6lf6kafmf00nw17z3mnfhagh41h76cnm338g9")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/placeins-plain")
+    (synopsis "Insertions that keep their place")
+    (description
+     "This TeX file provides various mechanisms (for plain TeX and close
+relatives) to let insertions (footnotes, topins, pageins, etc.) float within
+their appropriate section, but to prevent them from intruding into the
+following section, even when sections do not normally begin a new page.")
+    (license license:public-domain)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 3587bfb46ec3c08fe4b2d0fd2ea240d872bea239 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:00:32 +0200
Subject: gnu: Add texlive-plainpkg.

* gnu/packages/tex.scm (texlive-plainpkg): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a83d214695..2ac12a66ea 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3394,6 +3394,29 @@ their appropriate section, but to prevent them from intruding into the
 following section, even when sections do not normally begin a new page.")
     (license license:public-domain)))
 
+(define-public texlive-plainpkg
+  (package
+    (name "texlive-plainpkg")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/plainpkg/"
+                   "source/generic/plainpkg/"
+                   "tex/generic/plainpkg/")
+             (base32
+              "10p796lms7rzwqgjf60nqm8x79hiz1cwiq1j8acjg1a6lnvadbq0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/plainpkg")
+    (synopsis "Minimal method for making generic packages")
+    (description
+     "The package provides a minimal method for making generic (i.e.,
+TeX-format-independent) packaged, combining maybeload functionality, fallback
+definitions for LaTeX @code{\\ProvidesPackage} and @code{\\RequirePackage}
+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-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 0b7ba05ac7302730fcc952ce1aeb1eddf0ccbf03 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:01:01 +0200
Subject: gnu: Add texlive-plipsum.

* gnu/packages/tex.scm (texlive-plipsum): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2ac12a66ea..3066a7d1f9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3417,6 +3417,26 @@ 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-plipsum
+  (package
+    (name "texlive-plipsum")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/plipsum/" "tex/plain/plipsum/")
+             (base32
+              "0q8qnv212q9mgc00w9akdvpky1gbmirqrkdmi9v1wbf7c0ws2qda")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/plipsum")
+    (synopsis "@emph{Lorem ipsum} for Plain TeX developers")
+    (description
+     "The package provides a paragraph generator designed for use in Plain TeX
+documents.  The paragraphs generated contain many f-groups (@samp{ff},
+@samp{fl} etc.) so the text can act as a test of the ligatures of the font in
+use.")
+    (license license:lppl)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 7151746bb58ab42d7b55f36bfa7611f1ad703197 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:01:21 +0200
Subject: gnu: Add texlive-plnfss.

* gnu/packages/tex.scm (texlive-plnfss): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3066a7d1f9..ba05d076ff 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3437,6 +3437,29 @@ documents.  The paragraphs generated contain many f-groups (@samp{ff},
 use.")
     (license license:lppl)))
 
+(define-public texlive-plnfss
+  (package
+    (name "texlive-plnfss")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/plnfss/" "tex/plain/plnfss/")
+             (base32
+              "1cgnp8y9m0ziq1pfvjx83vi0r0k5xpckk0kiijy0g80wd3s4zbsd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/plnfss")
+    (synopsis "Font selection for Plain TeX")
+    (description
+     "Plnfss is a set of macros to provide easy font access (somewhat similar
+to NFSS but with some limitations) with Plain TeX.  Plnfss can automatically
+make use of PSNFSS @code{fd} files, i.e., when an Adobe Type 1 is used the
+relevant @code{fd} file will be loaded automatically.  For @code{cmr}-like
+fonts (@code{ec}, @code{vnr}, @code{csr} or @code{plr} fonts), a special
+format called @code{pfd} (plain @code{fd}) is required and must be loaded
+manually.")
+    (license license:lppl)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 02da2c8c8a36ca65f3afcefa2894cf10206deaa2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:01:40 +0200
Subject: gnu: Add texlive-plstmary.

* gnu/packages/tex.scm (texlive-plstmary): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ba05d076ff..03cda07c15 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3460,6 +3460,24 @@ format called @code{pfd} (plain @code{fd}) is required and must be loaded
 manually.")
     (license license:lppl)))
 
+(define-public texlive-plstmary
+  (package
+    (name "texlive-plstmary")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/plstmary/" "tex/plain/plstmary/")
+             (base32
+              "03adq5fkl620z0hpbdpqcsm1qjxlr43ip1bhi5xv2izxpw952x0z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/plstmary")
+    (synopsis "St Mary's Road font support for plain TeX")
+    (description
+     "The package provides commands to produce all the symbols of the St
+Mary's Road fonts, in a Plain TeX environment.")
+    (license license:public-domain)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 78e7c677f471b734260e28d733eb8805e1fb2c1c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:02:25 +0200
Subject: gnu: Add texlive-present.

* gnu/packages/tex.scm (texlive-present): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 03cda07c15..ab8a95f065 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3478,6 +3478,29 @@ manually.")
 Mary's Road fonts, in a Plain TeX environment.")
     (license license:public-domain)))
 
+(define-public texlive-present
+  (package
+    (name "texlive-present")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/present/" "tex/plain/present/")
+             (base32
+              "1dc7h14z7xw232mgqjayl1a4ab5pj9bz2d9wgmznh4bjylgw4lwp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/present")
+    (synopsis "Presentations with Plain TeX")
+    (description
+     "The package offers a collection of simple macros for preparing
+presentations in Plain TeX.  Slide colour and text colour may be set, links
+between parts of the presentation, to other files, and to web addresses may be
+inserted.  Images may be included easily, and code is available to provide
+transition effects between slides or frames.  The structure of the macros is
+not overly complex, so that users should find it easy to adapt the macros to
+their specific needs.")
+    (license license:lppl)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 3853487f9133c1ef36e04d331e337af88dead2a6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:02:39 +0200
Subject: gnu: Add texlive-pwebmac.

* gnu/packages/tex.scm (texlive-pwebmac): New variable.
---
 gnu/packages/tex.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ab8a95f065..cb35848b9b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3501,6 +3501,42 @@ not overly complex, so that users should find it easy to adapt the macros to
 their specific needs.")
     (license license:lppl)))
 
+(define-public texlive-pwebmac
+  (package
+    (name "texlive-pwebmac")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/pwebmac/" "tex/plain/pwebmac/")
+             (base32
+              "18mc66iv5jszxwnrwvlx2c040521mray480my9pdcl7aw5w2z4a2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pwebmac")
+    (synopsis "Consolidated WEB macros for DVI and PDF output")
+    (description
+     "The original WEB system by Donald Knuth has the macros webmac.tex that
+produce DVI output only; for historic reasons, it will never be
+modified (apart from catastrophic errors).  Han The Thanh has modified these
+macros in his @file{pdfwebmac.tex} for PDF output (only) with pdfTeX.
+Jonathan Kew's XeTeX has similar macros @file{xewebmac.tex} by Khaled Hosny
+that modify @file{webmac.tex} for PDF output; these macros can only be used
+with a specific TeX engine each.  The present @code{pwebmac} package
+integrates these three WEB macro files similar to @file{cwebmac.tex} in Silvio
+Levy's and Don Knuth's CWEB system, so @file{pwebmac.tex} can be used with
+Plain TeX, pdfTeX, and XeTeX alike.
+
+Its initial application is the production of PDF and HINT files for all major
+WEB programs for TeX and friends.  For this purpose, the shell script
+@command{makeall} was whipped together; it provides various command line
+options and works around several quirks in the WEB sources.
+
+WEB programmers who want to use @file{pwebmac.tex} instead of the default
+@file{webmac.tex} in their programs have to change the first line in the TeX
+file created by @code{weave}.  From there, all depends on the TeX engine you
+use.")
+    (license license:public-domain)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 27e5af75e9108751231efa65ad45d36d66d31de9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:03:12 +0200
Subject: gnu: Add texlive-random.

* gnu/packages/tex.scm (texlive-random): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cb35848b9b..ed36aa915f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3537,6 +3537,25 @@ file created by @code{weave}.  From there, all depends on the TeX engine you
 use.")
     (license license:public-domain)))
 
+(define-public texlive-random
+  (package
+    (name "texlive-random")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/random/" "tex/generic/random/")
+             (base32
+              "04z7s4pm620bfjwgl46g4bqxzm2ab70ai8pj1x4p0qg8n50xaylf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/random")
+    (synopsis "Generate pseudo-random numbers in TeX")
+    (description
+     "This package generates pseudo-random integers.  Macros are to provide
+random integers in a given range, or random dimensions, which can be used to
+provide random real numbers.")
+    (license license:public-domain)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From f7a4e9ca7c9ce6f7df0f30462ad5c20746a597f7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:03:34 +0200
Subject: gnu: Add texlive-randomlist.

* gnu/packages/tex.scm (texlive-randomlist): New variable.
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ed36aa915f..a03fafbffb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3556,6 +3556,29 @@ random integers in a given range, or random dimensions, which can be used to
 provide random real numbers.")
     (license license:public-domain)))
 
+(define-public texlive-randomlist
+  (package
+    (name "texlive-randomlist")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/randomlist/"
+                   "source/generic/randomlist/"
+                   "tex/generic/randomlist/")
+             (base32
+              "04pbbxxnynyc3l94560vvnad3rx7l2ic6p078az15v5qic7rki84")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/randomlist")
+    (synopsis
+     "Deal with database, loop, and random in order to build personalized
+exercises")
+    (description
+     "The main aim of this package is to work on lists, especially with random
+operations.  The hidden aim is to build a personnal collection of exercises
+with different data for each pupil.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 6c56c94be3de94c8c5861cc42bf37c4df37718b3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:03:44 +0200
Subject: gnu: Add texlive-resumemac.

* gnu/packages/tex.scm (texlive-resumemac): New variable.
---
 gnu/packages/tex.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a03fafbffb..98eca36ba2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3579,6 +3579,23 @@ operations.  The hidden aim is to build a personnal collection of exercises
 with different data for each pupil.")
     (license license:lppl1.3+)))
 
+(define-public texlive-resumemac
+  (package
+    (name "texlive-resumemac")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/resumemac/"
+                   "tex/plain/resumemac/")
+             (base32
+              "0q6ngs2inzk2nk9f06s9w9q2qhx71dw7nflmrc9hzx9w0pinw830")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/resumemac")
+    (synopsis "Plain TeX macros for resumes")
+    (description "This package provides a set of macros for resumes.")
+    (license license:public-domain)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 0de349ad79dfa6ed094af275278b5d9e2d8a2453 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:03:56 +0200
Subject: gnu: Add texlive-ruler.

* gnu/packages/tex.scm (texlive-ruler): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 98eca36ba2..16dea437b7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3596,6 +3596,25 @@ with different data for each pupil.")
     (description "This package provides a set of macros for resumes.")
     (license license:public-domain)))
 
+(define-public texlive-ruler
+  (package
+    (name "texlive-ruler")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/generic/ruler/")
+             (base32
+              "1ikap9dkdw9lzpda0f2krizqbfkyjxvyddils7clim9nhg77aq71")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ruler")
+    (synopsis "Typographic ruler for TeX")
+    (description
+     "The file processes to produce (real) rulers; the author suggests
+printing them on transparent plastic and trimming for use as a real ruler.
+The rule widths are 0.05mm, which can be challenging for (old) laser
+printers.")
+    (license license:gpl3+)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From d0d2bc3b0a6750923dd2a4897c5bdca036f66bab Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:04:09 +0200
Subject: gnu: Add texlive-schemata.

* gnu/packages/tex.scm (texlive-schemata): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 16dea437b7..6a89bedc77 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3615,6 +3615,28 @@ The rule widths are 0.05mm, which can be challenging for (old) laser
 printers.")
     (license license:gpl3+)))
 
+(define-public texlive-schemata
+  (package
+    (name "texlive-schemata")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/schemata/"
+                   "source/generic/schemata/"
+                   "tex/generic/schemata/")
+             (base32
+              "1196653ankylbcsiv1cnrrazz2qplcs27llpv947h4m94vx4sl19")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/schemata")
+    (synopsis "Print topical diagrams")
+    (description
+     "The package facilitates the creation of topical schemata, i.e.,
+outlines that use braces (or facsimiles thereof) to illustrate the breakdown
+of concepts and categories in Scholastic thought from late medieval and early
+modern periods.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 1e13f4a5ba3c63e2278364627332e56a423d09c3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:04:27 +0200
Subject: gnu: Add texlive-shade.

* gnu/packages/tex.scm (texlive-shade): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6a89bedc77..6a964cd23c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3637,6 +3637,27 @@ of concepts and categories in Scholastic thought from late medieval and early
 modern periods.")
     (license license:lppl1.3+)))
 
+(define-public texlive-shade
+  (package
+    (name "texlive-shade")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/shade/"
+                   "fonts/source/public/shade/"
+                   "tex/generic/shade/")
+             (base32
+              "1b7m11d374cx5rcrvgd2jld1wzixvky3mqdg54hnsg9x14p2dxpg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/shade")
+    (synopsis "Shade pieces of text")
+    (description
+     "The package provides a shaded backdrop to a box of text.  It uses
+a Metafont font (provided) which generates to appropriate shading dependent on
+the resolution used in the Metafont printer parameters.")
+    (license license:lppl1.0+)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From b74161bc547c944dddf84c8d282051d3f485d6c0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:04:37 +0200
Subject: gnu: Add texlive-simplekv.

* gnu/packages/tex.scm (texlive-simplekv): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6a964cd23c..17f63c6aae 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3658,6 +3658,24 @@ a Metafont font (provided) which generates to appropriate shading dependent on
 the resolution used in the Metafont printer parameters.")
     (license license:lppl1.0+)))
 
+(define-public texlive-simplekv
+  (package
+    (name "texlive-simplekv")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/simplekv/"
+                   "tex/generic/simplekv/")
+             (base32
+              "0ghyb0m7hyqa10pwcza9z2wyb7010n3snpj1rdp79z8jfq5c288m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/simplekv")
+    (synopsis "Simple key/value system for TeX and LaTeX")
+    (description
+     "The package provides a simple key/value system for TeX and LaTeX.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 0eaab89b0f013d06f1ca158618dfa554c4d8f71e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:06:02 +0200
Subject: gnu: Add texlive-swrule.

* gnu/packages/tex.scm (texlive-swrule): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 17f63c6aae..234a8da643 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3676,6 +3676,28 @@ the resolution used in the Metafont printer parameters.")
      "The package provides a simple key/value system for TeX and LaTeX.")
     (license license:lppl1.3c)))
 
+(define-public texlive-swrule
+  (package
+    (name "texlive-swrule")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/generic/swrule/")
+             (base32
+              "075mshpyi9gxbi3n0hbh3ygidzw1daxy697lhc7cc99i39y8scpi")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/swrule")
+    (synopsis "Lines thicker in the middle than at the ends")
+    (description
+     "This package defines commands that create rules split into
+a (specified) number of pieces, whose size varies to produce the
+effect of a rule that swells in its centre.")
+    ;; Library mentions: "The style package is copyrighted but may be used and
+    ;; extended in any way, as long as a pointer to the original author is
+    ;; maintained.  The author is not liable for any problem that may or may
+    ;; not result from using this package. Use at your own risk".
+    (license (license:fsf-free "file://tex/generic/swrule/swrule.sty"))))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 04968722d76b758c079ffba35a9d333900fe2183 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:06:12 +0200
Subject: gnu: Add texlive-systeme.

* gnu/packages/tex.scm (texlive-systeme): New variable.
---
 gnu/packages/tex.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 234a8da643..61700ff363 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3698,6 +3698,27 @@ effect of a rule that swells in its centre.")
     ;; not result from using this package. Use at your own risk".
     (license (license:fsf-free "file://tex/generic/swrule/swrule.sty"))))
 
+(define-public texlive-systeme
+  (package
+    (name "texlive-systeme")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/systeme/"
+                   "tex/generic/systeme/")
+             (base32
+              "02n8bchq9crv21cqvji4kkrjsyp34wny5i047jyp1j2yz8i99m5y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/systeme")
+    (synopsis "Format systems of equations")
+    (description
+     "The package allows you to enter systems of equations or inequalities in
+an intuitive way, and produces typeset output where the terms and signs are
+aligned vertically.  The package works with plain TeX or LaTeX, but e-TeX is
+required.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From fde679ba8392582e7994f954d00f12c8a3d4d1a2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:06:32 +0200
Subject: gnu: Add texlive-tabto-generic.

* gnu/packages/tex.scm (texlive-tabto-generic): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 61700ff363..66f5747290 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3719,6 +3719,24 @@ aligned vertically.  The package works with plain TeX or LaTeX, but e-TeX is
 required.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tabto-generic
+  (package
+    (name "texlive-tabto-generic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/generic/tabto-generic/")
+             (base32
+              "0i65jflbnhqpqf1w7pkagicic1s39gcl319z7g9zr1g80f9532dv")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tabto-generic")
+    (synopsis "Tab to a measured position in the line")
+    (description
+     "@code{\\tabto@{<length>@}} moves the typesetting position to
+@code{<length>} from the left margin of the paragraph.  If the typesetting
+position is already further along, @code{\\tabto} starts a new line.")
+    (license license:public-domain)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From fd1ac474b79cb458f51b461d896d0afd0b3f7860 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:06:40 +0200
Subject: gnu: Add texlive-termmenu.

* gnu/packages/tex.scm (texlive-termmenu): New variable.
---
 gnu/packages/tex.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 66f5747290..284fd6c9d0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3737,6 +3737,28 @@ required.")
 position is already further along, @code{\\tabto} starts a new line.")
     (license license:public-domain)))
 
+(define-public texlive-termmenu
+  (package
+    (name "texlive-termmenu")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/termmenu/"
+                   "source/generic/termmenu/"
+                   "tex/generic/termmenu/")
+             (base32
+              "0d1pdz5izr43ndji7g28932dnnf8d6nxvh8bay2yk7647yh47aj4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/termmenu")
+    (synopsis "Support for terminal-based menus")
+    (description
+     "When writing programs, it's often required to present the user with
+a list of options or actions.  The user is then expected to select one of
+these options for the program to process.  @code{termmenu} provides this
+mechanism for TeX.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
-- 
cgit 1.4.1


From 8a13eabf7db8be62d9b16608140427104320442b Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:06:54 +0200
Subject: gnu: Add texlive-tex-ps.

* gnu/packages/tex.scm (texlive-tex-ps): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 284fd6c9d0..e305fc74ee 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3796,6 +3796,26 @@ Knuth's TeX book; this source is there to read, as an example of writing TeX ;
 it should not be processed without Knuth's direct permission.")
     (license license:knuth)))
 
+(define-public texlive-tex-ps
+  (package
+    (name "texlive-tex-ps")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/tex-ps/cmyk-hax/"
+                   "doc/generic/tex-ps/poligraf/"
+                   "dvips/tex-ps/" "tex/generic/tex-ps/")
+             (base32
+              "09f70q2bhmq7bn98f2g2pq62wnfhj24bzkbv652sjrw5rafp0311")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tex-ps")
+    (synopsis "TeX to PostScript generic macros and add-ons")
+    (description
+     "This package provides TeX to PostScript generic macros and add-ons:
+transformations of EPS files, prepress preparation, color separation, mirror,
+etc.")
+    (license license:public-domain)))
 
 (define-public texlive-lcdftypetools
   (package
-- 
cgit 1.4.1


From 91c9b83fde3ad4f1abbf0cc7cc6223bf75274edb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:07:05 +0200
Subject: gnu: Add texlive-texdate.

* gnu/packages/tex.scm (texlive-texdate): New variable.
---
 gnu/packages/tex.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e305fc74ee..945276dec7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3817,6 +3817,31 @@ transformations of EPS files, prepress preparation, color separation, mirror,
 etc.")
     (license license:public-domain)))
 
+(define-public texlive-texdate
+  (package
+    (name "texlive-texdate")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/texdate/"
+                   "source/generic/texdate/"
+                   "tex/generic/texdate/")
+             (base32
+              "0knssay50rm8pbksph20hhfbpwwby3a9pswvxyq63imn5qppz2dp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/texdate")
+    (synopsis "Date printing, formatting, and manipulation in TeX")
+    (description
+     "TeX and LaTeX provide few facilities for dates by default, though many
+packages have filled this gap.  This package fills it, as well, with a pure
+TeX-primitive implementation.  It can print dates, advance them by numbers of
+days, weeks, or months, determine the weekday automatically, and print them
+in (mostly) arbitrary format.  It can also print calendars (monthly and
+yearly) automatically, and can be easily localized for non-English
+languages.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-lcdftypetools
   (package
     (name "texlive-lcdftypetools")
-- 
cgit 1.4.1


From 073bd5b2aa43c74fe7518241736f36824eb07529 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:07:16 +0200
Subject: gnu: Add texlive-texdimens.

* gnu/packages/tex.scm (texlive-texdimens): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 945276dec7..dd6469c0c9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3842,6 +3842,25 @@ yearly) automatically, and can be easily localized for non-English
 languages.")
     (license license:lppl1.3c)))
 
+(define-public texlive-texdimens
+  (package
+    (name "texlive-texdimens")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/texdimens/"
+                   "tex/generic/texdimens/")
+             (base32
+              "0l6raryqpxydis9kq6sd4pvz7d2rzrrsnx7k9n3d3921pp208lv4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/texdimens")
+    (synopsis "Conversion of TeX dimensions to decimals")
+    (description
+     "This package provides utilities and documentation related to TeX
+dimensional units, usable both with Plain TeX and with LaTeX.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-lcdftypetools
   (package
     (name "texlive-lcdftypetools")
-- 
cgit 1.4.1


From a147928371f5619d8f26c42edabbd9398c40275a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:07:25 +0200
Subject: gnu: Add texlive-timetable.

* gnu/packages/tex.scm (texlive-timetable): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dd6469c0c9..a9892db6ea 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3861,6 +3861,24 @@ languages.")
 dimensional units, usable both with Plain TeX and with LaTeX.")
     (license license:lppl1.3c)))
 
+(define-public texlive-timetable
+  (package
+    (name "texlive-timetable")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/plain/timetable/")
+             (base32
+              "1lnl8gi2rrzcy688qb8b1ff9yivwxdqmbcfx2ph49aymkxfym97b")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/timetable")
+    (synopsis "Generate timetables")
+    (description
+     "This package provides a highly-configurable package, with nice output
+and simple input.  The macros use a radix sort mechanism so that the order of
+input is not critical.")
+    (license license:lppl)))
+
 (define-public texlive-lcdftypetools
   (package
     (name "texlive-lcdftypetools")
-- 
cgit 1.4.1


From aecc760ae0181b8186f4290362b4076ffb9016ab Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:07:44 +0200
Subject: gnu: Add texlive-transparent-io.

* gnu/packages/tex.scm (texlive-transparent-io): New variable.
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a9892db6ea..9334325142 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3879,6 +3879,34 @@ and simple input.  The macros use a radix sort mechanism so that the order of
 input is not critical.")
     (license license:lppl)))
 
+(define-public texlive-transparent-io
+  (package
+    (name "texlive-transparent-io")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/transparent-io/")
+             (base32
+              "04zfmk25qw2cnja1zqhafabsy26zalxiawf6pm5zqx4x1jl47i6j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/transparent-io")
+    (synopsis
+     "Show for approval the filenames used in @code{\\input}, @code{\\openin},
+or @code{\\openout}")
+    (description
+     "This package provides macros to make the file I/O in plain TeX more
+transparent.  That is, every @code{\\input}, @code{\\openin}, and
+@code{\\openout} operation by TeX is presented to the user who must check
+carefully if the file name of the source is acceptable.  The user must
+sometimes enter additional text and has to specify the file name that the TeX
+operation should use.  The macros require a complex installation procedure;
+the package contains Sed and Bash scripts.  Every installation is different
+from any other as password-protected macro names and private messages have to
+be chosen by the installer.  Therefore, the files in the package cannot be
+used directly.  For details see the manual.")
+    (license license:gpl3)))
+
 (define-public texlive-lcdftypetools
   (package
     (name "texlive-lcdftypetools")
-- 
cgit 1.4.1


From 7f18571a5bb2ca1a8de0aa20309ac0c858df9209 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:08:14 +0200
Subject: gnu: Add texlive-treetex.

* gnu/packages/tex.scm (texlive-treetex): New variable.
---
 gnu/packages/tex.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9334325142..5b6b216862 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3907,6 +3907,23 @@ be chosen by the installer.  Therefore, the files in the package cannot be
 used directly.  For details see the manual.")
     (license license:gpl3)))
 
+(define-public texlive-treetex
+  (package
+    (name "texlive-treetex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/treetex/" "tex/plain/treetex/")
+             (base32
+              "0cv7kwa865i473l8ffsyq5n7kw6pihclf87asbpsc1rx2h4v6mhs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/treetex-plain")
+    (synopsis "Draw trees")
+    (description
+     "This package provides macros to draw trees, within TeX or LaTeX.")
+    (license license:public-domain)))
+
 (define-public texlive-lcdftypetools
   (package
     (name "texlive-lcdftypetools")
-- 
cgit 1.4.1


From b3d4aea7fa850fb375bd54797ee028fa705450ee Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:08:45 +0200
Subject: gnu: Add texlive-trigonometry.

* gnu/packages/tex.scm (texlive-trigonometry): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5b6b216862..ffcf909973 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3924,6 +3924,26 @@ used directly.  For details see the manual.")
      "This package provides macros to draw trees, within TeX or LaTeX.")
     (license license:public-domain)))
 
+(define-public texlive-trigonometry
+  (package
+    (name "texlive-trigonometry")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/trigonometry/"
+                   "tex/generic/trigonometry/")
+             (base32
+              "165n813kj0znfrnqkqv0gja3nyr2lznnhbmsay6l8a5nj59h7cxl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/trigonometry")
+    (synopsis "Demonstration code for cos and sin in TeX macros")
+    (description
+     "This package provides a document that both provides macros that are
+usable elsewhere, and demonstrates the macros.  The code uses the classical
+analytical expansion of sin and cos.")
+    (license license:knuth)))
+
 (define-public texlive-lcdftypetools
   (package
     (name "texlive-lcdftypetools")
-- 
cgit 1.4.1


From f59fe570ef2c18e302523402b98afd0588a8bbd0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:08:54 +0200
Subject: gnu: Add texlive-upca.

* gnu/packages/tex.scm (texlive-upca): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ffcf909973..2f6750b7a7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3944,6 +3944,24 @@ usable elsewhere, and demonstrates the macros.  The code uses the classical
 analytical expansion of sin and cos.")
     (license license:knuth)))
 
+(define-public texlive-upca
+  (package
+    (name "texlive-upca")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/upca/" "tex/generic/upca/")
+             (base32
+              "0miqn29dln9c2nlvcivsq7ciyb70ffk16v7dmzfn976xnvfsjbiw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/upca")
+    (synopsis "Print UPC-A barcodes")
+    (description
+     "The package defines a single macro @code{\\upca}, to print UPC-A
+barcodes.")
+    (license license:lppl)))
+
 (define-public texlive-lcdftypetools
   (package
     (name "texlive-lcdftypetools")
-- 
cgit 1.4.1


From 31cb95d2035f9b5a80531dea67b0aae9f9c13d29 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:09:06 +0200
Subject: gnu: Add texlive-varisize.

* gnu/packages/tex.scm (texlive-varisize): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2f6750b7a7..ce16ea49ac 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3962,6 +3962,25 @@ analytical expansion of sin and cos.")
 barcodes.")
     (license license:lppl)))
 
+(define-public texlive-varisize
+  (package
+    (name "texlive-varisize")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/varisize/" "tex/plain/varisize/")
+             (base32
+              "0nd89zhwyg5z9wcy1lixg3hzcfw83lsilkjhhy9kir0fi9whdbv4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/varisize")
+    (synopsis "Change font size in Plain TeX")
+    (description
+     "This package provides a series of files, each of which defines
+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-lcdftypetools
   (package
     (name "texlive-lcdftypetools")
-- 
cgit 1.4.1


From 00229c844c9044b8eb9f2368841116e4932f5fc5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:09:14 +0200
Subject: gnu: Add texlive-xii.

* gnu/packages/tex.scm (texlive-xii): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ce16ea49ac..2717f7b2c2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3981,6 +3981,24 @@ 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-xii
+  (package
+    (name "texlive-xii")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/xii/")
+             (base32
+              "19jhzv5hqzj59wrfcr1dsj6z56qfckax694idgf8arri5lnbkdd8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xii")
+    (synopsis "Christmas silliness (English)")
+    (description
+     "This is the plain TeX file @file{xii.tex}.  Call @samp{pdftex xii.tex}
+to produce a (perhaps) surprising typeset document.")
+    (license license:lppl)))
+
 (define-public texlive-lcdftypetools
   (package
     (name "texlive-lcdftypetools")
-- 
cgit 1.4.1


From 7e68ab576bfbc1596582ba20425c4b12dd7a0cb9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:09:21 +0200
Subject: gnu: Add texlive-xii-lat.

* gnu/packages/tex.scm (texlive-xii-lat): New variable.
---
 gnu/packages/tex.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2717f7b2c2..10c9a19571 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3999,6 +3999,24 @@ one of the other files, so that there's always a way back.")
 to produce a (perhaps) surprising typeset document.")
     (license license:lppl)))
 
+(define-public texlive-xii-lat
+  (package
+    (name "texlive-xii-lat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/xii-lat/")
+             (base32
+              "1nn54xv71kcmn9jbkcslz6a64cvjcay9x96rrxnakdj9qcqd27r5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xii-lat")
+    (synopsis "Christmas silliness (Latin)")
+    (description
+     "This is the plain TeX file @file{xii-lat.tex}.  Call @samp{pdftex
+xii-lat.tex} to produce a (perhaps) surprising typeset document.")
+    (license license:lppl)))
+
 (define-public texlive-lcdftypetools
   (package
     (name "texlive-lcdftypetools")
-- 
cgit 1.4.1


From d70b22da94973513e618d763d7016295271609c2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:09:30 +0200
Subject: gnu: Add texlive-xintsession.

* gnu/packages/tex.scm (texlive-xintsession): New variable.
---
 gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 10c9a19571..dacc94fba6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4017,6 +4017,32 @@ to produce a (perhaps) surprising typeset document.")
 xii-lat.tex} to produce a (perhaps) surprising typeset document.")
     (license license:lppl)))
 
+(define-public texlive-xintsession
+  (package
+    (name "texlive-xintsession")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/xintsession/"
+                   "tex/plain/xintsession/")
+             (base32
+              "0rd2jmq62ariq73qwch1hz1jmzdw6sn48ngh64pgm6qkqbpddxkv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xintsession")
+    (synopsis
+     "Interactive computing sessions (fractions, floating points, polynomials)")
+    (description
+     "This package provides support for interactive computing sessions with
+e-TeX (or pdfTeX) executed on the command line.  Once @code{xintsession} is
+loaded, e-TeX becomes an interactive computing software capable of executing
+arbitrary precision calculations, or exact calculations with arbitrarily big
+fractions.  It can also manipulate polynomials as algebraic entities.
+Numerical variables and functions can be defined during the session, and each
+evaluation result is stored in automatically labeled variables.  A file is
+automatically created storing inputs and outputs.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-lcdftypetools
   (package
     (name "texlive-lcdftypetools")
-- 
cgit 1.4.1


From 2efd2a8d114fd50cc0cb98184c01b8c6b397ca24 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:09:38 +0200
Subject: gnu: Add texlive-xlop.

* gnu/packages/tex.scm (texlive-xlop): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index dacc94fba6..969c36d41e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4043,6 +4043,26 @@ evaluation result is stored in automatically labeled variables.  A file is
 automatically created storing inputs and outputs.")
     (license license:lppl1.3c)))
 
+(define-public texlive-xlop
+  (package
+    (name "texlive-xlop")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/xlop/" "tex/generic/xlop/")
+             (base32
+              "1yqks7jvb5ikg2xx038rsxbkhagms1zqjmipnv49rqliavcq03gj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xlop")
+    (synopsis "Calculate and display arithmetic operations")
+    (description
+     "Xlop (eXtra Large OPeration) will typeset arithmetic problems either
+in-line or as in school (using French school conventions).  Many other
+features allow to deal with numbers (tests, display, some high level
+operations, etc.)")
+    (license license:lppl1.3+)))
+
 (define-public texlive-lcdftypetools
   (package
     (name "texlive-lcdftypetools")
-- 
cgit 1.4.1


From 92ca4ac79b1741af6c084f3e79715c45b7cce08a Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:09:53 +0200
Subject: gnu: Add texlive-zztex.

* gnu/packages/tex.scm (texlive-zztex): New variable.
---
 gnu/packages/tex.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 969c36d41e..1c6226fdd1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4063,6 +4063,25 @@ features allow to deal with numbers (tests, display, some high level
 operations, etc.)")
     (license license:lppl1.3+)))
 
+(define-public texlive-zztex
+  (package
+    (name "texlive-zztex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/zztex/" "tex/plain/zztex/")
+             (base32
+              "07vx3m2g4vl2v1nxxy5dih67jg406y2i94sgkrmplm54b0pp42g3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/zztex")
+    (synopsis "TeX macro package for producing books, journals, and manuals")
+    (description
+     "The ZzTeX macro package is a full-featured TeX macro package specially
+designed for producing books, journals, and manuals.  ZzTeX runs under Plain
+TeX.")
+    (license license:expat)))
+
 (define-public texlive-lcdftypetools
   (package
     (name "texlive-lcdftypetools")
-- 
cgit 1.4.1


From 203bb57413599622f17c4d8bc628af423f227776 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:12:42 +0200
Subject: gnu: Add texlive-poormanlog.

* gnu/packages/tex.scm (texlive-poormanlog): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1c6226fdd1..36d4514c90 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3478,6 +3478,26 @@ manually.")
 Mary's Road fonts, in a Plain TeX environment.")
     (license license:public-domain)))
 
+(define-public texlive-poormanlog
+  (package
+    (name "texlive-poormanlog")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/poormanlog/"
+                   "tex/generic/poormanlog/")
+             (base32
+              "1wbpjxjn3bvi4bmcq62ydafc8a72wq2vhzfx2gcn20sn3x4qc0hg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/poormanlog")
+    (synopsis "Logarithms and powers with (almost) 9 digits")
+    (description
+     "This small package (usable with Plain e-TeX, LaTeX, or others) with no
+dependencies provides two fast expandable macros computing logarithms in base
+10 and fractional powers of 10.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-present
   (package
     (name "texlive-present")
-- 
cgit 1.4.1


From f019ce027c280a7eb286c66a956ed8a5330a831c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 20 Jul 2023 11:10:33 +0200
Subject: gnu: Add texlive-collection-plaingeneric.

* gnu/packages/tex.scm (texlive-collection-plaingeneric): New variable.
---
 gnu/packages/tex.scm | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 36d4514c90..a13582d02d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -24839,6 +24839,131 @@ diagrams.  It includes TikZ, @code{pict}, etc.  However, MetaPost and
 PStricks are separate.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-collection-plaingeneric
+  (package
+    (name "texlive-collection-plaingeneric")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-abbr
+           texlive-abstyles
+           texlive-apnum
+           texlive-autoaligne
+           texlive-barr
+           texlive-bitelist
+           texlive-borceux
+           texlive-c-pascal
+           texlive-catcodes
+           texlive-chronosys
+           texlive-collection-basic
+           texlive-colorsep
+           texlive-compare
+           texlive-crossrefenum
+           texlive-cweb-old
+           texlive-dinat
+           texlive-dirtree
+           texlive-docbytex
+           texlive-dowith
+           texlive-eijkhout
+           texlive-encxvlna
+           texlive-epigram
+           texlive-epsf
+           texlive-epsf-dvipdfmx
+           texlive-expex-acro
+           texlive-expkv-bundle
+           texlive-fenixpar
+           texlive-figflow
+           texlive-fixpdfmag
+           texlive-fltpoint
+           texlive-fntproof
+           texlive-font-change
+           texlive-fontch
+           texlive-fontname
+           texlive-gates
+           texlive-getoptk
+           texlive-gfnotation
+           texlive-gobble
+           texlive-graphics-pln
+           texlive-gtl
+           texlive-hlist
+           texlive-hyplain
+           texlive-inputnormalization
+           texlive-insbox
+           texlive-js-misc
+           texlive-kastrup
+           texlive-lambda-lists
+           texlive-langcode
+           texlive-lecturer
+           texlive-letterspacing
+           texlive-librarian
+           texlive-listofitems
+           texlive-localloc
+           texlive-mathdots
+           texlive-metatex
+           texlive-midnight
+           texlive-mkpattern
+           texlive-modulus
+           texlive-multido
+           texlive-namedef
+           texlive-navigator
+           texlive-newsletr
+           texlive-nth
+           texlive-ofs
+           texlive-olsak-misc
+           texlive-outerhbox
+           texlive-path
+           texlive-pdf-trans
+           texlive-pdfmsym
+           texlive-pitex
+           texlive-placeins-plain
+           texlive-plainpkg
+           texlive-plipsum
+           texlive-plnfss
+           texlive-plstmary
+           texlive-poormanlog
+           texlive-present
+           texlive-pwebmac
+           texlive-random
+           texlive-randomlist
+           texlive-resumemac
+           texlive-ruler
+           texlive-schemata
+           texlive-shade
+           texlive-simplekv
+           texlive-soul
+           texlive-swrule
+           texlive-systeme
+           texlive-tabto-generic
+           texlive-termmenu
+           texlive-tex-ps
+           texlive-tex4ht
+           texlive-texapi
+           texlive-texdate
+           texlive-texdimens
+           texlive-texinfo
+           texlive-timetable
+           texlive-tracklang
+           texlive-transparent-io
+           texlive-treetex
+           texlive-trigonometry
+           texlive-ulem
+           texlive-upca
+           texlive-varisize
+           texlive-xii
+           texlive-xii-lat
+           texlive-xintsession
+           texlive-xlop
+           texlive-yax
+           texlive-zztex))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Plain (La)TeX packages")
+    (description
+     "This consist of add-on packages and macros that work with plain TeX,
+often LaTeX, and occasionally other formats.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-collection-xetex
   (package
     (name "texlive-collection-xetex")
-- 
cgit 1.4.1


From a74604c0f095b665de5ca0bd4b54b620484c2f97 Mon Sep 17 00:00:00 2001
From: kiasoc5 <kiasoc5@disroot.org>
Date: Fri, 14 Jul 2023 22:18:35 -0400
Subject: gnu: Add wdisplays.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/wm.scm (wdisplays): New variable.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/wm.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index b9909de219..5c614be735 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2022,6 +2022,29 @@ automatically enabled and disabled on hotplug.  Kanshi can be used with
 Wayland compositors supporting the wlr-output-management protocol.")
     (license license:expat))) ; MIT license
 
+(define-public wdisplays
+  (package
+    (name "wdisplays")
+    (version "1.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/artizirk/wdisplays.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "06ydcmfdics2qqjb14p767xs8khd86nancdd9z8j11h2gpvwznvn"))))
+    (build-system meson-build-system)
+    (inputs (list gtk+ libepoxy wayland))
+    (native-inputs (list `(,glib "bin") pkg-config))
+    (home-page "https://github.com/artizirk/wdisplays")
+    (synopsis "Configuring displays in Wayland compositors")
+    (description "@command{wdisplays} is a graphical application for
+configuring displays in Wayland compositors that implements the
+wlr-output-management-unstable-v1 protocol.")
+    (license license:gpl3+)))
+
 (define-public stumpwm
   (package
     (name "stumpwm")
-- 
cgit 1.4.1


From 21b718f4d6c3ded8ef50d12f6e9ae6474f74620f Mon Sep 17 00:00:00 2001
From: Simon South <simon@simonsouth.net>
Date: Fri, 14 Jul 2023 15:45:35 -0400
Subject: gnu: python-pyusb: Update to 1.2.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/libusb.scm (python-pyusb): Update to 1.2.1.
[native-inputs]: Add python-setuptools-scm.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/libusb.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index d0837c8a91..13090d30ab 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -274,14 +274,14 @@ wrapper for accessing libusb-1.0.")
 (define-public python-pyusb
   (package
     (name "python-pyusb")
-    (version "1.0.2")
+    (version "1.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pyusb" version))
        (sha256
         (base32
-         "0qkk2jn270jwwl1x26hmdhb14m9kkbrzzwzizdjcl1a29b6756sf"))))
+         "1fg7knfzybzija2b01pzrzhzsj989scl12sb2ra4f503l8279k54"))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f                      ; no tests
@@ -302,6 +302,9 @@ wrapper for accessing libusb-1.0.")
                                    "^libusb-.*\\.so\\..*"))
                  "\"")))
              #t)))))
+
+    (native-inputs
+     (list python-setuptools-scm))
     (inputs
      (list libusb))
     (home-page "https://pyusb.github.io/pyusb/")
-- 
cgit 1.4.1


From 48f0c3a3b52074a3af637e695f609c5e528663e6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: zabbix-cli: Update to 2.3.1.

* gnu/packages/monitoring.scm (zabbix-cli): Update to 2.3.1.
---
 gnu/packages/monitoring.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index ab673490fe..3238f11fb4 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -289,7 +289,7 @@ solution (server-side)")))
 (define-public zabbix-cli
   (package
     (name "zabbix-cli")
-    (version "2.3.0")
+    (version "2.3.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -298,7 +298,7 @@ solution (server-side)")))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1p8xkq3mxg476srwrgqax76vjzji0rjx32njmgnpa409vaqrbj5p"))))
+                "1al3gwbnh0wbal5gq2apq27kh61q8dz355k4w8kx073b4y4nz1wb"))))
     (build-system pyproject-build-system)
     (arguments
      (list #:phases
-- 
cgit 1.4.1


From 5ef7be9126eb7f0e108ec81762cedc5a68a0e251 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: hydra: Update to 9.5.

* gnu/packages/password-utils.scm (hydra): Update to 9.5.
---
 gnu/packages/password-utils.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 06e00a69d4..9126f22e24 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -1443,7 +1443,7 @@ group them into chains.")
 (define-public hydra
   (package
     (name "hydra")
-    (version "9.4")
+    (version "9.5")
     (home-page "https://github.com/vanhauser-thc/thc-hydra")
     (source (origin
               (method git-fetch)
@@ -1453,7 +1453,7 @@ group them into chains.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0dbx7yaqf4nl63pi8wmr19cxnp5v4w7fsd369krdy8hlc8k0qjgr"))))
+                "0pg4alaznygngdzn4k6p540g059w7mpiakchsp0526f1b9s33lw1"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ;no test suite
-- 
cgit 1.4.1


From 2bb7844a1469edc8f0b2a0771c09fc3188f3a0a8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: yoshimi: Update to 2.3.0.2.

* gnu/packages/music.scm (yoshimi): Update to 2.3.0.2.
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index faa81ec631..7b7075035f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3217,7 +3217,7 @@ capabilities, custom envelopes, effects, etc.")
 (define-public yoshimi
   (package
     (name "yoshimi")
-    (version "2.3.0")
+    (version "2.3.0.2")
     (source
      (origin
        (method url-fetch)
@@ -3225,7 +3225,7 @@ capabilities, custom envelopes, effects, etc.")
                            (version-major+minor version)
                            "/yoshimi-" version ".tar.bz2"))
        (sha256
-        (base32 "0rkwz545bipanyl8kcp6rgdqppiad7s0j409a4n8dd97maislsa0"))))
+        (base32 "1024ykyaq0s6zzyksrmgdz8ix0a4yranlsv5rbq72dbrkh3h8wqm"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
cgit 1.4.1


From bb6285afdf25bc768b412e39611ea20a1f891df9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: otpclient: Update to 3.1.9.

* gnu/packages/password-utils.scm (otpclient): Update to 3.1.9.
---
 gnu/packages/password-utils.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 9126f22e24..27077329ed 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -310,7 +310,7 @@ Counterpane's Passwordsafe.")
 (define-public otpclient
   (package
     (name "otpclient")
-    (version "3.1.7")
+    (version "3.1.9")
     (source
      (origin
        (method git-fetch)
@@ -319,7 +319,7 @@ Counterpane's Passwordsafe.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0cwn4spddhg099hcqcvzgbws3xpmnd29g1vayk36118x94wmajaf"))))
+        (base32 "0n5h76zwchdp3nbiczcfcg9sr0hbfs1npwq26x78rz8jf6md898m"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
cgit 1.4.1


From 5abd22180efcbaab040eac458a872ac15cd4caa3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: passwdqc: Update to 2.0.3.

* gnu/packages/password-utils.scm (passwdqc): Update to 2.0.3.
---
 gnu/packages/password-utils.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 27077329ed..a6daddbd7b 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -534,21 +534,21 @@ random passwords that pass the checks.")
 (define-public passwdqc
   (package
     (name "passwdqc")
-    (version "2.0.2")
+    (version "2.0.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.openwall.com/passwdqc/passwdqc"
                                   "-" version ".tar.gz"))
               (sha256
                (base32
-                "1aq40v5094bhnj86v4i2nmqkybmzzp20q7jb92jgc860cibm07zz"))))
+                "1x4c92b3i5wmxh2111lynyndalpkryvan4wybqchd7rn96yg9c2k"))))
     (build-system gnu-build-system)
     (arguments
      (list
-      #:tests? #f                       ;no tests provided
+      #:tests? #f                       ; no tests provided
       #:make-flags
       #~(list (string-append "CC=" #$(cc-for-target))
-              (string-append "DESTDIR=" #$output)
+              (string-append "DESTDIR=" #$output) ; no $prefix support
               "BINDIR=/bin"
               "DEVEL_LIBDIR=/lib"
               "SHARED_LIBDIR_REL=."
-- 
cgit 1.4.1


From 229e2a9e2c7e44f952c5bbe88acf9682a24a387e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:00 +0200
Subject: gnu: yapet: Update to 2.6.

* gnu/packages/password-utils.scm (yapet): Update to 2.6.
---
 gnu/packages/password-utils.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index a6daddbd7b..f19464fabf 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -435,14 +435,14 @@ convert SSH @code{ed25519} keys to @code{age} keys.")
 (define-public yapet
   (package
     (name "yapet")
-    (version "2.5")
+    (version "2.6")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://yapet.guengel.ch/downloads/yapet-"
                            version ".tar.xz"))
        (sha256
-        (base32 "0hpibsdry259cmvps35isr6jn9cd9fsk3r1h0ppjx9zxfrpqwldg"))))
+        (base32 "00k38n5vlxl73m11pp1v50fqf702lv86hzwgj0qca6qxqz4i3jjl"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit 1.4.1


From 25538200d112541de9dc85728052e280fd88497e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: yapet: Fix documentation directory.

* gnu/packages/password-utils.scm (yapet)[arguments]: Add missing stroke.
---
 gnu/packages/password-utils.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index f19464fabf..45e06c2fc0 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -447,7 +447,7 @@ convert SSH @code{ed25519} keys to @code{age} keys.")
     (arguments
      `(#:configure-flags
        (list (string-append "--docdir=" (assoc-ref %outputs "out")
-                            "/share/doc",name "-" ,version))))
+                            "/share/doc/" ,name "-" ,version))))
     (inputs
      (list argon2 ncurses openssl))
     (native-inputs
-- 
cgit 1.4.1


From 99c833046020b6d5d931d59fdcff7aa1da5d2cff Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: xpdf: Update to 4.04.

* gnu/packages/pdf.scm (xpdf): Update to 4.04.
---
 gnu/packages/pdf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 1ab19b4ee2..25f5fbc77f 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -489,13 +489,13 @@ reading and editing of existing PDF files.")
 (define-public xpdf
   (package
    (name "xpdf")
-   (version "4.03")
+   (version "4.04")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://dl.xpdfreader.com/xpdf-" version ".tar.gz"))
       (sha256
-       (base32 "0ip81c9vy0igjnasl9iv2lz214fb01vvvdzbvjmgwc63fi1jgr0g"))))
+       (base32 "1pmsark94xza8q31wvfvp8n7l3c4qfd4ggj09i98y13npzy27kk3"))))
    (build-system cmake-build-system)
    (inputs (list cups freetype libpng qtbase-5 zlib))
    (arguments
-- 
cgit 1.4.1


From 306c1ab71c890de8e68b69e48db0f9fe7e1bbfdd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: lensfun: Update to 0.3.4.

* gnu/packages/photo.scm (lensfun): Update to 0.3.4.
---
 gnu/packages/photo.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 309601092b..da12fa692c 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -416,7 +416,7 @@ scene to produce an image that looks much like a tone-mapped image.")
 (define-public lensfun
   (package
     (name "lensfun")
-    (version "0.3.3")
+    (version "0.3.4")
     (source
      (origin
        (method git-fetch)
@@ -425,7 +425,7 @@ scene to produce an image that looks much like a tone-mapped image.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1pv2y9yqzkw70p501425mf9cqv6yy8ppw5ilkpbd9bw9nss1js76"))))
+        (base32 "1lwf3cwldvh9qfmh3w7nqqildfmxx2i5f5bn0vr8y6qc5kh7a1s9"))))
     (build-system cmake-build-system)
     (arguments
      `(,@(if (any (cute string-prefix? <> (or (%current-system)
-- 
cgit 1.4.1


From 2cce0f10de472ed1ae0f8553a20ddfdfb88242f1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: python-pyzstd: Update to 0.15.9.

* gnu/packages/python-compression.scm (python-pyzstd): Update to 0.15.9.
---
 gnu/packages/python-compression.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index e1275158c0..6adb1cd757 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -562,18 +562,16 @@ provided.")
 (define-public python-pyzstd
   (package
     (name "python-pyzstd")
-    (version "0.15.3")
+    (version "0.15.9")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pyzstd" version))
        (sha256
-        (base32
-         "0wkli2i4my79l43b996bdga0fac8s8nfd1zjyzl46lwmsfsxlkmc"))))
+        (base32 "1iycfmif15v1jhv0gsza1hyd1hn3sz0vn9s1y79abzv8axndxzfb"))))
     (build-system python-build-system)
     (home-page "https://github.com/animalize/pyzstd")
     (synopsis "Zstandard bindings for Python")
-    (description "This package provides Python bindings to the
-Zstandard (zstd)
+    (description "This package provides Python bindings to the Zstandard (zstd)
 compression library.  The API is similar to Python's bz2/lzma/zlib module.")
     (license license:bsd-3)))
-- 
cgit 1.4.1


From e0fbbaf84c6fb13738a91b8db497d852121b8465 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:07 +0200
Subject: gnu: python-pyzstd: Unbundle and dynamically link Zstd.

* gnu/packages/python-compression.scm (python-pyzstd)[source]:
Delete bundled Zstd.
[arguments]: Add "--dynamic-link-zstd" configure flag, and honour it.
[inputs]: Add zstd.
---
 gnu/packages/python-compression.scm | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 6adb1cd757..000d42524d 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2023 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017, 2019, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017 Nikita <nikita@n0.is>
 ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
@@ -568,8 +568,32 @@ provided.")
        (method url-fetch)
        (uri (pypi-uri "pyzstd" version))
        (sha256
-        (base32 "1iycfmif15v1jhv0gsza1hyd1hn3sz0vn9s1y79abzv8axndxzfb"))))
+        (base32 "1iycfmif15v1jhv0gsza1hyd1hn3sz0vn9s1y79abzv8axndxzfb"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Remove a bundled copy of the zstd sources.
+           (delete-file-recursively "zstd")))))
     (build-system python-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list "--dynamic-link-zstd")
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'build
+            ;; The python-build-system's phase doesn't honour configure-flags.
+            (lambda* (#:key configure-flags #:allow-other-keys)
+              (apply invoke "python" "./setup.py" "build"
+                     configure-flags)))
+          (replace 'check
+            ;; The python-build-system's phase doesn't honour configure-flags.
+            (lambda* (#:key tests? test-target configure-flags
+                      #:allow-other-keys)
+              (when tests?
+                (apply invoke "python" "./setup.py" test-target
+                       configure-flags)))))))
+    (inputs (list `(,zstd "lib")))
     (home-page "https://github.com/animalize/pyzstd")
     (synopsis "Zstandard bindings for Python")
     (description "This package provides Python bindings to the Zstandard (zstd)
-- 
cgit 1.4.1


From c14c3105d3b7c48c29f8aada4b65b61d07fa0a82 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: qxlsx: Update to 1.4.6.

* gnu/packages/qt.scm (qxlsx): Update to 1.4.6.
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c3d7d02fe7..7a82d94d90 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1120,7 +1120,7 @@ from within Qt 5.")))
 (define-public qxlsx
   (package
     (name "qxlsx")
-    (version "1.4.5")
+    (version "1.4.6")
     (source
      (origin
        (method git-fetch)
@@ -1129,7 +1129,7 @@ from within Qt 5.")))
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1h95h96vz47cnfp62j7bx6ih725gbv005hm0cfqanfvqd5xd9qsg"))))
+        (base32 "0xbpajvwkv09h2fang200nsanv5gl1alsdd725gh9cgq4szng6gj"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
cgit 1.4.1


From b85366fa6b0ad8f0431e00b55ed18ace97d077dc Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: rpi-imager: Update to 1.7.5.

* gnu/packages/raspberry-pi.scm (rpi-imager): Update to 1.7.5.
---
 gnu/packages/raspberry-pi.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/raspberry-pi.scm b/gnu/packages/raspberry-pi.scm
index 334e014a39..a866a7e4f2 100644
--- a/gnu/packages/raspberry-pi.scm
+++ b/gnu/packages/raspberry-pi.scm
@@ -466,7 +466,7 @@ secondary LCD display connected to the Raspberry Pi board.")
 (define-public rpi-imager
   (package
     (name "rpi-imager")
-    (version "1.7.4")
+    (version "1.7.5")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -489,7 +489,7 @@ secondary LCD display connected to the Raspberry Pi board.")
                                                     (cut member <> keep)))))))
               (sha256
                (base32
-                "0m0dmga049banm79221ilmrqpb2bd6p0rcqrlzirsgb592ci64ba"))))
+                "0c5qsqh7drvf76hc75m2cp7bf44w7gwbmhgaqjrl5qwb6pbqf7y8"))))
     (build-system qt-build-system)
     (arguments
      (list
-- 
cgit 1.4.1


From 79c2af7394a8a541fa2ed0126272025b09aa05cd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: wsdd: Update to 0.7.1.

* gnu/packages/samba.scm (wsdd): Update to 0.7.1.
---
 gnu/packages/samba.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 9b0a2f0ec5..fb2adbf488 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -514,7 +514,7 @@ and IPV6 and the protocols layered above them, such as TCP and UDP.")
 (define-public wsdd
   (package
     (name "wsdd")
-    (version "0.7.0")
+    (version "0.7.1")
     (source
      (origin
        (method git-fetch)
@@ -522,14 +522,14 @@ and IPV6 and the protocols layered above them, such as TCP and UDP.")
                            (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "04an2w6hamnai668ag4vq8x0i09fsg2jrayb4a7ar0x6bn837k7m"))))
+        (base32 "16kk7x80jlargrvh643m23j277p0drs2yylqz54f9inf5ld5bxn5"))))
     (build-system copy-build-system)
     (inputs
      `(("python" ,python)))
     (arguments
      '(#:install-plan
        '(("src/wsdd.py" "bin/wsdd")
-         ("man/wsdd.1" "share/man/man1/"))))
+         ("man/wsdd.8" "share/man/man8/"))))
     (home-page "https://github.com/christgau/wsdd")
     (synopsis "Web Service Discovery host daemon")
     (description "This daemon allows (Samba) hosts to be found by Web
-- 
cgit 1.4.1


From 296e9dc1efe954059d0acccbb37d23bc8a42b8e5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: wsdd: Remove input labels.

* gnu/packages/samba.scm (wsdd)[inputs]:
Remove input labels.
---
 gnu/packages/samba.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index fb2adbf488..b8ba9ed818 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -524,12 +524,12 @@ and IPV6 and the protocols layered above them, such as TCP and UDP.")
        (sha256
         (base32 "16kk7x80jlargrvh643m23j277p0drs2yylqz54f9inf5ld5bxn5"))))
     (build-system copy-build-system)
-    (inputs
-     `(("python" ,python)))
     (arguments
      '(#:install-plan
        '(("src/wsdd.py" "bin/wsdd")
          ("man/wsdd.8" "share/man/man8/"))))
+    (inputs
+     (list python))
     (home-page "https://github.com/christgau/wsdd")
     (synopsis "Web Service Discovery host daemon")
     (description "This daemon allows (Samba) hosts to be found by Web
-- 
cgit 1.4.1


From d2baed46796d2ed808d4a00e96087f97e3861e28 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: wsdd: Fix cross-‘compilation’.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The copy-build-system appears unsuitable for scripts.

* gnu/packages/samba.scm (wsdd)[build-system]:
Switch to the GNU build system.
[arguments]: Replace #:install-plan with custom #:phases.
---
 gnu/packages/samba.scm | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index b8ba9ed818..c8b8d03521 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -523,11 +523,25 @@ and IPV6 and the protocols layered above them, such as TCP and UDP.")
        (file-name (git-file-name name version))
        (sha256
         (base32 "16kk7x80jlargrvh643m23j277p0drs2yylqz54f9inf5ld5bxn5"))))
-    (build-system copy-build-system)
+    (build-system gnu-build-system)
     (arguments
-     '(#:install-plan
-       '(("src/wsdd.py" "bin/wsdd")
-         ("man/wsdd.8" "share/man/man8/"))))
+     (list
+      #:tests? #f                       ; no test suite, only examples
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure)           ; no configure script
+          (delete 'build)               ; nothing to build
+          (replace 'install
+            (lambda _
+              (with-directory-excursion "src"
+                (rename-file "wsdd.py" "wsdd")
+                (install-file "wsdd" (string-append #$output "/bin")))
+              (for-each
+               (lambda (file)
+                 (install-file file
+                               (string-append #$output "/share/man/man"
+                                              (string-take-right file 1))))
+               (find-files "man" "\\.[0-9]$")))))))
     (inputs
      (list python))
     (home-page "https://github.com/christgau/wsdd")
-- 
cgit 1.4.1


From 7158276074dbdc0baac7ef8441ac26a085f45e5d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: sdl2-image: Update to 2.6.3.

* gnu/packages/sdl.scm (sdl2-image): Update to 2.6.3.
---
 gnu/packages/sdl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index a373f20d69..250f2be123 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -468,7 +468,7 @@ directory.")
 (define-public sdl2-image
   (package (inherit sdl-image)
     (name "sdl2-image")
-    (version "2.6.2")
+    (version "2.6.3")
     (source
      (origin
        (method url-fetch)
@@ -476,7 +476,7 @@ directory.")
         (string-append "https://www.libsdl.org/projects/SDL_image/release/"
                        "SDL2_image-" version ".tar.gz"))
        (sha256
-        (base32 "0xs7h5cp0sz082rn1bqjqbrgwjhwcskz9i6ikiisq2yhv2s5yda8"))))
+        (base32 "0b1i6r46pzvyp924pwn74d78gvkyif15ghbxkfp8yz0xpzjrn74k"))))
     (propagated-inputs
      (propagated-inputs-with-sdl2 sdl-image))
     (properties '((upstream-name . "SDL2_image")))))
-- 
cgit 1.4.1


From b6ef8b664a8610bf0b863e26725610c27cc9b7b4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: sdl2-mixer: Update to 2.6.3.

* gnu/packages/sdl.scm (sdl2-mixer): Update to 2.6.3.
[source]: Don't explicitly return #t from snippet.
---
 gnu/packages/sdl.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 250f2be123..b1db4d3bba 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -484,7 +484,7 @@ directory.")
 (define-public sdl2-mixer
   (package (inherit sdl-mixer)
     (name "sdl2-mixer")
-    (version "2.6.2")
+    (version "2.6.3")
     (source
      (origin
        (method url-fetch)
@@ -494,10 +494,9 @@ directory.")
        (modules '((guix build utils)))
        (snippet '(begin
                    ;; Remove bundled libraries.
-                   (delete-file-recursively "external")
-                   #t))
+                   (delete-file-recursively "external")))
        (sha256
-        (base32 "0wd35a9fcj1bv534k9cr4jdk076dpiqq0ayk6cybmv3d6q8aiplc"))))
+        (base32 "13zadq6lmzdglvp0arl7x5y7zihv31vr4pisgrhwwj468xmahsvs"))))
     (arguments
      (list #:tests? #f                     ;no tests
            #:configure-flags
-- 
cgit 1.4.1


From d133ad764518fc5962f21f3ce10586728af4ae93 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: sdl2-ttf: Update to 2.20.2.

* gnu/packages/sdl.scm (sdl2-ttf): Update to 2.20.2.
---
 gnu/packages/sdl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index b1db4d3bba..86ec1c033b 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -543,7 +543,7 @@ directory.")
 (define-public sdl2-ttf
   (package (inherit sdl-ttf)
     (name "sdl2-ttf")
-    (version "2.20.1")
+    (version "2.20.2")
     (source (origin
              (method url-fetch)
              (uri
@@ -555,7 +555,7 @@ directory.")
               '(delete-file-recursively "external"))
              (sha256
               (base32
-               "0mqcgpcvzp927xv1gs51f2wqly9k9f8nxfxi69lxlfncyd8svkbq"))))
+               "0lr0l8c19fg6anq2cp6xppv65ys3pyk9qjicg881nll76kcixiwx"))))
     (arguments
      (list #:configure-flags #~'("--enable-freetype-builtin=no"
                                  "--enable-harfbuzz-builtin=no")))
-- 
cgit 1.4.1


From f43794e573250cc37112de0ff5277eca0749a9ab Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: adanaxisgpl: Build from Git.

* gnu/packages/games.scm (adanaxisgpl-mush): Remove variable.
(adanaxisgpl)[source]: Fetch from Git.  In the snippet, create missing
directories, arrange to create missing files, and don't explicitly
return #t.
[arguments]: Add an 'unpack-inputs phase, replace the default
'bootstrap, and remove 'install-data.
[native-inputs]: Remove adanaxis-mush.  Add adanaxis-data,
adanaxis-mushruby, autoconf, automake, and perl.
---
 gnu/packages/games.scm | 157 ++++++++++++++++++++++++++++---------------------
 1 file changed, 90 insertions(+), 67 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index a772519520..d59236952a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -24,7 +24,7 @@
 ;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com>
 ;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@hyperbola.info>
 ;;; Copyright © 2017, 2018, 2020 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2023 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017, 2019 nee <nee-git@hidamari.blue>
 ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
@@ -303,79 +303,102 @@ platform-jumping, key-collecting, ancient pyramid exploring game, vaguely in
 the style of similar games for the Commodore+4.")
     (license license:gpl2+)))
 
-;; Data package for adanaxisgpl.
-(define adanaxis-mush
-  (let ((version "1.1.0"))
-    (origin
-      (method url-fetch)
-      (uri (string-append "http://www.mushware.com/files/adanaxis-mush-"
-                          version ".tar.gz"))
-      (sha256
-       (base32 "0mk9ibis5nkdcalcg1lkgnsdxxbw4g5w2i3icjzy667hqirsng03")))))
-
 (define-public adanaxisgpl
-  (package
-    (name "adanaxisgpl")
-    (version "1.2.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "http://www.mushware.com/files/adanaxisgpl-"
-                           version ".tar.gz"))
-       (sha256
-        (base32 "0jkn637jaabvlhd6hpvzb57vvjph94l6fbf7qxbjlw9zpr19dw1f"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           ;; Necessary for building with gcc >=4.7.
-           (substitute* "src/Mushcore/MushcoreSingleton.h"
-             (("SingletonPtrSet\\(new SingletonType\\);")
-              "MushcoreSingleton::SingletonPtrSet(new SingletonType);"))
-           ;; Avoid an "invalid conversion from const char* to char*" error.
-           (substitute* "src/Platform/X11/PlatformMiscUtils.cpp"
-             (("char \\*end, \\*result;")
-              (string-append "const char *end;"
-                             "\n"
-                             "char *result;")))
-           #t))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f ; no check target
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-data
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((data (assoc-ref inputs "adanaxis-mush"))
-                   (share (string-append (assoc-ref outputs "out")
-                                         "/share/" ,name "-" ,version)))
-               (mkdir-p share)
-               (invoke "tar" "xvf" data "-C" share)))))))
-    (native-inputs
-     `(("adanaxis-mush" ,adanaxis-mush))) ; game data
-    (inputs
-     `(("expat" ,expat)
-       ("freeglut" ,freeglut)
-       ("glu" ,glu)
-       ("libjpeg" ,libjpeg-turbo)
-       ("libogg" ,libogg)
-       ("libtiff" ,libtiff)
-       ("libvorbis" ,libvorbis)
-       ("libx11" ,libx11)
-       ("libxext" ,libxext)
-       ("pcre" ,pcre)
-       ("sdl" ,sdl)
-       ("sdl-mixer" ,sdl-mixer)))
-    (home-page "https://www.mushware.com")
-    (synopsis "Action game in four spatial dimensions")
-    (description
-     "Adanaxis is a fast-moving first person shooter set in deep space, where
+  (let* ((version "1.2.5")
+         (commit (string-append "ADANAXIS_"
+                                (string-join (string-split version #\.) "_")
+                                "_RELEASE_X11")))
+    (package
+      (name "adanaxisgpl")
+      (version version)
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/mushware/adanaxis")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1vbg17lzbm0xl9yy9qymd1vgpz6f7fbr2hffl2ap0nm4zg0mnafm"))
+         (modules '((guix build utils)))
+         (snippet
+          '(begin
+             ;; Necessary for building with gcc >=4.7.
+             (substitute* "src/Mushcore/MushcoreSingleton.h"
+               (("SingletonPtrSet\\(new SingletonType\\);")
+                "MushcoreSingleton::SingletonPtrSet(new SingletonType);"))
+             ;; Avoid an "invalid conversion from const char* to char*" error.
+             (substitute* "src/Platform/X11/PlatformMiscUtils.cpp"
+               (("char \\*end, \\*result;")
+                (string-append "const char *end;\n"
+                               "char *result;")))
+             ;; autogen.pl will throw misleading errors if these don't exist.
+             (for-each mkdir-p '("src/MushSecret" "data-adanaxis"))
+             ;; Create these missing files at the right later moment.
+             (substitute* "autogen.pl"
+               (("automake")
+                "automake --add-missing"))))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f                    ; no check target
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'unpack-inputs
+             (lambda* (#:key inputs #:allow-other-keys)
+               (copy-recursively (assoc-ref inputs "adanaxis-data")
+                                 "data-adanaxis")
+               (copy-recursively (assoc-ref inputs "adanaxis-mushruby")
+                                 "data-adanaxis/mushruby")))
+           (replace 'bootstrap
+             (lambda _
+               (invoke "perl" "autogen.pl" "adanaxis"
+                       "--type=gpl" "--dist=debian"))))))
+      (native-inputs
+       `(("adanaxis-data"
+          ,(origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/mushware/adanaxis-data")
+                   (commit commit)))
+             (file-name (git-file-name "adanaxis-data" version))
+             (sha256
+              (base32 "1xkn0ap5kfqd306ac072406ajihwwllaczc2v2hxiadlxd191dgx"))))
+         ("adanaxis-mushruby"
+          ,(origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/mushware/adanaxis-mushruby")
+                   (commit commit)))
+             (file-name (git-file-name "adanaxis-mushruby" version))
+             (sha256
+              (base32 "0pzcvchysjj37420rpvarky580gi5d6pfv93kwa91rg6m5r1zwks"))))
+         ("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("perl" ,perl)))
+      (inputs
+       `(("expat" ,expat)
+         ("freeglut" ,freeglut)
+         ("glu" ,glu)
+         ("libjpeg" ,libjpeg-turbo)
+         ("libogg" ,libogg)
+         ("libtiff" ,libtiff)
+         ("libvorbis" ,libvorbis)
+         ("libx11" ,libx11)
+         ("libxext" ,libxext)
+         ("pcre" ,pcre)
+         ("sdl" ,sdl)
+         ("sdl-mixer" ,sdl-mixer)))
+      (home-page "https://www.mushware.com")
+      (synopsis "Action game in four spatial dimensions")
+      (description
+       "Adanaxis is a fast-moving first person shooter set in deep space, where
 the fundamentals of space itself are changed.  By adding another dimension to
 space this game provides an environment with movement in four directions and
 six planes of rotation.  Initially the game explains the 4D control system via
 a graphical sequence, before moving on to 30 levels of gameplay with numerous
 enemy, ally, weapon and mission types.  Features include simulated 4D texturing,
 mouse and joystick control, and original music.")
-    (license license:gpl2)))
+      (license license:gpl2))))
 
 (define-public alex4
   (package
-- 
cgit 1.4.1


From a9e788c008b1661bc31f6fa17b35048861cfc9f7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: adanaxisgpl: Remove input labels.

* gnu/packages/games.scm (adanaxisgpl)[native-inputs, inputs]:
Remove input labels.
[arguments]: Adjust the 'unpack-inputs phase to search for files, not
labels.
---
 gnu/packages/games.scm | 74 +++++++++++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index d59236952a..be8f16af15 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -345,49 +345,49 @@ the style of similar games for the Commodore+4.")
          (modify-phases %standard-phases
            (add-after 'unpack 'unpack-inputs
              (lambda* (#:key inputs #:allow-other-keys)
-               (copy-recursively (assoc-ref inputs "adanaxis-data")
-                                 "data-adanaxis")
-               (copy-recursively (assoc-ref inputs "adanaxis-mushruby")
-                                 "data-adanaxis/mushruby")))
+               (copy-recursively
+                (dirname (search-input-directory inputs "pixelsrc"))
+                "data-adanaxis")
+               (copy-recursively
+                (dirname (search-input-file inputs "MushBase.rb"))
+                "data-adanaxis/mushruby")))
            (replace 'bootstrap
              (lambda _
                (invoke "perl" "autogen.pl" "adanaxis"
                        "--type=gpl" "--dist=debian"))))))
       (native-inputs
-       `(("adanaxis-data"
-          ,(origin
-             (method git-fetch)
-             (uri (git-reference
-                   (url "https://github.com/mushware/adanaxis-data")
-                   (commit commit)))
-             (file-name (git-file-name "adanaxis-data" version))
-             (sha256
-              (base32 "1xkn0ap5kfqd306ac072406ajihwwllaczc2v2hxiadlxd191dgx"))))
-         ("adanaxis-mushruby"
-          ,(origin
-             (method git-fetch)
-             (uri (git-reference
-                   (url "https://github.com/mushware/adanaxis-mushruby")
-                   (commit commit)))
-             (file-name (git-file-name "adanaxis-mushruby" version))
-             (sha256
-              (base32 "0pzcvchysjj37420rpvarky580gi5d6pfv93kwa91rg6m5r1zwks"))))
-         ("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("perl" ,perl)))
+       (list (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/mushware/adanaxis-data")
+                     (commit commit)))
+               (file-name (git-file-name "adanaxis-data" version))
+               (sha256
+                (base32 "1xkn0ap5kfqd306ac072406ajihwwllaczc2v2hxiadlxd191dgx")))
+             (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/mushware/adanaxis-mushruby")
+                     (commit commit)))
+               (file-name (git-file-name "adanaxis-mushruby" version))
+               (sha256
+                (base32 "0pzcvchysjj37420rpvarky580gi5d6pfv93kwa91rg6m5r1zwks")))
+             autoconf
+             automake
+             perl))
       (inputs
-       `(("expat" ,expat)
-         ("freeglut" ,freeglut)
-         ("glu" ,glu)
-         ("libjpeg" ,libjpeg-turbo)
-         ("libogg" ,libogg)
-         ("libtiff" ,libtiff)
-         ("libvorbis" ,libvorbis)
-         ("libx11" ,libx11)
-         ("libxext" ,libxext)
-         ("pcre" ,pcre)
-         ("sdl" ,sdl)
-         ("sdl-mixer" ,sdl-mixer)))
+       (list expat
+             freeglut
+             glu
+             libjpeg-turbo
+             libogg
+             libtiff
+             libvorbis
+             libx11
+             libxext
+             pcre
+             sdl
+             sdl-mixer))
       (home-page "https://www.mushware.com")
       (synopsis "Action game in four spatial dimensions")
       (description
-- 
cgit 1.4.1


From 6168ad89f2ccd3872414e8adfe5efcaf350726ca Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: adanaxisgpl: Install the .mush files (again).

This out of an abundance of caution more than anything.

* gnu/packages/games.scm (adanaxisgpl)[arguments]: Add an 'install-data phase.
[native-inputs]: Use a later commit for adanaxis-data.
---
 gnu/packages/games.scm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index be8f16af15..ec084553da 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -354,16 +354,28 @@ the style of similar games for the Commodore+4.")
            (replace 'bootstrap
              (lambda _
                (invoke "perl" "autogen.pl" "adanaxis"
-                       "--type=gpl" "--dist=debian"))))))
+                       "--type=gpl" "--dist=debian")))
+           (add-after 'install 'install-data
+             ;; XXX This was copied from the original (pre-Git) adanaxisgpl
+             ;; package.  While the game appears to play fine without it,
+             ;; I cannot prove that it's not missing *something*, so keep it.
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (let ((share (string-append (assoc-ref outputs "out")
+                                           "/share/" ,name "-" ,version)))
+                 (copy-recursively (search-input-directory inputs "mush")
+                                   (string-append share "/mush"))))))))
       (native-inputs
        (list (origin
                (method git-fetch)
                (uri (git-reference
                      (url "https://github.com/mushware/adanaxis-data")
-                     (commit commit)))
+                     ;; XXX There is a tag matching COMMIT, but it does not
+                     ;; contain the .mush files installed by 'install-data.
+                     ;; Use this later commit as long as we install them.
+                     (commit "6a5b5ad8ee82c10e67bc4c12b16404944fd5754d")))
                (file-name (git-file-name "adanaxis-data" version))
                (sha256
-                (base32 "1xkn0ap5kfqd306ac072406ajihwwllaczc2v2hxiadlxd191dgx")))
+                (base32 "15am9ziq1i53sz0r7sjh2z329b52fkzj6fz7ms1nqqzdfmp11r3d")))
              (origin
                (method git-fetch)
                (uri (git-reference
-- 
cgit 1.4.1


From a4038c4f783b05040cfdb262d9f4c0119b612371 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: fontforge@20190801: Fix build.

* gnu/packages/fontutils.scm (fontforge-20190801)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/fontutils.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 2cfaa45c37..230fdd1dde 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -1618,10 +1618,10 @@ generate bitmaps.")
     (arguments
      (substitute-keyword-arguments (package-arguments fontforge)
        ((#:configure-flags _)
-        ''())
+        #~'())
        ((#:phases phases)
-        `(modify-phases ,phases
-           (delete 'do-not-override-RPATH)))))
+        #~(modify-phases #$phases
+            (delete 'do-not-override-RPATH)))))
     (inputs
      (modify-inputs (package-inputs fontforge)
        (prepend libuninameslist)
-- 
cgit 1.4.1


From 0ab46ef3f9719f03d9b191a16e5aa91619e95451 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 20 Jul 2023 23:49:48 +0200
Subject: gnu: bootloaders: Avoid top-level circular references.

Fixes <https://issues.guix.gnu.org/64745>.

The regression was introduced in
ed5dc3a25d858a394bb7db937a51d866c3cdc6ed: at the top level,
bootloaders.scm and firmware.scm would depend on each other, leading to
unbound variables when loaded, depending on the order in which they got
loaded.

* gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package): Expect
'scp-firmware' to be a promise; force it in 'native-inputs'.
(u-boot-pine64-plus, u-boot-pine64-lts, u-boot-pinebook): Wrap the 3rd
argument to 'make-u-boot-sunxi64-package' into 'delay'.

Reported-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/bootloaders.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 30ef673f7d..38eb1d104f 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2019, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@@ -1051,22 +1051,22 @@ removed so that it fits within common partitioning schemes.")))
                   (setenv "BL31" (search-input-file inputs "bl31.bin"))))))))
       (native-inputs
        (modify-inputs (package-native-inputs base)
-         (append scp-firmware)))
+         (append (force scp-firmware))))
       (inputs
        (modify-inputs (package-inputs base)
          (append arm-trusted-firmware-sun50i-a64))))))
 
 (define-public u-boot-pine64-plus
   (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu"
-                               crust-pine64-plus))
+                               (delay crust-pine64-plus)))
 
 (define-public u-boot-pine64-lts
   (make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu"
-                               crust-pine64-plus))
+                               (delay crust-pine64-plus)))
 
 (define-public u-boot-pinebook
   (make-u-boot-sunxi64-package
-   "pinebook" "aarch64-linux-gnu" crust-pinebook
+   "pinebook" "aarch64-linux-gnu" (delay crust-pinebook)
    ;; Fix regression with LCD video output introduced in 2020.01
    ;; https://patchwork.ozlabs.org/patch/1225130/
    #:configs '("CONFIG_VIDEO_BPP32=y")))
-- 
cgit 1.4.1


From d2ce2e0feefe3f1d7d400d9d825c0a11f5e395b6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: xa: Update to 2.3.14.

* gnu/packages/assembly.scm (xa): Update to 2.3.14.
---
 gnu/packages/assembly.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index 104e61f63f..dbf52ed01b 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -395,14 +395,14 @@ Supported architectures are:
 (define-public xa
   (package
     (name "xa")
-    (version "2.3.12")
+    (version "2.3.14")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.floodgap.com/retrotech/xa"
                                   "/dists/xa-" version ".tar.gz"))
               (sha256
                (base32
-                "0107zdwc2rzlp26pyx7gns4lqmiyg68nmpgwrg36yrrd04v1bzgq"))))
+                "0bph41aglxl07rnggrir2dl1x97f52hm0bl51d0vklyqvfyvm6qv"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f   ; TODO: custom test harness, not sure how it works
-- 
cgit 1.4.1


From 800fef714c12768d54507870798e1f7850be2f0b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:00 +0200
Subject: gnu: xa: Use G-expressions.

* gnu/packages/assembly.scm (xa)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/assembly.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index dbf52ed01b..9cbdb53328 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -405,11 +405,13 @@ Supported architectures are:
                 "0bph41aglxl07rnggrir2dl1x97f52hm0bl51d0vklyqvfyvm6qv"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f   ; TODO: custom test harness, not sure how it works
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure))            ; no "configure" script
-       #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")))))
+     (list
+      #:tests? #f           ; TODO: custom test harness, not sure how it works
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure))          ; no "configure" script
+      #:make-flags
+      #~(list (string-append "DESTDIR=" #$output)))) ; no $prefix support
     (native-inputs (list perl))
     (home-page "https://www.floodgap.com/retrotech/xa/")
     (synopsis "Two-pass portable cross-assembler")
-- 
cgit 1.4.1


From 9bba3eb336f8cf3cd662f7d72e13e97d7d9e5561 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:07 +0200
Subject: gnu: qxlsx: Fix include directory.

* gnu/packages/qt.scm (qxlsx)[source]: Add patch.
* gnu/packages/patches/qxlsx-fix-include-directory.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                       |  1 +
 .../patches/qxlsx-fix-include-directory.patch      | 24 ++++++++++++++++++++++
 gnu/packages/qt.scm                                |  3 ++-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/qxlsx-fix-include-directory.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index f10713f126..06a370eec6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1721,6 +1721,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-wxwidgets-type-errors.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	\
   %D%/packages/patches/scribus-1.5.8-poppler-22.03.0.patch	\
   %D%/packages/patches/scribus-1.5.8-poppler-22.04.0.patch	\
   %D%/packages/patches/scribus-1.5.8-poppler-22.09.0.patch	\
diff --git a/gnu/packages/patches/qxlsx-fix-include-directory.patch b/gnu/packages/patches/qxlsx-fix-include-directory.patch
new file mode 100644
index 0000000000..a68ca0cc3b
--- /dev/null
+++ b/gnu/packages/patches/qxlsx-fix-include-directory.patch
@@ -0,0 +1,24 @@
+From 8c3e6633e3c901bc5a5cd477383421b0980dcd26 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <sokolov@google.com>
+Date: Mon, 17 Apr 2023 23:43:59 +0100
+Subject: [PATCH] Fix #278
+
+There's no real reason to install the same headers twice, but at least
+now clients of the library can build again
+---
+ QXlsx/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
+index 4fa7f7f1..074922a8 100644
+--- a/QXlsx/CMakeLists.txt
++++ b/QXlsx/CMakeLists.txt
+@@ -179,7 +179,7 @@ PRIVATE
+     ${QXLSX_HEADERPATH}
+ PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header>
+-    $<INSTALL_INTERFACE:include/QXlsx>
++    $<INSTALL_INTERFACE:include/QXlsxQt${QT_VERSION_MAJOR}>
+ )
+ 
+ set_target_properties(QXlsx PROPERTIES
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 7a82d94d90..a79338f84e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1129,7 +1129,8 @@ from within Qt 5.")))
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0xbpajvwkv09h2fang200nsanv5gl1alsdd725gh9cgq4szng6gj"))))
+        (base32 "0xbpajvwkv09h2fang200nsanv5gl1alsdd725gh9cgq4szng6gj"))
+       (patches (search-patches "qxlsx-fix-include-directory.patch"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
cgit 1.4.1


From 705cf2de5cc33bfd344204efb9960301d890c9b8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: stellarium: Update to 23.2.

* gnu/packages/astronomy.scm (stellarium): Update to 23.2.
---
 gnu/packages/astronomy.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index d3f3711bd1..9351c691d2 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1058,7 +1058,7 @@ deconvolution).  Such post-processing is not performed by Stackistry.")
 (define-public stellarium
   (package
     (name "stellarium")
-    (version "23.1")
+    (version "23.2")
     (source
      (origin
        (method git-fetch)
@@ -1067,7 +1067,7 @@ deconvolution).  Such post-processing is not performed by Stackistry.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "03gq7n15dsvb32pfq7j3a0vc5wf1y9xdxaq09q1gp534jkgd4g7f"))))
+        (base32 "0fkiibc6m8kfmyf5my7ynfrpdlrcri14cl26swpgv3bhzxpmx27h"))))
     (build-system cmake-build-system)
     ;; TODO: Complete documentation build and split into dedicated outputs.
     (arguments
-- 
cgit 1.4.1


From a3637e60bf66723056e500d05420f1292bbeaa09 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: libopenshot: Update to 0.3.2.

* gnu/packages/video.scm (libopenshot): Update to 0.3.2.
[arguments]: Don't explicitly return #t from phases.
---
 gnu/packages/video.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c11ae52ef4..0aa149051c 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4777,7 +4777,7 @@ create smoother and stable videos.")
 (define-public libopenshot
   (package
     (name "libopenshot")
-    (version "0.3.1")
+    (version "0.3.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -4786,7 +4786,7 @@ create smoother and stable videos.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "10s76x4hwm4ccxdy8cv1nks028hldjmx25yy42fnjc4vscy7yd8a"))
+                "1hx2y9lvca7fzmy3996z08bzy65z1b0ip9d4jnnwd0wamwv4c4bb"))
               (modules '((guix build utils)))
               (snippet '(begin
                           ;; Allow overriding of the python installation dir
@@ -4794,8 +4794,7 @@ create smoother and stable videos.")
                             (("(SET\\(PYTHON_MODULE_PATH.*)\\)" _ set)
                              (string-append set " CACHE PATH "
                                             "\"Python bindings directory\")")))
-                          (delete-file-recursively "thirdparty")
-                          #t))))
+                          (delete-file-recursively "thirdparty")))))
     (build-system cmake-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
cgit 1.4.1


From 120f1721b2b66e5c9507556267bbfd83945958ce Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: libopenshot-audio: Update to 0.3.2.

* gnu/packages/audio.scm (libopenshot-audio): Update to 0.3.2.
---
 gnu/packages/audio.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 8a11d2d6cc..1b8bfd77f8 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -5210,7 +5210,7 @@ bluetooth profile.")
 (define-public libopenshot-audio
   (package
     (name "libopenshot-audio")
-    (version "0.3.1")
+    (version "0.3.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -5219,7 +5219,7 @@ bluetooth profile.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "164ibsp5g162cyjgpa0ap35h75igmfnmhxmwkkk1fvm1cpbf1jgj"))))
+                "0g49akqhd0jsd0ar6sacdqz6cv8y0a4zclnyliifiidxrkv43fiw"))))
     (build-system cmake-build-system)
     (inputs
      (list alsa-lib
-- 
cgit 1.4.1


From 182be30fb1a8b847c30492462ec22c08ec7a9849 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: libopenshot-audio: Use G-expressions.

* gnu/packages/audio.scm (libopenshot-audio)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/audio.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 1b8bfd77f8..437ccd53de 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -147,8 +147,8 @@
   #:use-module (guix build-system trivial)
   #:use-module (guix build-system waf)
   #:use-module (guix download)
-  #:use-module (guix git-download)
   #:use-module (guix gexp)
+  #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -5230,11 +5230,12 @@ bluetooth profile.")
            libxinerama
            libxcursor))
     (arguments
-     `(#:tests? #f                      ;there are no tests
-       #:configure-flags
-       (list (string-append "-DCMAKE_CXX_FLAGS=-I"
-                            (assoc-ref %build-inputs "freetype")
-                            "/include/freetype2"))))
+     (list
+      #:tests? #f                       ; there are no tests
+      #:configure-flags
+      #~(list (string-append "-DCMAKE_CXX_FLAGS=-I"
+                           #$(this-package-input "freetype")
+                           "/include/freetype2"))))
     (home-page "https://openshot.org")
     (synopsis "Audio editing and playback for OpenShot")
     (description "OpenShot Audio Library (libopenshot-audio) allows
-- 
cgit 1.4.1


From 261422e7451901d99c6cfcbaa5e0037117588f34 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 19 Jul 2023 21:04:26 +0300
Subject: chez-sheme-for-racket: Fix building on riscv64-linux.

* gnu/packages/racket.scm (%racket-origin): Add patch.
* gnu/packages/patches/racket-rktboot-riscv64-support.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk                                              |  1 +
 gnu/packages/patches/racket-rktboot-riscv64-support.patch | 15 +++++++++++++++
 gnu/packages/racket.scm                                   |  1 +
 3 files changed, 17 insertions(+)
 create mode 100644 gnu/packages/patches/racket-rktboot-riscv64-support.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 06a370eec6..76e02a81d5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1882,6 +1882,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/rpcbind-CVE-2017-8779.patch		\
   %D%/packages/patches/rtags-separate-rct.patch			\
   %D%/packages/patches/racket-chez-scheme-bin-sh.patch		\
+  %D%/packages/patches/racket-rktboot-riscv64-support.patch	\
   %D%/packages/patches/racket-rktio-bin-sh.patch		\
   %D%/packages/patches/racket-zuo-bin-sh.patch			\
   %D%/packages/patches/remake-impure-dirs.patch			\
diff --git a/gnu/packages/patches/racket-rktboot-riscv64-support.patch b/gnu/packages/patches/racket-rktboot-riscv64-support.patch
new file mode 100644
index 0000000000..f268b1e7f8
--- /dev/null
+++ b/gnu/packages/patches/racket-rktboot-riscv64-support.patch
@@ -0,0 +1,15 @@
+Submitted upstream:
+https://github.com/racket/racket/pull/4703
+
+diff --git a/racket/src/rktboot/machine-def.rkt b/racket/src/rktboot/machine-def.rkt
+index 8ff0688..59ebfc8 100644
+--- a/racket/src/rktboot/machine-def.rkt
++++ b/racket/src/rktboot/machine-def.rkt
+@@ -25,6 +25,7 @@
+                                      [(regexp-match? #rx"^t?arm32" target-machine) "arm32"]
+                                      [(regexp-match? #rx"^t?arm64" target-machine) "arm64"]
+                                      [(regexp-match? #rx"^t?ppc32" target-machine) "ppc32"]
++                                     [(regexp-match? #rx"^t?rv64" target-machine) "rv64"]
+                                      [(regexp-match? #rx"^t?pb" target-machine) "pb"]
+                                      [else (error "machine.def: cannot infer architecture")]))]
+                [s (regexp-replace* #rx"[$][(]Mend[)]" s
diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm
index dce7cd9587..03abd7cc41 100644
--- a/gnu/packages/racket.scm
+++ b/gnu/packages/racket.scm
@@ -204,6 +204,7 @@
      (base32 "120djvscm2x1nv46is0kzwahd22rcc8gc0ssf12jnj7w290dpmra"))
     (file-name (git-file-name "racket" %racket-version))
     (patches (search-patches "racket-chez-scheme-bin-sh.patch"
+                             "racket-rktboot-riscv64-support.patch"
                              "racket-rktio-bin-sh.patch"
                              "racket-zuo-bin-sh.patch"))
     (modules '((guix build utils)))
-- 
cgit 1.4.1


From 8442760638f5d2728d60eaba2d049dd31ac21fd9 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 20 Jul 2023 17:39:55 +0300
Subject: gnu: zstd: Skip tests when cross-compiling.

* gnu/packages/compression.scm (zstd)[arguments]: Adjust #:tests? to
skip tests when cross-compiling.
---
 gnu/packages/compression.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index e4d3293f9d..10cbfb526d 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1661,7 +1661,8 @@ or junctions, and always follows hard links.")
              ;; Not currently detected, but be explicit & avoid surprises later.
              "HAVE_LZ4=0"
              "HAVE_ZLIB=0")
-       #:tests? ,(not (target-hurd?))))
+       #:tests? ,(not (or (target-hurd?)
+                          (%current-target-system)))))
     (home-page "https://facebook.github.io/zstd/")
     (synopsis "Zstandard real-time compression algorithm")
     (description "Zstandard (@command{zstd}) is a lossless compression algorithm
-- 
cgit 1.4.1


From 0867cdc5148ed9c066f73d4213ad342bd332c070 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 20 Jul 2023 17:41:23 +0300
Subject: gnu: newick-utils: Skip tests when cross-compiling.

* gnu/packages/bioinformatics.scm (newick-utils)[arguments]: Adjust
 #: tests? to skip tests when cross-compiling.
---
 gnu/packages/bioinformatics.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 7f8240b8f9..864c200707 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7277,7 +7277,8 @@ program for nucleotide and protein sequences.")
                   "1hkw21rq1mwf7xp0rmbb2gqc0i6p11108m69i7mr7xcjl268pxnb"))))
       (build-system gnu-build-system)
       (arguments
-       `(#:tests? ,(not (target-riscv64?)) ;XXX: stuck on riscv64-linux
+       `(#:tests? ,(not (or (target-riscv64?)   ;XXX: stuck on riscv64-linux
+                            (%current-target-system)))
          #:make-flags (list "CFLAGS=-O2 -g -fcommon")))
       (inputs
        ;; XXX: TODO: Enable Lua and Guile bindings.
-- 
cgit 1.4.1


From 696b22141cb53b9797c80f49079c0a0fcd60ba64 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 20 Jul 2023 17:43:15 +0300
Subject: gnu: parted: Skip tests when cross-compiling.

* gnu/packages/disk.scm (parted)[arguments]: Adjust #:tests? to skip
tests when cross-compiling.
---
 gnu/packages/disk.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 35ffcf173e..21e8775e83 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016, 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2019-2021, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
@@ -259,7 +259,8 @@ tmpfs/ramfs filesystems.")
       #:configure-flags (if (target-hurd?)
                             #~'("--disable-device-mapper")
                             #~'())
-      #:tests? (not (target-hurd?))
+      #:tests? (not (or (target-hurd?)
+                        (%current-target-system)))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'fix-locales-and-python
-- 
cgit 1.4.1


From c11afc46777bfdf3dc222062cfe3518c0d8a657a Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 20 Jul 2023 17:44:26 +0300
Subject: gnu: libpaper: Skip tests when cross-compiling.

* gnu/packages/ghostscript.scm (libpaper)[arguments]: Adjust #:tests to
skip tests when cross-compiling.
---
 gnu/packages/ghostscript.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 2d7f07fb40..502b41bb99 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -93,7 +93,8 @@ Consortium standard (ICC), approved as ISO 15076-1.")
                                  ;; Tests require a relocatable build.
                                  "--enable-relocatable")
            ;; --enable-relocate is broken on the Hurd
-           #:tests? (not (target-hurd?))))
+           #:tests? (not (or (target-hurd?)
+                             (%current-target-system)))))
     (outputs '("out" "debug"))
     (home-page "https://github.com/rrthomas/libpaper")
     (synopsis "Library for handling paper sizes")
-- 
cgit 1.4.1


From 6bda806416b8e6032ef1047c5feed776b6cc0493 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 20 Jul 2023 17:46:27 +0300
Subject: gnu: swig: Skip tests when cross-compiling.

* gnu/packages/swig.scm (swig)[arguments]: Adjust #:tests? to skip tests
when cross-compiling.
---
 gnu/packages/swig.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm
index 42996fa812..3f38cd9f9f 100644
--- a/gnu/packages/swig.scm
+++ b/gnu/packages/swig.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2018, 2021 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
@@ -56,7 +56,8 @@
                          perl))
                      ;;("python" ,python-wrapper)
     (inputs (list pcre))
-    (arguments (list #:tests? (not (target-hurd?))))
+    (arguments (list #:tests? (not (or (target-hurd?)
+                                       (%current-target-system)))))
     (home-page "https://swig.org/")
     (synopsis
      "Interface compiler that connects C/C++ code to higher-level languages")
-- 
cgit 1.4.1


From f737168a6c2a645cd3d0ffe4acf6969f576a85d7 Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Thu, 13 Jul 2023 21:42:49 +0400
Subject: gnu: emacs-no-littering: Update to 1.5.0.

* gnu/packages/emacs-xyz.scm (emacs-no-littering): Update to 1.5.0.

Signed-off-by: Andrew Tropin <andrew@trop.in>
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 550e5d2a65..119bab2b28 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -34270,7 +34270,7 @@ launching other commands/applications from within Emacs, similar to the
 (define-public emacs-no-littering
   (package
     (name "emacs-no-littering")
-    (version "1.4.0")
+    (version "1.5.0")
     (source
      (origin
        (method git-fetch)
@@ -34279,7 +34279,7 @@ launching other commands/applications from within Emacs, similar to the
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1i5fcci8fg14hbd4cjb84q3mx6rfwhbwkw0g21v25dal61kw4yvb"))))
+        (base32 "14f07irjbk3akc07a0y5awyflmhsxvj8gg67y81zp90danjkgvvr"))))
     (build-system emacs-build-system)
     (propagated-inputs
      (list emacs-compat))
-- 
cgit 1.4.1


From c4713ad89d186ad51a439193d8cc775b4aef06d8 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 21 Jul 2023 17:46:53 +0200
Subject: gnu: Oops, distribute ghostscript-CVE-* patches again.

This is a follow-up to commit
    03f35ff390d5f77843d65a9df4bd763f82049d24
    gnu: ghostscript: Fix build for the Hurd.

Reported by bjc via IRC.

* gnu/local.mk (dist_patch_DATA): Re-add ghostscript-CVE-2023-36664.patch, and
ghostscript-CVE-2023-36664-fixup.patch.
---
 gnu/local.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 76e02a81d5..a56406ddd7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1238,6 +1238,8 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghc-bloomfilter-ghc9.2.patch	\
   %D%/packages/patches/ghc-bytestring-handle-ghc9.patch	\
   %D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch	\
+  %D%/packages/patches/ghostscript-CVE-2023-36664.patch		\
+  %D%/packages/patches/ghostscript-CVE-2023-36664-fixup.patch	\
   %D%/packages/patches/ghostscript-leptonica-hurd.patch		\
   %D%/packages/patches/ghostscript-no-header-id.patch		\
   %D%/packages/patches/ghostscript-no-header-uuid.patch		\
-- 
cgit 1.4.1


From f15c5edb1a2423402b32a5262627eb2141becf65 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Thu, 18 May 2023 20:21:35 -0400
Subject: services: herd: Add a new 'current-service' procedure.

* gnu/services/herd.scm (current-service): New procedure, mostly reusing the
existing current-services.
(current-services): Implement in terms of the above procedure.
---
 gnu/services/herd.scm | 52 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/gnu/services/herd.scm b/gnu/services/herd.scm
index c24a403935..4b47acf72a 100644
--- a/gnu/services/herd.scm
+++ b/gnu/services/herd.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016-2019, 2022-2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -51,6 +52,7 @@
             live-service-canonical-name
 
             with-shepherd-action
+            current-service
             current-services
             unload-services
             unload-service
@@ -208,31 +210,43 @@ of pairs."
   "Return the 'canonical name' of SERVICE."
   (first (live-service-provision service)))
 
-(define (current-services)
-  "Return the list of currently defined Shepherd services, represented as
-<live-service> objects.  Return #f if the list of services could not be
-obtained."
-  (with-shepherd-action 'root ('status) results
-    ;; We get a list of results, one for each service with the name 'root'.
+(define (current-service name)
+  "Return the currently defined Shepherd service NAME, as a <live-service>
+object.  Return #f if the service could not be obtained.  As a special case,
+@code{(current-service 'root)} returns all the current services."
+  (define (process-services services)
+    (resolve-transients
+     (map (lambda (service)
+            (alist-let* service (provides requires running transient?)
+              ;; The Shepherd 0.9.0 would not provide 'transient?' in
+              ;; its status sexp.  Thus, when it's missing, query it
+              ;; via an "eval" request.
+              (live-service provides requires
+                            (if (sloppy-assq 'transient? service)
+                                transient?
+                                (and running *unspecified*))
+                            running)))
+          services)))
+
+  (with-shepherd-action name ('status) results
+    ;; We get a list of results, one for each service with the name NAME.
     ;; In practice there's only one such service though.
     (match results
       ((services _ ...)
        (match services
          ((('service ('version 0 _ ...) _ ...) ...)
-          (resolve-transients
-           (map (lambda (service)
-                  (alist-let* service (provides requires running transient?)
-                    ;; The Shepherd 0.9.0 would not provide 'transient?' in its
-                    ;; status sexp.  Thus, when it's missing, query it via an
-                    ;; "eval" request.
-                    (live-service provides requires
-                                  (if (sloppy-assq 'transient? service)
-                                      transient?
-                                      (and running *unspecified*))
-                                  running)))
-                services)))
+          ;; Summary of all services (when NAME is 'root or 'shepherd).
+          (process-services services))
+         (('service ('version 0 _ ...) _ ...) ;single service
+          (first (process-services (list services))))
          (x
-          #f))))))
+          #f))))))                ;singleton
+
+(define (current-services)
+  "Return the list of currently defined Shepherd services, represented as
+<live-service> objects.  Return #f if the list of services could not be
+obtained."
+  (current-service 'root))
 
 (define (resolve-transients services)
   "Resolve the subset of SERVICES whose 'transient?' field is undefined.  This
-- 
cgit 1.4.1


From 8d785c43bad05546cfe8e08a1bbe065a63215f9d Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 9 May 2023 16:52:22 -0400
Subject: services: wireguard: Implement a dynamic IP monitoring feature.

* gnu/services/vpn.scm (<wireguard-configuration>)
[monitor-ips?, monitor-ips-internal]: New fields.
* gnu/services/vpn.scm (define-with-source): New syntax.
(wireguard-service-name, strip-port/maybe)
(ipv4-address?, ipv6-address?, host-name?)
(endpoint-host-names): New procedure.
(wireguard-monitoring-jobs): Likewise.
(wireguard-service-type): Register it.
* tests/services/vpn.scm: New file.
* Makefile.am (SCM_TESTS): Register it.
* doc/guix.texi (VPN Services): Update doc.

Reviewed-by: Bruno Victal <mirai@makinata.eu>
---
 Makefile.am            |   1 +
 doc/guix.texi          |  17 +++++-
 gnu/services/vpn.scm   | 150 +++++++++++++++++++++++++++++++++++++++++++++++--
 tests/services/vpn.scm |  85 ++++++++++++++++++++++++++++
 4 files changed, 247 insertions(+), 6 deletions(-)
 create mode 100644 tests/services/vpn.scm

diff --git a/Makefile.am b/Makefile.am
index d680c8c76c..d76bfd2522 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -558,6 +558,7 @@ SCM_TESTS =					\
   tests/services/lightdm.scm			\
   tests/services/linux.scm			\
   tests/services/telephony.scm			\
+  tests/services/vpn.scm			\
   tests/sets.scm				\
   tests/size.scm				\
   tests/status.scm				\
diff --git a/doc/guix.texi b/doc/guix.texi
index 1d8ebcd72f..33e2286455 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -32955,9 +32955,22 @@ The port on which to listen for incoming connections.
 @item @code{dns} (default: @code{#f})
 The DNS server(s) to announce to VPN clients via DHCP.
 
+@item @code{monitor-ips?} (default: @code{#f})
+@cindex Dynamic IP, with Wireguard
+@cindex dyndns, usage with Wireguard
+Whether to monitor the resolved Internet addresses (IPs) of the
+endpoints of the configured peers, resetting the peer endpoints using an
+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))})
+The time interval at which the IP monitoring job should run, provided as
+an mcron time specification (@pxref{Guile Syntax,,,mcron}).
+
 @item @code{private-key} (default: @code{"/etc/wireguard/private.key"})
-The private key file for the interface.  It is automatically generated if
-the file does not exist.
+The private key file for the interface.  It is automatically generated
+if the file does not exist.
 
 @item @code{peers} (default: @code{'()})
 The authorized peers on this interface.  This is a list of
diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm
index a884d71eb2..17aed8b3b2 100644
--- a/gnu/services/vpn.scm
+++ b/gnu/services/vpn.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2021 Nathan Dehnel <ncdehnel@gmail.com>
 ;;; Copyright © 2022 Cameron V Chaparro <cameron@cameronchaparro.com>
 ;;; Copyright © 2022 Timo Wilken <guix@twilken.net>
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,10 +32,12 @@
   #:use-module (gnu services)
   #:use-module (gnu services configuration)
   #:use-module (gnu services dbus)
+  #:use-module (gnu services mcron)
   #:use-module (gnu services shepherd)
   #:use-module (gnu system shadow)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages vpn)
+  #:use-module (guix modules)
   #:use-module (guix packages)
   #:use-module (guix records)
   #:use-module (guix gexp)
@@ -73,6 +76,8 @@
             wireguard-configuration-addresses
             wireguard-configuration-port
             wireguard-configuration-dns
+            wireguard-configuration-monitor-ips?
+            wireguard-configuration-monitor-ips-interval
             wireguard-configuration-private-key
             wireguard-configuration-peers
             wireguard-configuration-pre-up
@@ -741,6 +746,10 @@ strongSwan.")))
                       (default '()))
   (dns                wireguard-configuration-dns ;list of strings
                       (default #f))
+  (monitor-ips?       wireguard-configuration-monitor-ips? ;boolean
+                      (default #f))
+  (monitor-ips-interval wireguard-configuration-monitor-ips-interval
+                        (default '(next-minute (range 0 60 5)))) ;string | list
   (pre-up             wireguard-configuration-pre-up ;list of strings
                       (default '()))
   (post-up            wireguard-configuration-post-up ;list of strings
@@ -871,6 +880,58 @@ PostUp = ~a set %i private-key ~a~{ peer ~a preshared-key ~a~}
             (chmod #$private-key #o400)
             (close-pipe pipe))))))
 
+;;; XXX: Copied from (guix scripts pack), changing define to define*.
+(define-syntax-rule (define-with-source (variable args ...) body body* ...)
+  "Bind VARIABLE to a procedure accepting ARGS defined as BODY, also setting
+its source property."
+  (begin
+    (define* (variable args ...)
+      body body* ...)
+    (eval-when (load eval)
+      (set-procedure-property! variable 'source
+                               '(define* (variable args ...) body body* ...)))))
+
+(define (wireguard-service-name interface)
+  "Return the WireGuard service name (a symbol) configured to use INTERFACE."
+  (symbol-append 'wireguard- (string->symbol interface)))
+
+(define-with-source (strip-port/maybe endpoint #:key ipv6?)
+  "Strip the colon and port, if present in ENDPOINT, a string."
+  (if ipv6?
+      (if (string-prefix? "[" endpoint)
+          (first (string-split (string-drop endpoint 1) #\])) ;ipv6
+          endpoint)
+      (first (string-split endpoint #\:)))) ;ipv4
+
+(define* (ipv4-address? address)
+  "Predicate to check whether ADDRESS is a valid IPv4 address."
+  (let ((address (strip-port/maybe address)))
+    (false-if-exception
+     (->bool (getaddrinfo address #f AI_NUMERICHOST AF_INET)))))
+
+(define* (ipv6-address? address)
+  "Predicate to check whether ADDRESS is a valid IPv6 address."
+  (let ((address (strip-port/maybe address #:ipv6? #t)))
+    (false-if-exception
+     (->bool (getaddrinfo address #f AI_NUMERICHOST AF_INET6)))))
+
+(define (host-name? name)
+  "Predicate to check whether NAME is a host name, i.e. not an IP address."
+  (not (or (ipv6-address? name) (ipv4-address? name))))
+
+(define (endpoint-host-names peers)
+  "Return an association list of endpoint host names keyed by their peer
+public key, if any."
+  (reverse
+   (fold (lambda (peer host-names)
+           (let ((public-key (wireguard-peer-public-key peer))
+                 (endpoint (wireguard-peer-endpoint peer)))
+             (if (and endpoint (host-name? endpoint))
+                 (cons (cons public-key endpoint) host-names)
+                 host-names)))
+         '()
+         peers)))
+
 (define (wireguard-shepherd-service config)
   (match-record config <wireguard-configuration>
     (wireguard interface)
@@ -878,9 +939,7 @@ PostUp = ~a set %i private-key ~a~{ peer ~a preshared-key ~a~}
           (config (wireguard-configuration-file config)))
       (list (shepherd-service
              (requirement '(networking))
-             (provision (list
-                         (symbol-append 'wireguard-
-                                        (string->symbol interface))))
+             (provision (list (wireguard-service-name interface)))
              (start #~(lambda _
                        (invoke #$wg-quick "up" #$config)))
              (stop #~(lambda _
@@ -888,6 +947,87 @@ PostUp = ~a set %i private-key ~a~{ peer ~a preshared-key ~a~}
                        #f))                       ;stopped!
              (documentation "Run the Wireguard VPN tunnel"))))))
 
+(define (wireguard-monitoring-jobs config)
+  ;; Loosely based on WireGuard's own 'reresolve-dns.sh' shell script (see:
+  ;; https://raw.githubusercontent.com/WireGuard/wireguard-tools/
+  ;; master/contrib/reresolve-dns/reresolve-dns.sh).
+  (match-record config <wireguard-configuration>
+    (interface monitor-ips? monitor-ips-interval peers)
+    (let ((host-names (endpoint-host-names peers)))
+      (if monitor-ips?
+          (if (null? host-names)
+              (begin
+                (warn "monitor-ips? is #t but no host name to monitor")
+                '())
+              ;; The mcron monitor job may be a string or a list; ungexp strips
+              ;; one quote level, which must be added back when a list is
+              ;; provided.
+              (list
+               #~(job
+                  (if (string? #$monitor-ips-interval)
+                      #$monitor-ips-interval
+                      '#$monitor-ips-interval)
+                  #$(program-file
+                     (format #f "wireguard-~a-monitoring" interface)
+                     (with-imported-modules (source-module-closure
+                                             '((gnu services herd)
+                                               (guix build utils)))
+                       #~(begin
+                           (use-modules (gnu services herd)
+                                        (guix build utils)
+                                        (ice-9 popen)
+                                        (ice-9 match)
+                                        (ice-9 textual-ports)
+                                        (srfi srfi-1)
+                                        (srfi srfi-26))
+
+                           (define (resolve-host name)
+                             "Return the IP address resolved from NAME."
+                             (let* ((ai (car (getaddrinfo name)))
+                                    (sa (addrinfo:addr ai)))
+                               (inet-ntop (sockaddr:fam sa)
+                                          (sockaddr:addr sa))))
+
+                           (define wg #$(file-append wireguard-tools "/bin/wg"))
+
+                           #$(procedure-source strip-port/maybe)
+
+                           (define service-name '#$(wireguard-service-name
+                                                    interface))
+
+                           (when (live-service-running
+                                  (current-service service-name))
+                             (let* ((pipe (open-pipe* OPEN_READ wg "show"
+                                                      #$interface "endpoints"))
+                                    (lines (string-split (get-string-all pipe)
+                                                         #\newline))
+                                    ;; IPS is an association list mapping
+                                    ;; public keys to IP addresses.
+                                    (ips (map (match-lambda
+                                                ((public-key ip)
+                                                 (cons public-key
+                                                       (strip-port/maybe ip))))
+                                              (map (cut string-split <> #\tab)
+                                                   (remove string-null?
+                                                           lines)))))
+                               (close-pipe pipe)
+                               (for-each
+                                (match-lambda
+                                  ((key . host-name)
+                                   (let ((resolved-ip (resolve-host
+                                                       (strip-port/maybe
+                                                        host-name)))
+                                         (current-ip (assoc-ref ips key)))
+                                     (unless (string=? resolved-ip current-ip)
+                                       (format #t "resetting `~a' peer \
+endpoint to `~a' due to stale IP (`~a' instead of `~a')~%"
+                                               key host-name
+                                               current-ip resolved-ip)
+                                       (invoke wg "set" #$interface "peer" key
+                                               "endpoint" host-name)))))
+                                '#$host-names)))))))))
+          '()))))                     ;monitor-ips? is #f
+
 (define wireguard-service-type
   (service-type
    (name 'wireguard)
@@ -898,6 +1038,8 @@ PostUp = ~a set %i private-key ~a~{ peer ~a preshared-key ~a~}
                              wireguard-activation)
           (service-extension profile-service-type
                              (compose list
-                                      wireguard-configuration-wireguard))))
+                                      wireguard-configuration-wireguard))
+          (service-extension mcron-service-type
+                             wireguard-monitoring-jobs)))
    (description "Set up Wireguard @acronym{VPN, Virtual Private Network}
 tunnels.")))
diff --git a/tests/services/vpn.scm b/tests/services/vpn.scm
new file mode 100644
index 0000000000..1607d1bbfc
--- /dev/null
+++ b/tests/services/vpn.scm
@@ -0,0 +1,85 @@
+;;; 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/>.
+
+(define-module (tests services vpn)
+  #:use-module (gnu packages vpn)
+  #:use-module (gnu services vpn)
+  #:use-module (guix gexp)
+  #:use-module (ice-9 match)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-64))
+
+;;; Commentary:
+;;;
+;;; Unit tests for the (gnu services vpn) module.
+;;;
+;;; Code:
+
+;;; Access some internals for whitebox testing.
+(define ipv4-address? (@@ (gnu services vpn) ipv4-address?))
+(define ipv6-address? (@@ (gnu services vpn) ipv6-address?))
+(define host-name? (@@ (gnu services vpn) host-name?))
+(define endpoint-host-names
+  (@@ (gnu services vpn) endpoint-host-names))
+
+(test-begin "vpn-services")
+
+(test-assert "ipv4-address?"
+  (every ipv4-address?
+         (list "192.95.5.67:1234"
+               "10.0.0.1")))
+
+(test-assert "ipv6-address?"
+  (every ipv6-address?
+         (list "[2001:db8::c05f:543]:2468"
+               "2001:db8::c05f:543"
+               "2001:db8:855b:0000:0000:0567:5673:23b5"
+               "2001:db8:855b::0567:5673:23b5")))
+
+(define %wireguard-peers
+  (list (wireguard-peer
+         (name "dummy1")
+         (public-key "VlesLiEB5BFd//OD2ILKXviolfz+hodG6uZ+XjoalC8=")
+         (endpoint "some.dynamic-dns.service:53281")
+         (allowed-ips '()))
+        (wireguard-peer
+         (name "dummy2")
+         (public-key "AlesLiEB5BFd//OD2ILKXviolfz+hodG6uZ+XgoalC9=")
+         (endpoint "example.org")
+         (allowed-ips '()))
+        (wireguard-peer
+         (name "dummy3")
+         (public-key "BlesLiEB5BFd//OD2ILKXviolfz+hodG6uZ+XgoalC7=")
+         (endpoint "10.0.0.7:7777")
+         (allowed-ips '()))
+        (wireguard-peer
+         (name "dummy4")
+         (public-key "ClesLiEB5BFd//OD2ILKXviolfz+hodG6uZ+XgoalC6=")
+         (endpoint "[2345:0425:2CA1::0567:5673:23b5]:44444")
+         (allowed-ips '()))))
+
+(test-equal "endpoint-host-names"
+  ;; The first element of the pair the public Wireguard key associated to a
+  ;; host name.
+  '(("VlesLiEB5BFd//OD2ILKXviolfz+hodG6uZ+XjoalC8=" .
+     "some.dynamic-dns.service:53281")
+    ("AlesLiEB5BFd//OD2ILKXviolfz+hodG6uZ+XgoalC9=" .
+     "example.org"))
+  (endpoint-host-names %wireguard-peers))
+
+(test-end "vpn-services")
-- 
cgit 1.4.1


From d2385da87e9c5f93ffb8af246cd28a4c2e8fcc0f Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 15 May 2023 15:36:30 -0400
Subject: services: wireguard: Clean-up configuration file serializer.

Previously, the generated config file would contain arbitrary whitespace that
made it look ugly.

* gnu/services/vpn.scm (<wireguard-configuration>) [dns]: Change default value
from #f to '().
(wireguard-configuration-file): Use match-record.  Format each line
individually, assembling the lines at the end to avoid extraneous white space.
* doc/guix.texi (VPN Services): Update doc.
---
 doc/guix.texi        |   2 +-
 gnu/services/vpn.scm | 119 +++++++++++++++++++--------------------------------
 2 files changed, 46 insertions(+), 75 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 33e2286455..585baf358f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -32952,7 +32952,7 @@ The IP addresses to be assigned to the above interface.
 @item @code{port} (default: @code{51820})
 The port on which to listen for incoming connections.
 
-@item @code{dns} (default: @code{#f})
+@item @code{dns} (default: @code{'())})
 The DNS server(s) to announce to VPN clients via DHCP.
 
 @item @code{monitor-ips?} (default: @code{#f})
diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm
index 17aed8b3b2..8f450bacb1 100644
--- a/gnu/services/vpn.scm
+++ b/gnu/services/vpn.scm
@@ -44,6 +44,7 @@
   #:use-module (guix i18n)
   #:use-module (guix deprecation)
   #:use-module (srfi srfi-1)
+  #:use-module (ice-9 format)
   #:use-module (ice-9 match)
   #:use-module (ice-9 regex)
   #:export (openvpn-client-service  ; deprecated
@@ -745,7 +746,7 @@ strongSwan.")))
   (peers              wireguard-configuration-peers ;list of <wiregard-peer>
                       (default '()))
   (dns                wireguard-configuration-dns ;list of strings
-                      (default #f))
+                      (default '()))
   (monitor-ips?       wireguard-configuration-monitor-ips? ;boolean
                       (default #f))
   (monitor-ips-interval wireguard-configuration-monitor-ips-interval
@@ -763,24 +764,15 @@ strongSwan.")))
 
 (define (wireguard-configuration-file config)
   (define (peer->config peer)
-    (let ((name (wireguard-peer-name peer))
-          (public-key (wireguard-peer-public-key peer))
-          (endpoint (wireguard-peer-endpoint peer))
-          (allowed-ips (wireguard-peer-allowed-ips peer))
-          (keep-alive (wireguard-peer-keep-alive peer)))
-      (format #f "[Peer] #~a
-PublicKey = ~a
-AllowedIPs = ~a
-~a~a"
-              name
-              public-key
-              (string-join allowed-ips ",")
-              (if endpoint
-                  (format #f "Endpoint = ~a\n" endpoint)
-                  "")
-              (if keep-alive
-                  (format #f "PersistentKeepalive = ~a\n" keep-alive)
-                  "\n"))))
+    (match-record peer <wireguard-peer>
+      (name public-key endpoint allowed-ips keep-alive)
+      (let ((lines (list
+                    (format #f "[Peer]   #~a" name)
+                    (format #f "PublicKey = ~a" public-key)
+                    (format #f "AllowedIPs = ~{~a~^, ~}" allowed-ips)
+                    (format #f "~@[Endpoint = ~a~]" endpoint)
+                    (format #f "~@[PersistentKeepalive = ~a~]" keep-alive))))
+        (string-join (remove string-null? lines) "\n"))))
 
   (define (peers->preshared-keys peer keys)
     (let ((public-key (wireguard-peer-public-key peer))
@@ -799,65 +791,44 @@ AllowedIPs = ~a
             (computed-file
              "wireguard-config"
              #~(begin
+                 (use-modules (ice-9 format)
+                              (srfi srfi-1))
+
+                 (define lines
+                   (list
+                    "[Interface]"
+                    #$@(if (null? addresses)
+                           '()
+                           (list (format #f "Address = ~{~a~^, ~}"
+                                         addresses)))
+                    (format #f "~@[Table = ~a~]" #$table)
+                    #$@(if (null? pre-up)
+                           '()
+                           (list (format #f "~{PreUp = ~a~%~}" pre-up)))
+                    (format #f "PostUp = ~a set %i private-key ~a\
+~{ peer ~a preshared-key ~a~}" #$(file-append wireguard "/bin/wg")
+#$private-key '#$peer-keys)
+                    #$@(if (null? post-up)
+                           '()
+                           (list (format #f "~{PostUp = ~a~%~}" post-up)))
+                    #$@(if (null? pre-down)
+                           '()
+                           (list (format #f "~{PreDown = ~a~%~}" pre-down)))
+                    #$@(if (null? post-down)
+                           '()
+                           (list (format #f "~{PostDown = ~a~%~}" post-down)))
+                    (format #f "~@[ListenPort = ~a~]" #$port)
+                    #$@(if (null? dns)
+                           '()
+                           (list (format #f "~{DNS = ~{~a~^, ~}" dns)))))
+
                  (mkdir #$output)
                  (chdir #$output)
                  (call-with-output-file #$config-file
                    (lambda (port)
-                     (let ((format (@ (ice-9 format) format)))
-                       (format port "[Interface]
-Address = ~a
-~a
-~a
-PostUp = ~a set %i private-key ~a~{ peer ~a preshared-key ~a~}
-~a
-~a
-~a
-~a
-~a
-~{~a~^~%~}"
-                               #$(string-join addresses ",")
-                               #$(if table
-                                     (format #f "Table = ~a" table)
-                                     "")
-                               #$(if (null? pre-up)
-                                     ""
-                                     (string-join
-                                      (map (lambda (command)
-                                             (format #f "PreUp = ~a" command))
-                                           pre-up)
-                                      "\n"))
-                               #$(file-append wireguard "/bin/wg")
-                               #$private-key
-                               '#$peer-keys
-                               #$(if (null? post-up)
-                                     ""
-                                     (string-join
-                                      (map (lambda (command)
-                                             (format #f "PostUp = ~a" command))
-                                           post-up)
-                                      "\n"))
-                               #$(if (null? pre-down)
-                                     ""
-                                     (string-join
-                                      (map (lambda (command)
-                                             (format #f "PreDown = ~a" command))
-                                           pre-down)
-                                      "\n"))
-                               #$(if (null? post-down)
-                                     ""
-                                     (string-join
-                                      (map (lambda (command)
-                                             (format #f "PostDown = ~a" command))
-                                           post-down)
-                                      "\n"))
-                               #$(if port
-                                     (format #f "ListenPort = ~a" port)
-                                     "")
-                               #$(if dns
-                                     (format #f "DNS = ~a"
-                                             (string-join dns ","))
-                                     "")
-                               (list #$@peers)))))))))
+                     (format port "~a~%~%~{~a~%~^~%~}"
+                             (string-join (remove string-null? lines) "\n")
+                             '#$peers)))))))
       (file-append config "/" config-file))))
 
 (define (wireguard-activation config)
-- 
cgit 1.4.1


From bdcf23cf69d47a1b576e70da63da08518329c0f5 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Wed, 17 May 2023 23:28:05 -0400
Subject: services: wireguard: Add a 'configuration' action.

* gnu/services/vpn.scm (wireguard-shepherd-service) [actions]: New field.
---
 gnu/services/vpn.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm
index 8f450bacb1..9c8243d131 100644
--- a/gnu/services/vpn.scm
+++ b/gnu/services/vpn.scm
@@ -916,6 +916,7 @@ public key, if any."
              (stop #~(lambda _
                        (invoke #$wg-quick "down" #$config)
                        #f))                       ;stopped!
+             (actions (list (shepherd-configuration-action config)))
              (documentation "Run the Wireguard VPN tunnel"))))))
 
 (define (wireguard-monitoring-jobs config)
-- 
cgit 1.4.1


From acbb9d2dadc7011bce7e022689633944e595e75b Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Wed, 17 May 2023 22:58:46 -0400
Subject: gnu: linux-libre: Apply wireguard patch fixing keep-alive bug.

* gnu/packages/patches/linux-libre-wireguard-postup-privkey.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/linux.scm (linux-libre-6.4-source, linux-libre-6.3-source)
(linux-libre-6.2-source, linux-libre-6.1-source, linux-libre-5.15-source)
(linux-libre-5.10-source): Apply it.
---
 gnu/local.mk                                       |   1 +
 gnu/packages/linux.scm                             |  27 +++--
 .../linux-libre-wireguard-postup-privkey.patch     | 119 +++++++++++++++++++++
 3 files changed, 139 insertions(+), 8 deletions(-)
 create mode 100644 gnu/packages/patches/linux-libre-wireguard-postup-privkey.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index a56406ddd7..02a5b4721a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1544,6 +1544,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/linphone-desktop-without-sdk.patch	\
   %D%/packages/patches/linux-libre-infodocs-target.patch	\
   %D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \
+  %D%/packages/patches/linux-libre-wireguard-postup-privkey.patch \
   %D%/packages/patches/linux-pam-no-setfsuid.patch		\
   %D%/packages/patches/linux-pam-unix_chkpwd.patch		\
   %D%/packages/patches/linuxdcpp-openssl-1.1.patch		\
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 67128524ff..aabbc7fc17 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -34,7 +34,7 @@
 ;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com>
 ;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
 ;;; Copyright © 2019 mikadoZero <mikadozero@yandex.com>
-;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2019, 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2019 Stefan Stefanović <stefanx2ovic@gmail.com>
 ;;; Copyright © 2019-2022 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net>
@@ -641,28 +641,39 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
 (define-public linux-libre-6.4-source
   (source-with-patches linux-libre-6.4-pristine-source
                        (list %boot-logo-patch
-                             %linux-libre-arm-export-__sync_icache_dcache-patch)))
+                             %linux-libre-arm-export-__sync_icache_dcache-patch
+                             (search-patch
+                              "linux-libre-wireguard-postup-privkey.patch"))))
 
 (define-public linux-libre-6.3-source
   (source-with-patches linux-libre-6.3-pristine-source
                        (list %boot-logo-patch
-                             %linux-libre-arm-export-__sync_icache_dcache-patch)))
+                             %linux-libre-arm-export-__sync_icache_dcache-patch
+                             (search-patch
+                              "linux-libre-wireguard-postup-privkey.patch"))))
 
 (define-public linux-libre-6.1-source
   (source-with-patches linux-libre-6.1-pristine-source
-                       (list %boot-logo-patch
-                             %linux-libre-arm-export-__sync_icache_dcache-patch
-                             (search-patch "linux-libre-infodocs-target.patch"))))
+                       (append
+                        (list %boot-logo-patch
+                              %linux-libre-arm-export-__sync_icache_dcache-patch)
+                        (search-patches
+                         "linux-libre-infodocs-target.patch"
+                         "linux-libre-wireguard-postup-privkey.patch"))))
 
 (define-public linux-libre-5.15-source
   (source-with-patches linux-libre-5.15-pristine-source
                        (list %boot-logo-patch
-                             %linux-libre-arm-export-__sync_icache_dcache-patch)))
+                             %linux-libre-arm-export-__sync_icache_dcache-patch
+                             (search-patch
+                              "linux-libre-wireguard-postup-privkey.patch"))))
 
 (define-public linux-libre-5.10-source
   (source-with-patches linux-libre-5.10-pristine-source
                        (list %boot-logo-patch
-                             %linux-libre-arm-export-__sync_icache_dcache-patch)))
+                             %linux-libre-arm-export-__sync_icache_dcache-patch
+                             (search-patch
+                              "linux-libre-wireguard-postup-privkey.patch"))))
 
 (define-public linux-libre-5.4-source
   (source-with-patches linux-libre-5.4-pristine-source
diff --git a/gnu/packages/patches/linux-libre-wireguard-postup-privkey.patch b/gnu/packages/patches/linux-libre-wireguard-postup-privkey.patch
new file mode 100644
index 0000000000..a6050499e1
--- /dev/null
+++ b/gnu/packages/patches/linux-libre-wireguard-postup-privkey.patch
@@ -0,0 +1,119 @@
+From 3ac1bf099766f1e9735883d5127148054cd5b30a Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Thu, 18 May 2023 03:08:44 +0200
+Subject: wireguard: netlink: send staged packets when setting initial private
+ key
+
+Packets bound for peers can queue up prior to the device private key
+being set. For example, if persistent keepalive is set, a packet is
+queued up to be sent as soon as the device comes up. However, if the
+private key hasn't been set yet, the handshake message never sends, and
+no timer is armed to retry, since that would be pointless.
+
+But, if a user later sets a private key, the expectation is that those
+queued packets, such as a persistent keepalive, are actually sent. So
+adjust the configuration logic to account for this edge case, and add a
+test case to make sure this works.
+
+Maxim noticed this with a wg-quick(8) config to the tune of:
+
+    [Interface]
+    PostUp = wg set %i private-key somefile
+
+    [Peer]
+    PublicKey = ...
+    Endpoint = ...
+    PersistentKeepalive = 25
+
+Here, the private key gets set after the device comes up using a PostUp
+script, triggering the bug.
+
+Fixes: e7096c131e51 ("net: WireGuard secure network tunnel")
+Cc: stable@vger.kernel.org
+Reported-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
+Link: https://lore.kernel.org/wireguard/87fs7xtqrv.fsf@gmail.com/
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+---
+ drivers/net/wireguard/netlink.c            | 14 +++++++++-----
+ tools/testing/selftests/wireguard/netns.sh | 30 ++++++++++++++++++++++++++----
+ 2 files changed, 35 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/net/wireguard/netlink.c b/drivers/net/wireguard/netlink.c
+index 43c8c84e7ea8..6d1bd9f52d02 100644
+--- a/drivers/net/wireguard/netlink.c
++++ b/drivers/net/wireguard/netlink.c
+@@ -546,6 +546,7 @@ static int wg_set_device(struct sk_buff *skb, struct genl_info *info)
+ 		u8 *private_key = nla_data(info->attrs[WGDEVICE_A_PRIVATE_KEY]);
+ 		u8 public_key[NOISE_PUBLIC_KEY_LEN];
+ 		struct wg_peer *peer, *temp;
++		bool send_staged_packets;
+ 
+ 		if (!crypto_memneq(wg->static_identity.static_private,
+ 				   private_key, NOISE_PUBLIC_KEY_LEN))
+@@ -564,14 +565,17 @@ static int wg_set_device(struct sk_buff *skb, struct genl_info *info)
+ 		}
+ 
+ 		down_write(&wg->static_identity.lock);
+-		wg_noise_set_static_identity_private_key(&wg->static_identity,
+-							 private_key);
+-		list_for_each_entry_safe(peer, temp, &wg->peer_list,
+-					 peer_list) {
++		send_staged_packets = !wg->static_identity.has_identity && netif_running(wg->dev);
++		wg_noise_set_static_identity_private_key(&wg->static_identity, private_key);
++		send_staged_packets = send_staged_packets && wg->static_identity.has_identity;
++
++		wg_cookie_checker_precompute_device_keys(&wg->cookie_checker);
++		list_for_each_entry_safe(peer, temp, &wg->peer_list, peer_list) {
+ 			wg_noise_precompute_static_static(peer);
+ 			wg_noise_expire_current_peer_keypairs(peer);
++			if (send_staged_packets)
++				wg_packet_send_staged_packets(peer);
+ 		}
+-		wg_cookie_checker_precompute_device_keys(&wg->cookie_checker);
+ 		up_write(&wg->static_identity.lock);
+ 	}
+ skip_set_private_key:
+diff --git a/tools/testing/selftests/wireguard/netns.sh b/tools/testing/selftests/wireguard/netns.sh
+index 69c7796c7ca9..405ff262ca93 100755
+--- a/tools/testing/selftests/wireguard/netns.sh
++++ b/tools/testing/selftests/wireguard/netns.sh
+@@ -514,10 +514,32 @@ n2 bash -c 'printf 0 > /proc/sys/net/ipv4/conf/all/rp_filter'
+ n1 ping -W 1 -c 1 192.168.241.2
+ [[ $(n2 wg show wg0 endpoints) == "$pub1	10.0.0.3:1" ]]
+ 
+-ip1 link del veth1
+-ip1 link del veth3
+-ip1 link del wg0
+-ip2 link del wg0
++ip1 link del dev veth3
++ip1 link del dev wg0
++ip2 link del dev wg0
++
++# Make sure persistent keep alives are sent when an adapter comes up
++ip1 link add dev wg0 type wireguard
++n1 wg set wg0 private-key <(echo "$key1") peer "$pub2" endpoint 10.0.0.1:1 persistent-keepalive 1
++read _ _ tx_bytes < <(n1 wg show wg0 transfer)
++[[ $tx_bytes -eq 0 ]]
++ip1 link set dev wg0 up
++read _ _ tx_bytes < <(n1 wg show wg0 transfer)
++[[ $tx_bytes -gt 0 ]]
++ip1 link del dev wg0
++# This should also happen even if the private key is set later
++ip1 link add dev wg0 type wireguard
++n1 wg set wg0 peer "$pub2" endpoint 10.0.0.1:1 persistent-keepalive 1
++read _ _ tx_bytes < <(n1 wg show wg0 transfer)
++[[ $tx_bytes -eq 0 ]]
++ip1 link set dev wg0 up
++read _ _ tx_bytes < <(n1 wg show wg0 transfer)
++[[ $tx_bytes -eq 0 ]]
++n1 wg set wg0 private-key <(echo "$key1")
++read _ _ tx_bytes < <(n1 wg show wg0 transfer)
++[[ $tx_bytes -gt 0 ]]
++ip1 link del dev veth1
++ip1 link del dev wg0
+ 
+ # We test that Netlink/IPC is working properly by doing things that usually cause split responses
+ ip0 link add dev wg0 type wireguard
+-- 
+cgit v1.2.3-59-g8ed1b
+
-- 
cgit 1.4.1


From cdaaeb915fb1c0bbc0908605e76b891c05293a69 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: ode: Update to 0.16.4.

* gnu/packages/game-development.scm (ode): Update to 0.16.4.
---
 gnu/packages/game-development.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 5668672f4d..9d1a429662 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2663,14 +2663,14 @@ a.k.a. XenoCollide) as described in Game Programming Gems 7.")
 (define-public ode
   (package
     (name "ode")
-    (version "0.16.3")
+    (version "0.16.4")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://bitbucket.org/odedevs/ode/downloads/"
                            "ode-" version ".tar.gz"))
        (sha256
-        (base32 "04y40czkh71m1p2r8ddfn5bajvlh7yyfa928jvi8qipwkgsdnhf7"))
+        (base32 "0rrl4pn4h3g0ay0i3n61pr6bwyk9vgar17vjal56pj66h617n0vi"))
        (modules '((guix build utils)))
        (snippet
         '(begin
-- 
cgit 1.4.1


From dbaa8fdfaf131642e6ba083e1c5bc53ac72fe4f7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: diffoscope: Update to 245.

* gnu/packages/diffoscope.scm (diffoscope): Update to 245.
---
 gnu/packages/diffoscope.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 5846c4cbd4..7dc6ecfa7b 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -74,7 +74,7 @@
 (define-public diffoscope
   (package
     (name "diffoscope")
-    (version "244")
+    (version "245")
     (source
      (origin
        (method git-fetch)
@@ -83,7 +83,7 @@
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "16v6p970kckyv5pa93sj7r5k4b0hgbyralvzddbj73g7srysa02v"))))
+        (base32 "0zh2smp0vvvl1c4f5ykmblw0xlbdfnix1v2yi5xpyia2pgslbjjv"))))
     (build-system python-build-system)
     (arguments
      (list
-- 
cgit 1.4.1


From 19f6c16dba8c07ec28e2c9fea225274cbe77bf73 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:04 +0200
Subject: gnu: srecord: Update to 1.65.0.

* gnu/packages/flashing-tools.scm (srecord): Update to 1.65.0.
[source]: Add a snippet to fix the very special build system.
[arguments]: Rewrite using G-expressions.  Remove the old
[native-inputs]: Remove bison and libtool.  Add doxygen,
graphviz, psutils, perl, and perl-ipc-run3.
---
 gnu/packages/flashing-tools.scm | 59 +++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index 19219a6d7e..85b3988729 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -46,13 +46,16 @@
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages embedded)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages graphviz)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages pciutils)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages libftdi)
@@ -475,30 +478,58 @@ Unifinished Extensible Firmware Interface (UEFI) images.")
 (define-public srecord
   (package
     (name "srecord")
-    (version "1.64")
+    (version "1.65.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://sourceforge/srecord/srecord/"
-                           version "/srecord-" version ".tar.gz"))
+                           (version-major+minor version) "/"
+                           "srecord-" version "-Source.tar.gz"))
        (sha256
-        (base32
-         "1qk75q0k5vzmm3932q9hqz2gp8n9rrdfjacsswxc02656f3l3929"))))
-    (build-system gnu-build-system)
+        (base32 "0i3n6g8i28xx8761nadm6p2nf9y31bywx0isyi0h9rawy5yd1hw1"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Fix building without Git.  Upstream tries to allow it but is buggy.
+           (substitute* "etc/configure.cmake"
+             (("\\(GIT_SHA1\\)") "(FALSE)"))
+           ;; It also tries to install the entire RUNTIME_DEPENDENCY_SET of
+           ;; each executable: libm, libc, libstc++ & more!  Get the cluehammer.
+           (substitute* "etc/packaging.cmake"
+             ((".*# Find standard library DLL.*" match)
+              "ENDFUNCTION()\n\nFUNCTION(WTF no)\n"))
+           ;; Now stop it from deliberately clobbering -DCMAKE_INSTALL_PREFIX.
+           (substitute* "CMakeLists.txt"
+             (("set\\(CMAKE_INSTALL_PREFIX") "#"))))))
+    (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags
-       (list (string-append "SH="
-                            (assoc-ref %build-inputs "bash")
-                            "/bin/bash"))))
+     (list
+      #:modules '((guix build cmake-build-system)
+                  (guix build utils)
+                  (srfi srfi-26))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'make-tests-executable
+            (lambda _
+              (for-each
+               (cut chmod <> #o755)
+               ;; We're in a parallel build directory to the sources and tests.
+               (find-files ".." "\\.sh$")))))))
     (inputs
      (list boost libgcrypt))
     (native-inputs
-     (list bison
-           diffutils
-           ghostscript
+     (list doxygen
+           ghostscript                ; for ps2pdf
+           graphviz                   ; the build scripts call this ‘doxygen’…
            groff
-           libtool
-           which))
+           psutils
+           ;; For the tests.
+           diffutils
+           which
+           ;; XXX Work around Guix's currently-broken psutils package.  Remove
+           ;; both and maybe (gnu packages perl) when core-updates is merged.
+           perl
+           perl-ipc-run3))
     (home-page "https://srecord.sourceforge.net/")
     (synopsis "Tools for EPROM files")
     (description "The SRecord package is a collection of powerful tools for
-- 
cgit 1.4.1


From 42962a9ddbf3ab538115348b366b9c64564fac13 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: snapcast: Update to 0.27.0.

* gnu/packages/audio.scm (snapcast): Update to 0.27.0.
---
 gnu/packages/audio.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 437ccd53de..8c15189b2b 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1416,7 +1416,7 @@ envelope follower, distortion effects, tape effects and more.")
 (define-public snapcast
   (package
     (name "snapcast")
-    (version "0.26.0")
+    (version "0.27.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1425,7 +1425,7 @@ envelope follower, distortion effects, tape effects and more.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "091gf3k1xv3k0m0kf2apr9bwiifw2czjcksd3vzwy544sfgrya08"))))
+                "10l5hvmaqr9ykipsnzl95wqg19ff36rhpa1q88axxcia0k2valkn"))))
     (build-system cmake-build-system)
     (arguments
      '(#:tests? #f))                    ; no included tests
-- 
cgit 1.4.1


From 2103e7c0fcb3509c5d03963594b847524b0003d6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: wla-dx: Update to 10.5.

* gnu/packages/assembly.scm (wla-dx): Update to 10.5.
---
 gnu/packages/assembly.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index 9cbdb53328..488d0725eb 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -346,7 +346,7 @@ package for the Game Boy and Game Boy Color.  It consists of:
 (define-public wla-dx
   (package
     (name "wla-dx")
-    (version "10.1")
+    (version "10.5")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -355,7 +355,7 @@ package for the Game Boy and Game Boy Color.  It consists of:
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1nh2k2xn5fj389gq68f3fxgrxakgn8c6dw2ffqay86s3706hac9w"))))
+                "1h6apmhaks4772s2cja34ck488p8yhb3nscbxjw5061ml2046zqq"))))
     (build-system cmake-build-system)
     (native-inputs (list python-sphinx)) ; to generate man pages
     (arguments
-- 
cgit 1.4.1


From eb12f3fd8bee99920118ec802ffbac8f1ab676b9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:00 +0200
Subject: gnu: wla-dx: Use G-expressions.

* gnu/packages/assembly.scm (wla-dx)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/assembly.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index 488d0725eb..42c95876f7 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -359,16 +359,17 @@ package for the Game Boy and Game Boy Color.  It consists of:
     (build-system cmake-build-system)
     (native-inputs (list python-sphinx)) ; to generate man pages
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'copy-tests-to-build-directory
-           (lambda _
-             (copy-recursively "../source/tests" "tests")))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (let ((sh (which "sh")))
-               (when tests?
-                 (invoke sh "../source/run_tests.sh"))))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'copy-tests-to-build-directory
+            (lambda _
+              (copy-recursively "../source/tests" "tests")))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (let ((sh (which "sh")))
+                (when tests?
+                  (invoke sh "../source/run_tests.sh"))))))))
     (home-page "https://github.com/vhelin/wla-dx")
     (synopsis "Assemblers for various processors")
     (description "WLA DX is a set of tools to assemble assembly files to
-- 
cgit 1.4.1


From 1d8220216ec5998d5fd001f037d7cffcb8d6003f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:04 +0200
Subject: gnu: purescript: Update to 0.15.10.

* gnu/packages/purescript.scm (purescript): Update to 0.15.10.
---
 gnu/packages/purescript.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/purescript.scm b/gnu/packages/purescript.scm
index df9267692a..75633895e6 100644
--- a/gnu/packages/purescript.scm
+++ b/gnu/packages/purescript.scm
@@ -34,13 +34,13 @@
 (define-public purescript
   (package
     (name "purescript")
-    (version "0.15.9")
+    (version "0.15.10")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "purescript" version))
        (sha256
-        (base32 "1i9wszs5kwwq0l8l4if05y8xc8fih10assrdj8q1ipr0hx3zjawm"))))
+        (base32 "08pashk8pm4yjsaq2g94sqa2yd3rfq9fwpxa9qccvjv6in9zybf1"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "purescript")))
     (inputs (list ghc-aeson
-- 
cgit 1.4.1


From bf767b2907df62e446cc26e599c30e7e6e11b86d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: purescript: Use G-expressions.

* gnu/packages/purescript.scm (purescript)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/purescript.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/purescript.scm b/gnu/packages/purescript.scm
index 75633895e6..ef58ecbf82 100644
--- a/gnu/packages/purescript.scm
+++ b/gnu/packages/purescript.scm
@@ -26,6 +26,7 @@
   #:use-module (gnu packages haskell-web)
   #:use-module ((gnu packages python) #:select (python))
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module (guix build-system haskell)
@@ -96,21 +97,23 @@
                          ghc-typed-process
                          ghc-happy))
     (arguments
-     `(;; Tests require npm
-       #:tests? #f
-       #:configure-flags '("--flags=release")
+     (list
+      ;; Tests require npm
+      #:tests? #f
+       #:configure-flags
+       #~(list "--flags=release")
        #:haddock? #f
        #:phases
-       (modify-phases %standard-phases
+       #~(modify-phases %standard-phases
          (add-before 'configure 'update-constraints
            (lambda _
              (substitute* "purescript.cabal"
                (("\\b(language-javascript|process)\\s+[^,]+" all dep)
                 dep))))
          (add-after 'register 'remove-libraries
-           (lambda* (#:key outputs #:allow-other-keys)
+           (lambda _
              (delete-file-recursively
-               (string-append (assoc-ref outputs "out") "/lib")))))))
+               (string-append #$output "/lib")))))))
     (home-page "https://www.purescript.org/")
     (synopsis "Haskell inspired programming language compiling to JavaScript")
     (description
-- 
cgit 1.4.1


From d047e824dd3441338d95bf7386cfa72cbadee4f0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:05 +0200
Subject: gnu: qtractor: Update to 0.9.34.

* gnu/packages/music.scm (qtractor): Update to 0.9.34.
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 7b7075035f..8656716fd3 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3482,14 +3482,14 @@ from the command line.")
 (define-public qtractor
   (package
     (name "qtractor")
-    (version "0.9.31")
+    (version "0.9.34")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://downloads.sourceforge.net/qtractor/"
                                   "qtractor-" version ".tar.gz"))
               (sha256
                (base32
-                "0kyb1ylnwlc4vzhar669n6n9w0pbs9ixqnfanlzfwdbw1sn3gzyy"))))
+                "0w6g51jhj9c72j6qjjkjhiq0vwklb6q4cr3xgj4mzp0iw279hbjz"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f))                    ; no "check" target
-- 
cgit 1.4.1


From 0a622853506b82b2f9ac8fa5c9a396c8a0570843 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: gallery-dl: Update to 1.25.8.

* gnu/packages/video.scm (gallery-dl): Update to 1.25.8.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 0aa149051c..e366f0d2e0 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2338,7 +2338,7 @@ the last played position, etc.")
 (define-public gallery-dl
   (package
     (name "gallery-dl")
-    (version "1.25.1")
+    (version "1.25.8")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/mikf/gallery-dl"
@@ -2346,7 +2346,7 @@ the last played position, etc.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1zhcd5qnnlmr0qp72rj4bfw0lz4gz1bl65wfn7w21c2xr36nbkxs"))))
+                "0dshv4j2gmvd2grwcvp1vsrqsji05r13jvw0cqi9srl66kvqbbga"))))
     (build-system python-build-system)
     (inputs (list python-requests ffmpeg))
     (home-page "https://github.com/mikf/gallery-dl")
-- 
cgit 1.4.1


From ec2016e8b88969c8f15ed5eeff692984e721bcbe Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: osinfo-db: Update to 20230719.

* gnu/packages/virtualization.scm (osinfo-db): Update to 20230719.
---
 gnu/packages/virtualization.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 9b1bdeb5e4..7dd52839b4 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2465,14 +2465,14 @@ administrators and developers in managing the database.")
 (define-public osinfo-db
   (package
     (name "osinfo-db")
-    (version "20230518")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "0vfch55xgz1p16sv84ahb59apg8j7n8p4kxv0rq7rw7jwk65pv6a"))))
+    (version "20230719")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-"
+                           version ".tar.xz"))
+       (sha256
+        (base32 "0nl4wh8i9skcg1wx84p31x7rl1xv1267g5ycbn9kfwfnqxzwkl8k"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
-- 
cgit 1.4.1


From fa005d8a5b3fc5d6a2d057fd7af325f6a1279370 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: osinfo-db: Use G-expressions.

* gnu/packages/virtualization.scm (osinfo-db)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/virtualization.scm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 7dd52839b4..3f6c32f390 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2475,18 +2475,18 @@ administrators and developers in managing the database.")
         (base32 "0nl4wh8i9skcg1wx84p31x7rl1xv1267g5ycbn9kfwfnqxzwkl8k"))))
     (build-system trivial-build-system)
     (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let* ((out (assoc-ref %outputs "out"))
-                (osinfo-dir (string-append out "/share/osinfo"))
+     (list
+      #:modules '((guix build utils))
+      #:builder
+      #~(begin
+          (use-modules (guix build utils))
+          (let ((osinfo (string-append #$output "/share/osinfo"))
                 (source (assoc-ref %build-inputs "source"))
-                (osinfo-db-import
-                 (string-append (assoc-ref %build-inputs "osinfo-db-tools")
+                (import-osinfo-db
+                 (string-append #$(this-package-native-input "osinfo-db-tools")
                                 "/bin/osinfo-db-import")))
-           (mkdir-p osinfo-dir)
-           (invoke osinfo-db-import "--dir" osinfo-dir source)))))
+            (mkdir-p osinfo)
+            (invoke import-osinfo-db "--dir" osinfo source)))))
     (native-inputs
      (list intltool osinfo-db-tools))
     (home-page "https://gitlab.com/libosinfo/osinfo-db")
-- 
cgit 1.4.1


From 7967da108860f453180afb2446a5758c04b577d0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: labwc: Update to 0.6.4.

* gnu/packages/wm.scm (labwc): Update to 0.6.4.
---
 gnu/packages/wm.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 5c614be735..f2c050408e 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2899,7 +2899,7 @@ read and write, and compatible with JSON.")
 (define-public labwc
   (package
     (name "labwc")
-    (version "0.6.3")
+    (version "0.6.4")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2908,7 +2908,7 @@ read and write, and compatible with JSON.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1zbgj8r8ppvqnz2imh6f825f2lvsqpiqfa0r5g5r4nsvadiipivp"))))
+                "00ajr7s8qywdfa9vhlfc02p1wwdcqaaa09pm1im9w6mrvb904lzh"))))
     (build-system meson-build-system)
     (native-inputs
      (list pkg-config gettext-minimal scdoc))
-- 
cgit 1.4.1


From d23ced7cc1d59af4bf8cac28e332ca29bc7b93e1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: mygui: Update to 3.4.2.

* gnu/packages/game-development.scm (mygui): Update to 3.4.2.
(mygui-gl)[inputs]: Add libglvnd, and a union of sdl2 and sdl2-image.
---
 gnu/packages/game-development.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 9d1a429662..af467dbb38 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1713,7 +1713,7 @@ robust and compatible with many systems and operating systems.")
 (define-public mygui
   (package
     (name "mygui")
-    (version "3.4.1")
+    (version "3.4.2")
     (source
      (origin
        (method git-fetch)
@@ -1722,8 +1722,7 @@ robust and compatible with many systems and operating systems.")
              (commit (string-append "MyGUI" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1gyd4bzm6qqpqw6is065qs5c729gl6rp989bnkygha6q4s371vz6"))))
+        (base32 "0gkfahz118gpqa2906cjb3d4w8g13rv8v3ma7s0ml9l5cci785f8"))))
     (build-system cmake-build-system)
     (arguments
      '(#:tests? #f                      ; No test target
@@ -1770,7 +1769,10 @@ of use.")
     (inputs
      (modify-inputs (package-inputs mygui)
        (delete "ogre")
-       (prepend mesa glu)))
+       (prepend glu
+                libglvnd                ; for find_package(… GLX)
+                mesa                    ; for find_package(… OpenGL …)
+                (sdl-union (list sdl2 sdl2-image)))))
     (synopsis "Fast, flexible and simple GUI (OpenGL backend)")))
 
 (define-public openmw
-- 
cgit 1.4.1


From 6984151a834d1d27f0b35c250bd57273783f7d5f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: cryfs: Update to 0.11.4.

* gnu/packages/crypto.scm (cryfs): Update to 0.11.4.
[arguments]: Remove obsolete phase.
---
 gnu/packages/crypto.scm | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 91acedbc97..0f1e70f4dc 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -1479,7 +1479,7 @@ non-encrypted files.")
 (define-public cryfs
   (package
     (name "cryfs")
-    (version "0.11.3")
+    (version "0.11.4")
     (source
      (origin
        (method url-fetch)
@@ -1487,7 +1487,7 @@ non-encrypted files.")
              "https://github.com/cryfs/cryfs/releases/download/"
              version "/cryfs-" version ".tar.xz"))
        (sha256
-        (base32 "1h41dhdfk2nll0vx5i66mgrdalv6kccwq5yx99gridywxw6qxxhq"))))
+        (base32 "0a48qijfrd02ianp19x3kz24w1pgigmlxdr5nks0gag7z5b2s7m7"))))
     (build-system cmake-build-system)
     (arguments
      '(#:modules ((guix build cmake-build-system)
@@ -1514,14 +1514,7 @@ non-encrypted files.")
              (when tests?
                (substitute* "CMakeLists.txt"
                  (("option.BUILD_TESTING .build test cases. OFF.")
-                  "option(BUILD_TESTING \"build test cases\" ON)")))
-             ;; work around a missing import fixed upstream in boost 1.78
-             ;; See https://github.com/boostorg/process/issues/213
-             (substitute* (find-files "." "subprocess.cpp$")
-               (("#include <boost/process.hpp>.*" line)
-                (string-append
-                 "#include <algorithm>\n"
-                 line)))))
+                  "option(BUILD_TESTING \"build test cases\" ON)")))))
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
-- 
cgit 1.4.1


From 8b13984fac92f78ac1585e5b8ebbd34eec41f739 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:00 +0200
Subject: gnu: gitolite: Update to 3.6.13.

* gnu/packages/version-control.scm (gitolite): Update to 3.6.13.
---
 gnu/packages/version-control.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 2f70655ac1..6a11cba42d 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1519,7 +1519,7 @@ also walk each side of a merge and test those changes individually.")
 wrappers, to be used for optional gitolite extensions."
   (package
     (name "gitolite")
-    (version "3.6.12")
+    (version "3.6.13")
     (source
      (origin
        (method git-fetch)
@@ -1528,10 +1528,10 @@ wrappers, to be used for optional gitolite extensions."
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "05xw1pmagvkrbzga5pgl3xk9qyc6b5x73f842454f3w9ijspa8zy"))))
+        (base32 "0lp4hi8pfg7k0fk0l8wzs8hxp1aspzv78nkafdbbq8m9lzwnwl7x"))))
     (build-system gnu-build-system)
     (arguments
-     (list #:tests? #f ; no tests
+     (list #:tests? #f                  ; no tests
            #:phases
            #~(modify-phases %standard-phases
                (delete 'configure)
-- 
cgit 1.4.1


From 43726107316849c258158ceb875d2e20dee35450 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: openssh: Update to 9.3p2.

* gnu/packages/ssh.scm (openssh): Update to 9.3p2.
---
 gnu/packages/ssh.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 0ac9d78482..826edb6996 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -198,7 +198,7 @@ a server that supports the SSH-2 protocol.")
 (define-public openssh
   (package
    (name "openssh")
-   (version "9.3p1")
+   (version "9.3p2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://openbsd/OpenSSH/portable/"
@@ -207,7 +207,7 @@ a server that supports the SSH-2 protocol.")
                                       "openssh-trust-guix-store-directory.patch"))
              (sha256
               (base32
-               "1a7qia3c255igny5kf00m5zxkp69lf1w6qjsv3rm2sm705vvmfp9"))))
+               "1s3nqv57r3l7avsdkzwd575dvxra8h19xpqczl0z3cvcgwabw3i0"))))
    (build-system gnu-build-system)
    (native-inputs (list groff pkg-config))
    (inputs `(("libedit" ,libedit)
-- 
cgit 1.4.1


From 12971d26efa3676b42a026d13d584e6bd8aef975 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: openssh: Remove input labels.

* gnu/packages/ssh.scm (openssh)[inputs]: Remove input labels.
(openssh-sans-x)[inputs]: Use MODIFY-INPUTS.
---
 gnu/packages/ssh.scm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 826edb6996..fba1fc1734 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -210,15 +210,16 @@ a server that supports the SSH-2 protocol.")
                "1s3nqv57r3l7avsdkzwd575dvxra8h19xpqczl0z3cvcgwabw3i0"))))
    (build-system gnu-build-system)
    (native-inputs (list groff pkg-config))
-   (inputs `(("libedit" ,libedit)
-             ("openssl" ,openssl)
-             ,@(if (target-hurd?)
-                   '()
-                   `(("pam" ,linux-pam)
-                     ("libfido2" ,libfido2)))     ;fails to build on GNU/Hurd
-             ("mit-krb5" ,mit-krb5)
-             ("zlib" ,zlib)
-             ("xauth" ,xauth)))        ; for 'ssh -X' and 'ssh -Y'
+   (inputs
+    (cons* libedit
+           openssl
+           mit-krb5
+           zlib
+           xauth                        ; for 'ssh -X' and 'ssh -Y'
+           (if (target-hurd?)
+               '()
+               (list linux-pam
+                     libfido2))))       ; fails to build on GNU/Hurd
    (arguments
     `(#:test-target "tests"
       ;; Otherwise, the test scripts try to use a nonexistent directory and
@@ -324,7 +325,8 @@ Additionally, various channel-specific options can be negotiated.")
   (package
     (inherit openssh)
     (name "openssh-sans-x")
-    (inputs (alist-delete "xauth" (package-inputs openssh)))
+    (inputs (modify-inputs (package-inputs openssh)
+              (delete "xauth")))
     (synopsis "OpenSSH client and server without X11 support")))
 
 (define-public guile-ssh
-- 
cgit 1.4.1


From b56fe521de9b8238839546f84abaebcada623d44 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:03 +0200
Subject: gnu: openssh: Use G-expressions.

* gnu/packages/ssh.scm (openssh)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/ssh.scm | 136 ++++++++++++++++++++++++---------------------------
 1 file changed, 63 insertions(+), 73 deletions(-)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index fba1fc1734..81fbfd87a1 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -209,6 +209,69 @@ a server that supports the SSH-2 protocol.")
               (base32
                "1s3nqv57r3l7avsdkzwd575dvxra8h19xpqczl0z3cvcgwabw3i0"))))
    (build-system gnu-build-system)
+   (arguments
+    (list
+     #:test-target "tests"
+     ;; Otherwise, the test scripts try to use a nonexistent directory and fail.
+     #:make-flags
+     #~(list "REGRESSTMP=\"$${BUILDDIR}/regress\"")
+     #:configure-flags
+     #~(append
+        (list "--sysconfdir=/etc/ssh"
+              ;; Default value of 'PATH' used by sshd.
+              "--with-default-path=/run/current-system/profile/bin"
+              ;; configure needs to find krb5-config.
+              (string-append "--with-kerberos5="
+                             #$(this-package-input "mit-krb5")
+                             "/bin")
+              ;; libedit is needed for sftp completion.
+              "--with-libedit")
+        ;; Enable PAM support in sshd.
+        (if #$(target-hurd?)
+            '()
+            (list "--with-pam"
+                  ;; Support creation and use of ecdsa-sk, ed25519-sk keys.
+                  "--with-security-key-builtin"))
+        ;; "make install" runs "install -s" by default, which doesn't work for
+        ;; cross-compiled binaries because it invokes 'strip' instead of
+        ;; 'TRIPLET-strip'.  Work around this.
+        (if #$(%current-target-system)
+            (list "--disable-strip")
+            '()))
+     #:phases
+     #~(modify-phases %standard-phases
+         (add-after 'configure 'reset-/var/empty
+           (lambda _
+             (substitute* "Makefile"
+               (("PRIVSEP_PATH=/var/empty")
+                (string-append "PRIVSEP_PATH=" #$output "/var/empty")))))
+         (add-after 'configure 'set-store-location
+           (lambda _
+             (substitute* "misc.c"
+               (("@STORE_DIRECTORY@")
+                (string-append "\"" (%store-directory) "\"")))))
+         (add-before 'check 'patch-tests
+           (lambda _
+             (substitute* "regress/test-exec.sh"
+               (("/bin/sh") (which "sh")))
+
+             ;; Remove 't-exec' regress target which requires user 'sshd'.
+             (substitute* (list "Makefile"
+                                "regress/Makefile")
+               (("^(tests:.*) t-exec(.*)" all pre post)
+                (string-append pre post)))))
+         (replace 'install
+           (lambda* (#:key (make-flags '()) #:allow-other-keys)
+             ;; Install without host keys and system configuration files.  This
+             ;; will install /var/empty to the store, which is needed by the
+             ;; system openssh-service-type.
+             (apply invoke "make" "install-nosysconf" make-flags)
+             (with-directory-excursion "contrib"
+               (chmod "ssh-copy-id" #o555)
+               (install-file "ssh-copy-id"
+                             (string-append #$output "/bin/"))
+               (install-file "ssh-copy-id.1"
+                             (string-append #$output "/share/man/man1/"))))))))
    (native-inputs (list groff pkg-config))
    (inputs
     (cons* libedit
@@ -220,79 +283,6 @@ a server that supports the SSH-2 protocol.")
                '()
                (list linux-pam
                      libfido2))))       ; fails to build on GNU/Hurd
-   (arguments
-    `(#:test-target "tests"
-      ;; Otherwise, the test scripts try to use a nonexistent directory and
-      ;; fail.
-      #:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"")
-      #:configure-flags  `("--sysconfdir=/etc/ssh"
-
-                           ;; Default value of 'PATH' used by sshd.
-                          "--with-default-path=/run/current-system/profile/bin"
-
-                          ;; configure needs to find krb5-config.
-                          ,(string-append "--with-kerberos5="
-                                          (assoc-ref %build-inputs "mit-krb5")
-                                          "/bin")
-
-                          ;; libedit is needed for sftp completion.
-                          "--with-libedit"
-
-                          ;; Enable PAM support in sshd.
-                          ,,@(if (target-hurd?)
-                               '()
-                               '("--with-pam"
-
-                                 ;; Support creation and use of ecdsa-sk,
-                                 ;; ed25519-sk keys.
-                                 "--with-security-key-builtin"))
-
-
-
-                          ;; "make install" runs "install -s" by default,
-                          ;; which doesn't work for cross-compiled binaries
-                          ;; because it invokes 'strip' instead of
-                          ;; 'TRIPLET-strip'.  Work around this.
-                          ,,@(if (%current-target-system)
-                                 '("--disable-strip")
-                                 '()))
-
-      #:phases
-      (modify-phases %standard-phases
-        (add-after 'configure 'reset-/var/empty
-         (lambda* (#:key outputs #:allow-other-keys)
-           (let ((out (assoc-ref outputs "out")))
-             (substitute* "Makefile"
-               (("PRIVSEP_PATH=/var/empty")
-                (string-append "PRIVSEP_PATH=" out "/var/empty"))))))
-        (add-after 'configure 'set-store-location
-          (lambda* _
-            (substitute* "misc.c"
-              (("@STORE_DIRECTORY@")
-               (string-append "\"" (%store-directory) "\"")))))
-        (add-before 'check 'patch-tests
-         (lambda _
-           (substitute* "regress/test-exec.sh"
-             (("/bin/sh") (which "sh")))
-
-           ;; Remove 't-exec' regress target which requires user 'sshd'.
-           (substitute* (list "Makefile"
-                              "regress/Makefile")
-             (("^(tests:.*) t-exec(.*)" all pre post)
-              (string-append pre post)))))
-        (replace 'install
-          (lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
-            (let ((out (assoc-ref outputs "out")))
-              ;; Install without host keys and system configuration files.
-              ;; This will install /var/empty to the store, which is needed
-              ;; by the system openssh-service-type.
-              (apply invoke "make" "install-nosysconf" make-flags)
-              (with-directory-excursion "contrib"
-                (chmod "ssh-copy-id" #o555)
-                (install-file "ssh-copy-id"
-                              (string-append out "/bin/"))
-                (install-file "ssh-copy-id.1"
-                              (string-append out "/share/man/man1/")))))))))
    (synopsis "Client and server for the secure shell (ssh) protocol")
    (description
     "The SSH2 protocol implemented in OpenSSH is standardised by the
-- 
cgit 1.4.1


From 03ae5bb866151de7c19561a7da6f477156e4b305 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:03 +0200
Subject: gnu: foot: Update to 1.15.1.

* gnu/packages/terminals.scm (foot): Update to 1.15.1.
---
 gnu/packages/terminals.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 21649f78af..9b705c874f 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -842,7 +842,7 @@ eye-candy, customizable, and reasonably lightweight.")
 (define-public foot
   (package
     (name "foot")
-    (version "1.14.0")
+    (version "1.15.1")
     (home-page "https://codeberg.org/dnkl/foot")
     (source (origin
               (method git-fetch)
@@ -850,7 +850,7 @@ eye-candy, customizable, and reasonably lightweight.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1187805pxygyl547w75i4cl37kaw8y8ng11r5qqldv6fm74k31mk"))))
+                "1h2gbnfikqpgr9ylwl5wpyzgcgzfxnbi83j33rxx2ppy54yjcb30"))))
     (build-system meson-build-system)
     (arguments
      `(;; Using a "release" build is recommended both for performance, and
-- 
cgit 1.4.1


From 3ec8acd3dfe9f512acb8bfa3cf572d5de03d1a3b Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Thu, 13 Jul 2023 21:04:11 +0200
Subject: gnu: agda-cubical: Update to 0.5.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/agda.scm (agda-cubical): Update to 0.5.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/agda.scm | 51 ++++++++++++++++++++++++---------------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm
index 88626b823c..3748ab7059 100644
--- a/gnu/packages/agda.scm
+++ b/gnu/packages/agda.scm
@@ -262,34 +262,31 @@ try agda-prelude instead.")
   ;; Upstream's HEAD follows the latest Agda release, but they don't release
   ;; until a newer Agda release comes up, so their releases are always one
   ;; version late.
-  (let* ((revision "1")
-         (commit "814d54b08b360b8e80828065f54b80e3a98a0092"))
-    (package
-      (name "agda-cubical")
-      (version (git-version "0.4" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/agda/cubical.git")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "0d25gb1qzpx539k62qjsjq4xmzp34qk7n3hmd9y6v8slhrrxw312"))))
-      (build-system agda-build-system)
-      (arguments
-       (list
-        #:gnu-and-haskell? #t
-        #:phases
-        #~(modify-phases %standard-phases
-            (replace 'build
-              (lambda _
-                (invoke "make"))))))
-      (synopsis "Standard library for Cubical Agda")
-      (description "A standard library for Cubical Agda, comparable to
+  (package
+    (name "agda-cubical")
+    (version "0.5")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/agda/cubical.git")
+                    (commit (string-append "v" version))))
+              (sha256
+               (base32
+                "0yfg7gr55n08ly1qgzpcp16s15k1abycppbcdi9lzg1hjryqxcg3"))))
+    (build-system agda-build-system)
+    (arguments
+     (list
+      #:gnu-and-haskell? #t
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'build
+            (lambda _
+              (invoke "make"))))))
+    (synopsis "Standard library for Cubical Agda")
+    (description "A standard library for Cubical Agda, comparable to
 agda-stdlib but using cubical methods.")
-      (home-page "https://github.com/agda/cubical")
-      (license license:expat))))
+    (home-page "https://github.com/agda/cubical")
+    (license license:expat)))
 
 (define-public agda-1lab
   ;; Upstream doesn't do releases (yet).  Use a commit that builds with 2.6.3,
-- 
cgit 1.4.1


From 7a6294ba0580efe9f19a1771c267a2bd511d1039 Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Thu, 13 Jul 2023 21:52:37 +0400
Subject: gnu: emacs-org-modern: Update to 0.10.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/emacs-xyz.scm (emacs-org-modern): Update to 0.10.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 119bab2b28..6af5faf4cb 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -36762,7 +36762,7 @@ Fennel code within Emacs.")
 (define-public emacs-org-modern
   (package
    (name "emacs-org-modern")
-   (version "0.9")
+   (version "0.10")
    (source
      (origin
        (method git-fetch)
@@ -36770,7 +36770,7 @@ Fennel code within Emacs.")
              (url "https://github.com/minad/org-modern")
              (commit version)))
        (sha256
-        (base32 "16c74vff882rx8yp4ybaydlg5774xz68iasajhidbn0fb4fhz8ph"))
+        (base32 "0fpc6pf1chjs9bb4m9hzacny3cdxvnpvwsf0vrbbz3vy9sf1a30c"))
        (file-name (git-file-name name version))))
    (build-system emacs-build-system)
    (propagated-inputs (list emacs-compat))
-- 
cgit 1.4.1


From fb52f687f79fb74f724abd1835e18bad6a2901e6 Mon Sep 17 00:00:00 2001
From: Rikard Nordgren <hrn@posteo.net>
Date: Mon, 5 Jun 2023 18:44:21 +0000
Subject: gnu: Add perl-test-inter.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/perl-check.scm (perl-test-inter): New variable.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/perl-check.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm
index 7bf58832bc..5ef56227ce 100644
--- a/gnu/packages/perl-check.scm
+++ b/gnu/packages/perl-check.scm
@@ -39,6 +39,7 @@
   #:use-module (gnu packages web)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system perl)
   #:use-module (gnu packages perl))
 
@@ -715,6 +716,29 @@ contents of a file is equal to a particular string.")
 automatically aggregated and output to STDOUT.")
     (license perl-license)))
 
+(define-public perl-test-inter
+  (package
+    (name "perl-test-inter")
+    (version "1.10")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/SBECK-github/Test-Inter")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0ii3avmd31j3kxg456jqvlj5w0hpywpj51mqm4ccnjm820yv8irb"))))
+    (build-system perl-build-system)
+    (home-page "https://metacpan.org/pod/Test::Inter")
+    (synopsis "Framework for more readable interactive test scripts")
+    (description
+     "@code{Test::Inter} is another framework for writing test scripts, which
+offer the ability to access specific tests in a reasonably interactive
+fashion, primarily for debugging purposes.  Much of the syntax is loosely
+inspired by @code{Test::More}.")
+    (license perl-license)))
+
 (define-public perl-test-leaktrace
   (package
     (name "perl-test-leaktrace")
-- 
cgit 1.4.1


From a9fcec54c6ce481d81f78c87f1bff7bb695cdff1 Mon Sep 17 00:00:00 2001
From: Rikard Nordgren <hrn@posteo.net>
Date: Mon, 5 Jun 2023 18:52:31 +0000
Subject: gnu: Add perl-statistics-distributions.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/perl.scm (perl-statistics-distributions): New variable.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/perl.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 6f30bd0795..6175a38365 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -9648,6 +9648,30 @@ which it is called.")
 @code{median()}, @code{mean()}, @code{variance()} and @code{stddev()}.")
     (license license:lgpl2.0)))
 
+(define-public perl-statistics-distributions
+  (package
+    (name "perl-statistics-distributions")
+    (version "1.02")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/M/MI/MIKEK/Statistics-Distributions-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1j1kswl98f4i9dn176f9aa3y9bissx2sscga5jm3gjl4pxm3k7zr"))))
+    (build-system perl-build-system)
+    (home-page "https://metacpan.org/pod/Statistics::Distributions")
+    (synopsis "Calculating some values of common statistical distributions")
+    (description
+     "@code{Statistics::Distributions} calculates percentage points (5
+significant digits) of the u (standard normal) distribution, the student's t
+distribution, the chi-square distribution and the F distribution.  It can also
+calculate the upper probability (5 significant digits) of the u (standard
+normal), the chi-square, the t and the F distribution.")
+    (license license:perl-license)))
+
 (define-public perl-statistics-pca
   (package
     (name "perl-statistics-pca")
-- 
cgit 1.4.1


From 8505bf9f36909f1aa7253d8735dacc84914bcc78 Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Wed, 19 Jul 2023 23:37:22 +0800
Subject: gnu: tessen: Update to 2.2.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/password-utils.scm (tessen): Update to 2.2.1.
[arguments]<#:make-flags>: Set DESTDIR.
[license]: License has been changed to GPL2-only.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/password-utils.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 45e06c2fc0..f4f172d159 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -959,7 +959,7 @@ using password-store through rofi interface:
 (define-public tessen
   (package
     (name "tessen")
-    (version "2.1.2")
+    (version "2.2.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -968,7 +968,7 @@ using password-store through rofi interface:
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "01jaxakq847k3v2wid8fzhcmq8mraxz0q1j87s1jv75l1gy4qiij"))))
+                "0v0mkdwwxpy23fm5dqspp9c77b5ifcj7fsi8xhjrkrv1vqwmh67j"))))
     (build-system gnu-build-system)
     (arguments
      (list #:tests?
@@ -985,15 +985,15 @@ using password-store through rofi interface:
                      (("xdg-open") (search-input-file inputs "/bin/xdg-open")))))
                (delete 'configure)) ;no configure script
            #:make-flags
-           #~(list (string-append "PREFIX="
-                                  #$output))))
+           #~(list (string-append "DESTDIR=" #$output)
+                   "PREFIX=''")))
     (native-inputs (list scdoc))
     (inputs (list libnotify wl-clipboard wtype xdg-utils))
     (home-page "https://github.com/ayushnix/tessen")
     (synopsis "Frontend for password-store and gopass")
     (description "Tessen is a bash script that can autotype and copy data
 from password-store and gopass files.")
-    (license license:gpl2+)))
+    (license license:gpl2)))
 
 (define-public browserpass-native
   (package
-- 
cgit 1.4.1


From 3a05604a57671682943253781ac0d9f637809660 Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant <glv@posteo.net>
Date: Sat, 22 Jul 2023 09:21:16 +0200
Subject: gnu: Add airspy.

* gnu/packages/radio.scm (airspy): New variable.
---
 gnu/packages/radio.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 235b648a52..7efbc93d7c 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -272,6 +272,57 @@ To install the rtl-sdr udev rules, you must extend 'udev-service-type' with
 this package.  E.g.: @code{(udev-rules-service 'rtl-sdr rtl-sdr)}")
       (license license:gpl2+))))
 
+(define-public airspy
+  (let ((commit "6f92f47146aa8a8fce59b60927cf8c53da6851b3")
+        (revision "1"))
+    (package
+      (name "airspy")
+      (version (git-version "1.0.10" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/airspy/airspyone_host")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0y2yz8agp4v36z1766hi92msgs35yvy32brfcscijxdkgswdgbkd"))))
+      (build-system cmake-build-system)
+      (native-inputs
+       (list pkg-config))
+      (inputs
+       (list libusb))
+      (arguments
+       (list #:configure-flags #~(list "-DINSTALL_UDEV_RULES=ON")
+             #:tests? #f ; No tests
+             #:phases
+             #~(modify-phases %standard-phases
+                 (add-after 'unpack 'fix-paths
+                   (lambda _
+                     (substitute* "airspy-tools/CMakeLists.txt"
+                       (("DESTINATION \"/etc/udev/")
+                        (string-append "DESTINATION \""
+                                       #$output
+                                       "/lib/udev/")))))
+                 (add-after 'fix-paths 'fix-udev-rules
+                   (lambda _
+                     (substitute* "airspy-tools/52-airspy.rules"
+                       ;; The plugdev group does not exist; use dialout as in
+                       ;; the hackrf package.
+                       (("GROUP=\"plugdev\"")
+                        "GROUP=\"dialout\"")))))))
+      (home-page "https://github.com/airspy/airspyone_host")
+      (synopsis "Software defined radio driver for Airspy")
+      (description
+       "This package provides the driver and utilities for controlling the
+Airspy Software Defined Radio (SDR) over USB.
+
+To install the airspy udev rules, you must extend @code{udev-service-type}
+with this package.  E.g.: @code{(udev-rules-service 'airspy airspy)}")
+      (license (list license:bsd-3
+                     license:expat
+                     license:gpl2+)))))
+
 (define-public airspyhf
   (let ((commit "40836c59d35d989fe00ac12ef774df736a36c6e4")
         (revision "1"))
-- 
cgit 1.4.1


From b4a0f6283266cdc681e2f3bc93a558f5dc2a26ea Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant <glv@posteo.net>
Date: Sat, 22 Jul 2023 09:26:27 +0200
Subject: gnu: Add soapyairspy.

* gnu/packages/radio.scm (soapyairspy): New variable.
---
 gnu/packages/radio.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 7efbc93d7c..fef39996c8 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -400,6 +400,30 @@ with this package.  E.g.: @code{(udev-rules-service 'airspyhf airspyhf)}")
 defined radio hardware devices with a common API.")
     (license license:boost1.0)))
 
+(define-public soapyairspy
+  (package
+    (name "soapyairspy")
+    (version "0.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/pothosware/SoapyAirspy")
+             (commit (string-append "soapy-airspy-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0g23yybnmq0pg2m8m7dbhif8lw0hdsmnnjym93fdyxfk5iln7fsc"))))
+    (build-system cmake-build-system)
+    (inputs
+     (list airspy soapysdr))
+    (arguments
+     (list #:tests? #f))  ; No test suite
+    (home-page "https://github.com/pothosware/SoapyAirspy/wiki")
+    (synopsis "SoapySDR Airspy module")
+    (description "This package provides Airspy devices support to the
+SoapySDR library.")
+    (license license:expat)))
+
 (define-public soapyairspyhf
   (package
     (name "soapyairspyhf")
-- 
cgit 1.4.1


From f23891b71c9cfb8da30bb2f0affe3e7d329dd858 Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant <glv@posteo.net>
Date: Sat, 22 Jul 2023 09:29:19 +0200
Subject: gnu: sdr++: Enable airspy support.

* gnu/packages/radio.scm (sdr++)[inputs]: Add airspy.
  [arguments]: Update 'configure-flags'.
---
 gnu/packages/radio.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index fef39996c8..583516a81d 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -2601,7 +2601,8 @@ various hardware.")
       (native-inputs
        (list pkg-config))
       (inputs
-       (list airspyhf
+       (list airspy
+             airspyhf
              alsa-lib
              codec2
              fftwf
@@ -2618,8 +2619,7 @@ various hardware.")
              (list zstd "lib")))
       (arguments
        (list #:tests? #f ; No test suite.
-             #:configure-flags #~(list "-DOPT_BUILD_AIRSPY_SOURCE=OFF"
-                                       "-DOPT_BUILD_PLUTOSDR_SOURCE=OFF"
+             #:configure-flags #~(list "-DOPT_BUILD_PLUTOSDR_SOURCE=OFF"
                                        "-DOPT_BUILD_M17_DECODER=ON")
              #:phases
              #~(modify-phases %standard-phases
-- 
cgit 1.4.1


From faf9a41a12aabc9874f95a8028be0eb082860d50 Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant <glv@posteo.net>
Date: Sat, 22 Jul 2023 09:38:59 +0200
Subject: gnu: sdrangel: Enable airspy support.

* gnu/packages/radio.scm (sdrangel)[inputs]: Add airspy.
---
 gnu/packages/radio.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 583516a81d..b577a7a48e 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -2510,7 +2510,8 @@ voice formats.")
     (native-inputs
      (list doxygen graphviz pkg-config))
     (inputs
-     (list airspyhf
+     (list airspy
+           airspyhf
            alsa-lib
            aptdec
            boost
-- 
cgit 1.4.1


From 29f492049fba1075d031f2eae514d7e0396b2830 Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant <glv@posteo.net>
Date: Sat, 22 Jul 2023 09:51:18 +0200
Subject: gnu: gr-osmosdr: Enable airspy support.

* gnu/packages/radio.scm (gr-osmosdr)[inputs]: Add airspy.
---
 gnu/packages/radio.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index b577a7a48e..cf11ac91de 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -938,7 +938,8 @@ environment.")
       (native-inputs
        (list doxygen pkg-config pybind11 python-mako python-six))
       (inputs
-       (list airspyhf
+       (list airspy
+             airspyhf
              boost
              fftwf
              gmp
-- 
cgit 1.4.1


From a7233e99dafc6266ba278dbc49465215984edaf7 Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant <glv@posteo.net>
Date: Sat, 22 Jul 2023 10:03:58 +0200
Subject: gnu: welle-io: Enable airspy support.

* gnu/packages/radio.scm (welle-io)[inputs]: Add airspy.
  [arguments]: Update 'configure-flags'.
---
 gnu/packages/radio.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index cf11ac91de..fc00e1c8ee 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -2237,7 +2237,8 @@ receiver.")
     (native-inputs
      (list pkg-config))
     (inputs
-     (list alsa-lib
+     (list airspy
+           alsa-lib
            faad2
            fftwf
            lame
@@ -2253,9 +2254,10 @@ receiver.")
            qtquickcontrols2-5
            soapysdr))
     (arguments
-     `(#:configure-flags '("-DRTLSDR=ON"
-                           "-DSOAPYSDR=ON")
-       #:tests? #f))
+     (list #:configure-flags #~(list "-DAIRSPY=ON"
+                                     "-DRTLSDR=ON"
+                                     "-DSOAPYSDR=ON")
+           #:tests? #f))
     (home-page "https://www.welle.io/")
     (synopsis "DAB and DAB+ software radio")
     (description
-- 
cgit 1.4.1


From 1c814ec90b048809c521f73357c4aa75bffc6c59 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:03 -0700
Subject: gnu: mate-desktop: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-desktop): Update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 4874aaf7f9..56a60d693b 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -221,14 +221,14 @@ themes for both gtk+-2 and gtk+-3.")
 (define-public mate-desktop
   (package
     (name "mate-desktop")
-    (version "1.24.1")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "mate-desktop-" version ".tar.xz"))
        (sha256
-        (base32 "1nd1dn8mm1z6x4r68a25q4vzys1a6fmbzc94ss1z1n1872pczs6i"))))
+        (base32 "04d2h1y5v225xzwsrf57cy281fr1k3rx70akjdhbs6mc4y56dl8j"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config
-- 
cgit 1.4.1


From 27d4563e82bda5d0520fda83c137c43935862cec Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:04 -0700
Subject: gnu: libmateweather: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (libmateweather): Update to 1.26.1.
[source]: Add libmateweather-use-TZDIR.patch.
[inputs]: Replace tzdata with tzdata-for-tests.
[arguments]: Set TZDIR, ignore test failure for 'check-timezones.sh'.
* gnu/packages/patches/libmateweather-use-TZDIR.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.

Co-authored-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/local.mk                                       |  1 +
 gnu/packages/mate.scm                              | 17 +++++----
 .../patches/libmateweather-use-TZDIR.patch         | 42 ++++++++++++++++++++++
 3 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 gnu/packages/patches/libmateweather-use-TZDIR.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 02a5b4721a..f9d57bbec3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1503,6 +1503,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/libmad-length-check.patch		\
   %D%/packages/patches/libmad-md_size.patch			\
   %D%/packages/patches/libmad-mips-newgcc.patch			\
+  %D%/packages/patches/libmateweather-use-TZDIR.patch		\
   %D%/packages/patches/libmp4v2-c++11.patch			\
   %D%/packages/patches/libmpeg2-arm-private-symbols.patch	\
   %D%/packages/patches/libmpeg2-global-symbol-test.patch	\
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 56a60d693b..c1f53d3dca 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -251,34 +251,37 @@ desktop and the mate-about program.")
 (define-public libmateweather
   (package
     (name "libmateweather")
-    (version "1.24.1")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "libmateweather-" version ".tar.xz"))
        (sha256
-        (base32 "02d7c59pami1fzxg73mp6risa9hvsdpgs68f62wkg09nrppzsk4v"))))
+        (base32 "0fpgc2l46024j2sqqsvclg9c6x33hyjk2zbg5h74v7cf9c7rj062"))
+       (patches
+        (list (search-patch "libmateweather-use-TZDIR.patch")))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags
-       (list (string-append "--with-zoneinfo-dir="
-                            (assoc-ref %build-inputs "tzdata")
-                            "/share/zoneinfo"))
+       (list (string-append "--with-zoneinfo-dir=/var/empty"))
        #:phases
        (modify-phases %standard-phases
          (add-before 'check 'fix-tzdata-location
           (lambda* (#:key inputs #:allow-other-keys)
+            (setenv "TZDIR" (search-input-directory inputs "/share/zoneinfo"))
             (substitute* "data/check-timezones.sh"
               (("/usr/share/zoneinfo/zone.tab")
-               (search-input-file inputs "/share/zoneinfo/zone.tab"))))))))
+               (search-input-file inputs "/share/zoneinfo/zone.tab"))
+              ;; XXX: Ignore this test for now, which requires tzdata-2023c.
+              (("exit 1") "exit 0")))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
        ("dconf" ,dconf)
        ("glib:bin" ,glib "bin")))
     (inputs
-     (list gtk+ tzdata))
+     (list gtk+ tzdata-for-tests))
     (propagated-inputs
       ;; both of these are requires.private in mateweather.pc
      (list libsoup-minimal-2 libxml2))
diff --git a/gnu/packages/patches/libmateweather-use-TZDIR.patch b/gnu/packages/patches/libmateweather-use-TZDIR.patch
new file mode 100644
index 0000000000..5f72043986
--- /dev/null
+++ b/gnu/packages/patches/libmateweather-use-TZDIR.patch
@@ -0,0 +1,42 @@
+From 109fef8208188ddf4be76d6899f7d8fde5b8b3be Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@member.fsf.org>
+Date: Sat, 22 Jul 2023 14:40:31 +0800
+Subject: [PATCH] Use TZDIR for ZONEINFO_DIR if the variable is set.
+
+---
+ libmateweather/mateweather-timezone.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/libmateweather/mateweather-timezone.c b/libmateweather/mateweather-timezone.c
+index 2754728..6c858c4 100644
+--- a/libmateweather/mateweather-timezone.c
++++ b/libmateweather/mateweather-timezone.c
+@@ -61,7 +61,7 @@ static gboolean
+ parse_tzdata (const char *tzname, time_t start, time_t end,
+ 	      int *offset, gboolean *has_dst, int *dst_offset)
+ {
+-    char *filename, *contents;
++    char *tzdir, *filename, *contents;
+     gsize length;
+     int timecnt, transitions_size, ttinfo_map_size;
+     int initial_transition = -1, second_transition = -1;
+@@ -71,7 +71,10 @@ parse_tzdata (const char *tzname, time_t start, time_t end,
+     char initial_isdst, second_isdst;
+     int i;
+ 
+-    filename = g_build_filename (ZONEINFO_DIR, tzname, NULL);
++    tzdir = g_getenv("TZDIR");
++    if (tzdir == NULL)
++	tzdir = ZONEINFO_DIR;
++    filename = g_build_filename (tzdir, tzname, NULL);
+     if (!g_file_get_contents (filename, &contents, &length, NULL)) {
+ 	g_free (filename);
+ 	return FALSE;
+@@ -403,4 +406,3 @@ mateweather_timezone_get_dst_offset (MateWeatherTimezone *zone)
+     g_return_val_if_fail (zone->has_dst, 0);
+     return zone->dst_offset;
+ }
+-
+-- 
+2.41.0
+
-- 
cgit 1.4.1


From d2c18b9c79de2b4f8ec9a973ab1f80cb0dd5ae4d Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:05 -0700
Subject: gnu: mate-terminal: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-terminal): Update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index c1f53d3dca..8179370d0d 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -295,14 +295,14 @@ the MATE desktop environment.")
 (define-public mate-terminal
   (package
     (name "mate-terminal")
-    (version "1.24.1")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "mate-terminal-" version ".tar.xz"))
        (sha256
-        (base32 "0qmyhxmarwkxad8k1m9q1iwx70zhfp6zc2mh74nv26nj4gr3h3am"))))
+        (base32 "1l71w64vf49iqaknja2p6h8m3blzq7w76ki7r7l8fy5ly03044vw"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list pkg-config
-- 
cgit 1.4.1


From 8f39c0d809e2a50c49e1045ebc63fd6caa738776 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:06 -0700
Subject: gnu: mate-session-manager: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-session-manager): Update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 8179370d0d..f0e2d71dd8 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -334,14 +334,14 @@ configurations (profiles).")
 (define-public mate-session-manager
   (package
     (name "mate-session-manager")
-    (version "1.24.1")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "mate-session-manager-" version ".tar.xz"))
        (sha256
-        (base32 "1zwq8symyp3ijs28pyrknsdi9byf4dpp9wp93ndwdhi0vaip5i51"))))
+        (base32 "0y22plz44pspjk02gasfyv6m6g29lxksp0iqhqy2k77x85j7v32v"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags (list "--with-elogind"
-- 
cgit 1.4.1


From a20e6f2537e1702bc4901c5e44b4c0fed61e33d1 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:07 -0700
Subject: gnu: mate-settings-daemon: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-settings-daemon): Update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index f0e2d71dd8..418a1cc48e 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -376,14 +376,14 @@ configuration program to choose applications starting on login.")
 (define-public mate-settings-daemon
   (package
     (name "mate-settings-daemon")
-    (version "1.24.1")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "mate-settings-daemon-" version ".tar.xz"))
        (sha256
-        (base32 "0n1ywr3ir5p536s7azdbw2mh40ylqlpx3a74mjrivbms1rpjxyab"))))
+        (base32 "0n8q9dg0ascqhskx45l3vb19q06kd3994lhlcsvw4899aidsczk9"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list pkg-config intltool gobject-introspection))
-- 
cgit 1.4.1


From 17b625e31aeb588a4900dcb1c6d8889da5a18262 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:08 -0700
Subject: gnu: libmatemixer: Update to 1.26.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (libmatemixer): Update to 1.26.0.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 418a1cc48e..854f205489 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -415,14 +415,14 @@ configuration program to choose applications starting on login.")
 (define-public libmatemixer
   (package
     (name "libmatemixer")
-    (version "1.24.1")
+    (version "1.26.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "libmatemixer-" version ".tar.xz"))
        (sha256
-        (base32 "1n6rq7k66zvfd6sb7h92xihh021w9hysfa4yd1mzjcbb7c62ybqx"))))
+        (base32 "1wcz4ppg696m31f5x7rkyvxxdriik2vprsr83b4wbs97bdhcr6ws"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list pkg-config intltool gobject-introspection))
-- 
cgit 1.4.1


From 7a08744bca3396271da50498b327dc8ecccd3954 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:09 -0700
Subject: gnu: libmatekbd: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (libmatekbd): Update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 854f205489..41f9c338c9 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -439,14 +439,14 @@ sound systems.")
 (define-public libmatekbd
   (package
     (name "libmatekbd")
-    (version "1.24.1")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "libmatekbd-" version ".tar.xz"))
        (sha256
-        (base32 "17mcxfkvl14p04id3n5kbhpjwjq00c8wmbyciyy2hm7kwdln6zx8"))))
+        (base32 "1vdwjyryv1f12yx6np4nrl13vn0v4g8p90zxi3mfwi994n8qv4v3"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list pkg-config intltool gobject-introspection))
-- 
cgit 1.4.1


From fe76492e382c5e786cb11f33c9b4b155667958ff Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:10 -0700
Subject: gnu: mate-applets: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-applets): Update to 1.26.1.
[inputs]: Add libnl.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 41f9c338c9..38badf2f7a 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -505,14 +505,14 @@ assorted menu related utility programs.")
 (define-public mate-applets
   (package
     (name "mate-applets")
-    (version "1.24.1")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "mate-applets-" version ".tar.xz"))
        (sha256
-        (base32 "0h70i4x3bk017pgv4zn280682wm58vwdjm7kni91ni8rmblnnvyp"))))
+        (base32 "1hn22xxmkm3s1477war7w7lb7yh77b3251y1why37p3nncfzdf1s"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list pkg-config
@@ -533,6 +533,7 @@ assorted menu related utility programs.")
            gtksourceview-3
            libgtop
            libmateweather
+           libnl
            libnotify
            libx11
            libxml2
-- 
cgit 1.4.1


From 848ba485292d2674bb5355bf02c70c0ae7aeab05 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:11 -0700
Subject: gnu: mate-media: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-media): Update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 38badf2f7a..1f7a406bff 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -578,14 +578,14 @@ Interactive Weather Information Network (IWIN).
 (define-public mate-media
   (package
     (name "mate-media")
-    (version "1.24.1")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "mate-media-" version ".tar.xz"))
        (sha256
-        (base32 "118i4w2i2g3hfgbfn3hjzjkfq8vjj6049r7my3vna9js23b7ab92"))))
+        (base32 "02zb4rgahs50pick4nw9xhycshc5kbs1dlnr0ry5r4bd54da5ci8"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list pkg-config intltool gettext-minimal gobject-introspection))
-- 
cgit 1.4.1


From 170aaece25fcac2dbf482f2b22611bba5e24ea1c Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:12 -0700
Subject: gnu: mate-panel: Update to 1.26.3.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-panel): Update to 1.26.3.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 1f7a406bff..aea6c11024 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -610,14 +610,14 @@ mate-volume-control, a MATE volume control application and applet.")
 (define-public mate-panel
   (package
     (name "mate-panel")
-    (version "1.24.1")
+    (version "1.26.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            name "-" version ".tar.xz"))
        (sha256
-        (base32 "0xblqrhfazd01h0jdmx4hvavkb7f9anbd4rjsk5r6wxhp027l64l"))))
+        (base32 "0ag03lbslsqva5ycrnv6ksm304s8miav42n7iklsf2s54zai0gzk"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit 1.4.1


From 0d8242540306f5a8d4e3da0814a9e58548ac3385 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:13 -0700
Subject: gnu: caja: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (caja): update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index aea6c11024..45dc6eb566 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -783,7 +783,7 @@ infamous 'Wanda the Fish'.")
 (define-public caja
   (package
     (name "caja")
-    (version "1.24.0")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
@@ -791,7 +791,7 @@ infamous 'Wanda the Fish'.")
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0"))))
+         "01scw5wk4fgps8fk9l7ic2q6p1wplxzsv678wbv010m301pnxz9h"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags '("--disable-update-mimedb")
-- 
cgit 1.4.1


From 6d7a9b4d700f5b4bff90fc8a5e3807f5d5c764e5 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:14 -0700
Subject: gnu: marco: Update to 1.26.2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (marco): Update to 1.26.2.
[inputs]: Add libxres.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 45dc6eb566..4e36b0fb8f 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -965,14 +965,14 @@ of various aspects of your desktop.")
 (define-public marco
   (package
     (name "marco")
-    (version "1.24.1")
+    (version "1.26.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            name "-" version ".tar.xz"))
        (sha256
-        (base32 "109b41pjrc1b4slw6sx1lakdhrc46x829vczzk4bz3j15kcszg54"))))
+        (base32 "18q71r4bkrldscp414qm0457i0jnk841wwc490qg0whhzraa5w8j"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list pkg-config
@@ -998,6 +998,7 @@ of various aspects of your desktop.")
            libxinerama
            libxrandr
            libxrender
+           libxres
            mate-desktop
            pango
            startup-notification))
-- 
cgit 1.4.1


From 0509ed63234cbff6f49f6a44bf96376f4d1ae7da Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:15 -0700
Subject: gnu: caja-extensions: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (caja-extensions): Update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 4e36b0fb8f..5d041d9c97 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -841,14 +841,14 @@ icons on the MATE desktop.  It works on local and remote file systems.")
 (define-public caja-extensions
   (package
     (name "caja-extensions")
-    (version "1.24.1")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "caja-extensions-" version ".tar.xz"))
        (sha256
-        (base32 "13jkynanqj8snys0if8lv6yx1y0jrm778s2152n4x65hsghc6cw5"))))
+        (base32 "086mw7650n8blnr2wkg9xdb6lhwqamcbkk5575i2s90hzbiik72q"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags (list "--enable-sendto"
-- 
cgit 1.4.1


From 70f282d1be42c917ed2be03cc77f0432acd143b2 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:16 -0700
Subject: gnu: mate-control-center: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-control-center): Update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 5d041d9c97..593bb4ab97 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -894,14 +894,14 @@ icons on the MATE desktop.  It works on local and remote file systems.")
 (define-public mate-control-center
   (package
     (name "mate-control-center")
-    (version "1.24.1")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "mate-control-center-" version ".tar.xz"))
        (sha256
-        (base32 "08bai47fsmbxlw2lhig9n6c8sxr24ixkd1spq3j0635yzcqighb0"))))
+        (base32 "022nbgdvhfjj9zdy9zaiagigh3f8r0dzfz4gqmpsayk57cm4jpz0"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
-- 
cgit 1.4.1


From e6403a56716c6fc150e001f93419077afdda1b76 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:17 -0700
Subject: gnu: mate-user-guide: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-user-guide): Update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 593bb4ab97..e9dd6a4128 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1015,7 +1015,7 @@ for use with MATE or as a standalone window manager.")
 (define-public mate-user-guide
   (package
     (name "mate-user-guide")
-    (version "1.24.0")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
@@ -1023,7 +1023,7 @@ for use with MATE or as a standalone window manager.")
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0ddxya84iydvy85dbqls0wmz2rph87wri3rsdhv4rkbhh5g4sd7f"))))
+         "0by2gzvhx3ksb9shw9374a7dsjpchn79jf248a8g6bvznxscj12x"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-- 
cgit 1.4.1


From 177c35a34444c07436d97530ea87050b46974fdf Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:18 -0700
Subject: gnu: mate-calc: Update to 1.26.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-calc): Update to 1.26.0.
[inputs]: Add mpc and mpfr.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index e9dd6a4128..043ab34176 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -58,6 +58,7 @@
   #:use-module (gnu packages javascript)
   #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages messaging)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages pkg-config)
@@ -1054,14 +1055,14 @@ sessions, panels, menus, file management, and preferences.")
 (define-public mate-calc
   (package
     (name "mate-calc")
-    (version "1.24.1")
+    (version "1.26.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "mate-calc-" version ".tar.xz"))
        (sha256
-        (base32 "0imdimq5d5rjq8mkjcrsd683a2bn9acmhc0lmvyw71y0040inbaw"))))
+        (base32 "0mddfh9ixhh60nfgx5kcprcl9liavwqyina11q3pnpfs3n02df3y"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list gettext-minimal intltool pkg-config yelp-tools))
@@ -1071,6 +1072,8 @@ sessions, panels, menus, file management, and preferences.")
            gtk+
            libxml2
            libcanberra
+           mpc
+           mpfr
            pango))
     (home-page "https://mate-desktop.org/")
     (synopsis "Calculator for MATE")
-- 
cgit 1.4.1


From 4504449cb734f2ee0ffb9ad178f7563621ad38ac Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:19 -0700
Subject: gnu: mate-backgrounds: Update to 1.26.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-backgrounds): update to 1.26.0.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 043ab34176..032881ceaa 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1084,7 +1084,7 @@ sessions, panels, menus, file management, and preferences.")
 (define-public mate-backgrounds
   (package
     (name "mate-backgrounds")
-    (version "1.24.1")
+    (version "1.26.0")
     (source
      (origin
        (method url-fetch)
@@ -1092,7 +1092,7 @@ sessions, panels, menus, file management, and preferences.")
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0b9yx68p9l867bqsl9z2g4wrs8p396ls673jgaliys5snmk8n8dn"))))
+         "0379hngy3ap1r5kmqvmzs9r710k2c9nal2ps3hq765df4ir15j8d"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list intltool))
-- 
cgit 1.4.1


From e0c1a0a8127d4e1d764ce81b40b3ccef8e87c6ec Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:20 -0700
Subject: gnu: mate-netbook: Update to 1.26.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-netbook): Update to 1.26.0.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 032881ceaa..380954741d 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1106,7 +1106,7 @@ can be used as backgrounds in the MATE Desktop environment.")
 (define-public mate-netbook
   (package
     (name "mate-netbook")
-    (version "1.24.0")
+    (version "1.26.0")
     (source
      (origin
        (method url-fetch)
@@ -1114,7 +1114,7 @@ can be used as backgrounds in the MATE Desktop environment.")
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "1bmk9gq5gcqkvfppa7i1hqfph8sajc3xs189s4ha97g0ifwd98a8"))))
+         "12gdy69nfysl8vmd8lv8b0lknkaagplrrz88nh6n0rmjkxnipgz3"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list gettext-minimal intltool pkg-config))
-- 
cgit 1.4.1


From e09bb0155eb4b181795b81ff6dc1a21673d264f0 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:21 -0700
Subject: gnu: mate-screensaver: Update to 1.26.2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-screensaver): Update to 1.26.2.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 380954741d..4332be319e 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1145,14 +1145,14 @@ Re-decorates windows on un-maximise.
 (define-public mate-screensaver
   (package
     (name "mate-screensaver")
-    (version "1.24.1")
+    (version "1.26.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "mate-screensaver-" version ".tar.xz"))
        (sha256
-        (base32 "0imb1z2yvz1h95dzq396c569kkxys9mb2dyc6qxxxcnc5w02a2dw"))))
+        (base32 "0zpzlmbb6m2hqsr67rc6mqpabl1idpzfqzlj4ifxanql4k7015ys"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit 1.4.1


From 8c872e03b604b73acf225e63c83ecd229227f636 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:22 -0700
Subject: gnu: mate-menus: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-menus): Update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 4332be319e..164ef27643 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -468,14 +468,14 @@ MATE desktop environment.")
 (define-public mate-menus
   (package
     (name "mate-menus")
-    (version "1.24.1")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "mate-menus-" version ".tar.xz"))
        (sha256
-        (base32 "17zc9fn14jykhn30z8iwlw0qwk32ivj6gxgww3xrqvqk0da5yaas"))))
+        (base32 "130xvpszl1p3407b8annbvj8p0sa9jazxya02z9cfl5nwnd5k3a5"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-- 
cgit 1.4.1


From 2530dc15156a0b6b7c79474e1de717b1493e71f4 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:23 -0700
Subject: gnu: mate-utils: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-utils): Update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 164ef27643..af963c7dc6 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1215,7 +1215,7 @@ can be used as backgrounds in the MATE Desktop environment.")
 (define-public mate-utils
   (package
     (name "mate-utils")
-    (version "1.24.0")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
@@ -1223,7 +1223,7 @@ can be used as backgrounds in the MATE Desktop environment.")
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "1b16n1628gcsym5mph6lr9x5xm4rgkxsa8xwr2wlx8g2gw2775i1"))))
+         "08066w98y45ilna6sn2kj8jnyhafra7sbpfrjdddv48939dlflrg"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list gettext-minimal
-- 
cgit 1.4.1


From 9ab2f730142c90c8f78a85f6e1cb41aad054325b Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:24 -0700
Subject: gnu: eom: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (eom): Update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index af963c7dc6..7d142a23ff 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1268,14 +1268,14 @@ can be used as backgrounds in the MATE Desktop environment.")
 (define-public eom
   (package
     (name "eom")
-    (version "1.24.1")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "eom-" version ".tar.xz"))
        (sha256
-        (base32 "0dralsc0dvs0l38cysdhx6kiaiqlb8qi6g9xz2cm6mjqyq3d3f9f"))))
+        (base32 "0q4r9f3dcb6w6fia06sm9h3lzpq86gj13clzw1i6qzjg94li49dm"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list gettext-minimal
-- 
cgit 1.4.1


From e1b86636507dc98114d279a1f8b21d37d6cf5239 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:25 -0700
Subject: gnu: engrampa: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (engrampa): Update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 7d142a23ff..694c8e65af 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1316,14 +1316,14 @@ can be used as backgrounds in the MATE Desktop environment.")
 (define-public engrampa
   (package
     (name "engrampa")
-    (version "1.24.1")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "engrampa-" version ".tar.xz"))
        (sha256
-        (base32 "0akjnz85qkpiqgj1ccn41rzbfid4l3r3nsm4s9s779ilzd7f097y"))))
+        (base32 "0jkci8gaxrx978laqj9ayx62r05czajqmry915iymsd4lw3l28ph"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags (list "--disable-schemas-compile"
-- 
cgit 1.4.1


From e8c5c8c3031a97546eab30a2f20587afb17c297d Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:26 -0700
Subject: gnu: pluma: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (pluma): Update to 1.26.1.
[inputs]: Replace gtksourceview-3 with gtksourceview-4.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 694c8e65af..d097250663 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1368,14 +1368,14 @@ can be used as backgrounds in the MATE Desktop environment.")
 (define-public pluma
   (package
     (name "pluma")
-    (version "1.24.1")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            name "-" version ".tar.xz"))
        (sha256
-        (base32 "1sgc5f480icr2ans6gd3akvcax58mr4jp3zjk3xn7bx1mw9i299f"))))
+        (base32 "1wcl74pbmgwcrlm5vfmv1g8klxni1qnj0kgnb5k113hisziyqnar"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(; Tests can not succeed.
@@ -1395,7 +1395,7 @@ can be used as backgrounds in the MATE Desktop environment.")
            enchant-1.6
            glib
            gtk+
-           gtksourceview-3
+           gtksourceview-4
            gdk-pixbuf
            iso-codes
            libcanberra
-- 
cgit 1.4.1


From f1bc75893ee7564fb75d0b778abc5a744da291c8 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:27 -0700
Subject: gnu: mate-system-monitor: Update to 1.26.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-system-monitor): Update to 1.26.0.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index d097250663..07e121a374 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1417,14 +1417,14 @@ can be used as backgrounds in the MATE Desktop environment.")
 (define-public mate-system-monitor
   (package
     (name "mate-system-monitor")
-    (version "1.24.1")
+    (version "1.26.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "mate-system-monitor-" version ".tar.xz"))
        (sha256
-        (base32 "1i2r4lw6xsk972yp15g5hm8p8xx9pp6jmcvvzbdq80xyx3x898qz"))))
+        (base32 "13rkrk7c326ng8164aqfp6i7334n7zrmbg61ncpjprbrvlx2qiw3"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list autoconf gettext-minimal intltool pkg-config yelp-tools))
-- 
cgit 1.4.1


From d9a79a546f0dfd8e47c7ae81029447712a88d249 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:28 -0700
Subject: gnu: mate-polkit: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-polkit): Update to 1.26.1.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 07e121a374..973d5b5300 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1452,7 +1452,7 @@ MATE Desktop to monitor your system resources and usage.")
 (define-public mate-polkit
   (package
     (name "mate-polkit")
-    (version "1.24.0")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
@@ -1460,7 +1460,7 @@ MATE Desktop to monitor your system resources and usage.")
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "1450bqzlnvwy3xa98lj102j2cf7piqbxcd1cy2zp41rdl8ri3gvn"))))
+         "0mq3a9ab4fxpkah6c5p7a0zsy8cixfc5j9030k204cy5vysv1dzm"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list gettext-minimal gtk-doc intltool libtool pkg-config))
-- 
cgit 1.4.1


From 4487505b3f80cb9359ea54583add0b3bf374d05d Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:29 -0700
Subject: gnu: mate-power-manager: Update to 1.26.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-power-manager): Update to 1.26.1.
[inputs]: Add libsecret.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 973d5b5300..91f0bda7df 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -98,14 +98,14 @@ MATE applications.")
 (define-public mate-power-manager
   (package
     (name "mate-power-manager")
-    (version "1.24.2")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/" (version-major+minor version) "/"
                            "mate-power-manager-" version ".tar.xz"))
        (sha256
-        (base32 "0fni41p3kraxwjnx9l5mdspng0zib1gfdxwlaiyq31mh4g79yjyj"))))
+        (base32 "0hhhzfmnr9vxz1w34wl7c93qm2npql71mrshpfcbzfh4xli9vk90"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config
@@ -124,6 +124,7 @@ MATE applications.")
            mate-panel
            libxrandr
            libcanberra
+           libsecret
            upower))
     (home-page "https://mate-desktop.org/")
     (synopsis "Power manager for MATE")
-- 
cgit 1.4.1


From b3ecbe16d2777596cbb1d91e740057b4b8fc3d81 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 15 Jun 2023 10:35:30 -0700
Subject: gnu: mate-themes: Update to 3.22.24.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mate.scm (mate-themes): Update to 3.22.24.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 91f0bda7df..a404e6adcb 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -198,14 +198,14 @@ from Mint-X-F and Faenza-Fresh icon packs.")
 (define-public mate-themes
   (package
     (name "mate-themes")
-    (version "3.22.21")
+    (version "3.22.24")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://mate/themes/" (version-major+minor version)
                            "/mate-themes-" version ".tar.xz"))
        (sha256
-        (base32 "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n"))))
+        (base32 "0jkfrz5fp4qnixfpc1pjjlba3nj6v2fqqpfgqhjdwcak50m3m2rx"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config intltool gdk-pixbuf ; gdk-pixbuf+svg isn't needed
-- 
cgit 1.4.1


From b6b3db9f08cbe37ddbdd44a7be8a1e4824aba3d8 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@member.fsf.org>
Date: Sat, 22 Jul 2023 15:24:52 +0800
Subject: gnu: mate-common: Update to 1.26.0.

* gnu/packages/mate.scm (mate-common): Update to 1.26.0.
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index a404e6adcb..a8add2ecdf 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -78,7 +78,7 @@
 (define-public mate-common
   (package
     (name "mate-common")
-    (version "1.24.1")
+    (version "1.26.0")
     (source
      (origin
        (method url-fetch)
@@ -86,7 +86,7 @@
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "1dgp6k2l6dz7x2lnqk4y5xfkld376726hda3mrc777f821kk99nr"))))
+         "014wpfqpqmfkzv81paap4fz15mj1gsyvaxlrfqsp9a3yxw4f7jaf"))))
     (build-system gnu-build-system)
     (home-page "https://mate-desktop.org/")
     (synopsis "Common files for development of MATE packages")
-- 
cgit 1.4.1


From 0e6fd134a2070f8ebdd5b11443da5820ffd8b237 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@member.fsf.org>
Date: Sat, 22 Jul 2023 15:25:57 +0800
Subject: gnu: mate-icon-theme: Update to 1.26.0.

* gnu/packages/mate.scm (mate-icon-theme): Update to 1.26.0.
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index a8add2ecdf..51bd36ebd4 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -137,7 +137,7 @@ actions.")
 (define-public mate-icon-theme
   (package
     (name "mate-icon-theme")
-    (version "1.24.0")
+    (version "1.26.0")
     (source
      (origin
        (method url-fetch)
@@ -145,7 +145,7 @@ actions.")
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na"))))
+         "0nha555fhhn0j5wmzmdc7bh93ckzwwdm8mwmzma5whkzslv09xa1"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config intltool icon-naming-utils))
-- 
cgit 1.4.1


From 47a1fcb697f6e997378becddf99ce130f35f572b Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@member.fsf.org>
Date: Sat, 22 Jul 2023 15:26:52 +0800
Subject: gnu: mate: Remove duplicated mate-utils from inputs.

* gnu/packages/mate.scm (mate)[inputs]: Remove duplicated mate-utils.
---
 gnu/packages/mate.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 51bd36ebd4..23bdca1f8e 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1551,7 +1551,6 @@ used to bring up authentication dialogs.")
                    mate-calc
                    mate-backgrounds
                    mate-netbook
-                   mate-utils
                    mate-polkit
                    mate-system-monitor
                    mate-utils
-- 
cgit 1.4.1


From ab7bae8de3d3a27556dfe8e13ca349eabd730fa1 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@member.fsf.org>
Date: Sat, 22 Jul 2023 15:28:09 +0800
Subject: gnu: atril: Update to 1.26.1.

* gnu/packages/mate.scm (atril): Update to 1.26.1.
---
 gnu/packages/mate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 23bdca1f8e..5c3b4a265e 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -682,7 +682,7 @@ infamous 'Wanda the Fish'.")
 (define-public atril
   (package
     (name "atril")
-    (version "1.24.0")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
@@ -690,7 +690,7 @@ infamous 'Wanda the Fish'.")
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0967gxw7h2qh2kpwl0jgv58hicz6aa92kr12mnykbpikad25s95y"))))
+         "194inkvgsj49pp0f46xfl1mq7kniah15kgviss5a20cprcx62fm5"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags (list (string-append "--with-openjpeg="
-- 
cgit 1.4.1


From 7fd173369eb172e4a9697431d325221079882d41 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:02 +0200
Subject: gnu: conan: Update to 2.0.9.

* gnu/packages/package-management.scm (conan): Update to 2.0.9.
[arguments]: Upgrade python-pyyaml-5 to python-pyyaml.
---
 gnu/packages/package-management.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index c6273efbd0..a0d8bdda0d 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1169,17 +1169,16 @@ written entirely in Python.")
 (define-public conan
   (package
     (name "conan")
-    (version "2.0.2")
+    (version "2.0.9")
     (source
      (origin
-       (method git-fetch)               ;no tests in PyPI archive
+       (method git-fetch)               ; no tests in PyPI archive
        (uri (git-reference
              (url "https://github.com/conan-io/conan")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1y4qmqnw3s8xv64lgp388qpj9vqharyfqi5s8dxvgsns6cafv7lf"))))
+        (base32 "1ykfj7c3i0b57s7ql3p2lawxdzd2cn36f3k8p64lyzla8rwv4xdx"))))
     (build-system python-build-system)
     (arguments
      (list
@@ -1299,7 +1298,7 @@ tools_locations = {
            python-pluginbase
            python-pygments
            python-pyjwt
-           python-pyyaml-5
+           python-pyyaml
            python-requests
            python-six
            python-tqdm
-- 
cgit 1.4.1


From 7febc2a78737c3c837a3512c20f2d9bb70a8a173 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: bmake: Update to 20230711.

* gnu/packages/build-tools.scm (bmake): Update to 20230711.
---
 gnu/packages/build-tools.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 00fc059a74..9fdcd1b66b 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -171,14 +171,14 @@ generate such a compilation database.")
 (define-public bmake
   (package
     (name "bmake")
-    (version "20230622")
+    (version "20230711")
     (source
      (origin
        (method url-fetch)
        (uri (string-append
              "http://www.crufty.net/ftp/pub/sjg/bmake-" version ".tar.gz"))
        (sha256
-        (base32 "007ckj2381bmwpxy5zmy2m19p2hxaj7ld80b5lv7i798c2fwj15l"))))
+        (base32 "1vrg6gclfn34lxyyqf0837hk89n5pf7ms0gmgg1fd87i0cn5908a"))))
     (build-system gnu-build-system)
     (inputs
      (list bash-minimal))
-- 
cgit 1.4.1


From a0508975dd6c70a2d2997a75c302a9fd42f7c370 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: google-highway: Update to 1.0.5.

* gnu/packages/cpp.scm (google-highway): Update to 1.0.5.
---
 gnu/packages/cpp.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index ec1f4cd325..1a71c86c3c 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -451,7 +451,7 @@ operating on batches.")
 (define-public google-highway
   (package
     (name "google-highway")
-    (version "1.0.3")
+    (version "1.0.5")
     (source
      (origin
        (method git-fetch)
@@ -460,7 +460,7 @@ operating on batches.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1828rz9w9sr3zlyg25b6nm7j5j5m0xnic7hy36gpsbxvq358ibpf"))))
+        (base32 "01ig4iqicm57nycl9q8mx1b22gvl4wj5j1vfp1jczhmrga4bca8v"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags (list "-DHWY_SYSTEM_GTEST=on")))
-- 
cgit 1.4.1


From 448e75ff9b7b605c4d9b7f73258ad31b8bd3904a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: brltty: Update to 6.6.

* gnu/packages/accessibility.scm (brltty): Update to 6.6.
---
 gnu/packages/accessibility.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm
index 0b06a189ea..ef7faedb10 100644
--- a/gnu/packages/accessibility.scm
+++ b/gnu/packages/accessibility.scm
@@ -93,14 +93,14 @@ terminals.")
 (define-public brltty
   (package
     (name "brltty")
-    (version "6.5")
+    (version "6.6")
     (source
      (origin
        (method url-fetch)
        (uri
         (string-append "https://brltty.app/archive/brltty-" version ".tar.gz"))
        (sha256
-        (base32 "1h62xzd5k0aaq2k4v3w93rizxnb8psvkxrlx62wr08ybwpspgp7z"))))
+        (base32 "1z54rin4zhg3294pq47gamzjy2c56zfkl07rx2qy2khlpyczds0k"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:tests? #f                      ; No target
-- 
cgit 1.4.1


From fdfea4c4ed0d31494fcb3633c26290f4eba9d2af Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:01 +0200
Subject: gnu: brltty: Use G-expressions.

* gnu/packages/accessibility.scm (brltty)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/accessibility.scm | 90 +++++++++++++++++++-----------------------
 1 file changed, 40 insertions(+), 50 deletions(-)

diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm
index ef7faedb10..e0a362ae4a 100644
--- a/gnu/packages/accessibility.scm
+++ b/gnu/packages/accessibility.scm
@@ -103,56 +103,46 @@ terminals.")
         (base32 "1z54rin4zhg3294pq47gamzjy2c56zfkl07rx2qy2khlpyczds0k"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     `(#:tests? #f                      ; No target
-
-       ;; High parallelism may cause errors such as:
-       ;;  ranlib: ./libbrlapi_stubs.a: error reading brlapi_stubs.o: file truncated
-       #:parallel-build? #f
-
-       #:configure-flags
-       (list
-        (string-append "--with-libbraille="
-                       (assoc-ref %build-inputs "libbraille"))
-        (string-append "--with-espeak_ng="
-                       (assoc-ref %build-inputs "espeak-ng"))
-        (string-append "--with-espeak="
-                       (assoc-ref %build-inputs "espeak"))
-        (string-append "--with-flite="
-                       (assoc-ref %build-inputs "flite"))
-        ;; Required for RUNPATH validation.
-        (string-append "LDFLAGS=-Wl,-rpath="
-                       (assoc-ref %outputs "out")
-                       "/lib"))
-       #:make-flags
-       (list
-        (string-append "JAVA_JAR_DIR="
-                       (assoc-ref %outputs "out"))
-        (string-append "JAVA_JNI_DIR="
-                       (assoc-ref %outputs "out"))
-        (string-append "OCAML_DESTDIR="
-                       (assoc-ref %outputs "out")
-                       "/lib")
-        (string-append "PYTHON_PREFIX="
-                       (assoc-ref %outputs "out"))
-        "PYTHON_ROOT=/"
-        (string-append "TCL_DIR="
-                       (assoc-ref %outputs "out")
-                       "/lib")
-        "INSTALL_WRITABLE_DIRECTORY=no-thanks")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-errors
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "configure"
-               (("/sbin/ldconfig")
-                (which "true")))
-             ;; Make Python bindings use rpath.
-             (substitute* "Bindings/Python/setup.py.in"
-               (("extra_compile_args =")
-                (string-append "extra_link_args = ['-Wl,-rpath="
-                               (assoc-ref outputs "out")
-                               "/lib'], "
-                               "extra_compile_args = "))))))))
+     (list
+      #:tests? #f                ; no target
+      ;; High parallelism may cause errors such as:
+      ;;  ranlib: ./libbrlapi_stubs.a: error reading brlapi_stubs.o: file truncated
+      #:parallel-build? #f
+      #:configure-flags
+      #~(list
+         (string-append "--with-libbraille="
+                        #$(this-package-input "libbraille"))
+         (string-append "--with-espeak_ng="
+                        #$(this-package-input "espeak-ng"))
+         (string-append "--with-espeak="
+                        #$(this-package-input "espeak"))
+         (string-append "--with-flite="
+                        #$(this-package-input "flite"))
+         ;; Required for RUNPATH validation.
+         (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
+      #:make-flags
+      #~(list
+         (string-append "JAVA_JAR_DIR=" #$output)
+         (string-append "JAVA_JNI_DIR=" #$output)
+         (string-append "OCAML_DESTDIR=" #$output "/lib")
+         (string-append "PYTHON_PREFIX=" #$output)
+         "PYTHON_ROOT=/"
+         (string-append "TCL_DIR=" #$output "/lib")
+         "INSTALL_WRITABLE_DIRECTORY=no-thanks")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-errors
+            (lambda _
+              (substitute* "configure"
+                (("/sbin/ldconfig")
+                 (which "true")))
+              ;; Make Python bindings use rpath.
+              (substitute* "Bindings/Python/setup.py.in"
+                (("extra_compile_args =")
+                 (string-append "extra_link_args = ['-Wl,-rpath="
+                                #$output
+                                "/lib'], "
+                                "extra_compile_args = "))))))))
     (native-inputs
      (list clisp
            python-cython
-- 
cgit 1.4.1


From 33bf4588b419f2b179d8d9d12a583d4e19e9995e Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Mon, 10 Jul 2023 19:11:52 +0400
Subject: gnu: Add emacs-sweet-theme.

* gnu/packages/emacs-xyz.scm (emacs-sweet-theme): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 6af5faf4cb..61f42f3baa 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12034,6 +12034,28 @@ The following completions are currently available:
 @end itemize")
     (license license:gpl3+)))
 
+(define-public emacs-sweet-theme
+  (let ((commit "78f741806ecebe01224bf54d09ad80e306652508")
+        (revision "0"))
+    (package
+      (name "emacs-sweet-theme")
+      (version (git-version "4" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/2bruh4me/sweet-theme")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1yqz15l6xa1vkll4gaa3jpr30vq3yjgbgadjilsmz5p8mblawhyx"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/2bruh4me/sweet-theme")
+      (synopsis "Emacs theme inspired by the GTK theme Sweet")
+      (description "Sweet is an Emacs theme inspired by the GTK theme with
+the same name.")
+      (license license:gpl3+))))
+
 (define-public emacs-swiper
   (package
     (name "emacs-swiper")
-- 
cgit 1.4.1


From 69bfb753bed5e106af08434ab619a8f810b4904d Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Mon, 10 Jul 2023 22:09:59 +0400
Subject: gnu: Add emacs-gc-stats.

* gnu/packages/emacs-xyz.scm (emacs-gc-stats): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 61f42f3baa..1c8ecdebe2 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3729,6 +3729,30 @@ always indented.  It reindents after every change, making it more reliable
 than @code{electric-indent-mode}.")
     (license license:gpl2+)))
 
+(define-public emacs-gc-stats
+  (package
+    (name "emacs-gc-stats")
+    (version "1.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://elpa.gnu.org/packages/"
+                                  "emacs-gc-stats-" version ".tar"))
+              (sha256
+               (base32
+                "19195s2nw87nmdz861j6shw5m2lv0spbcb1wff0y338fgx9sicgz"))))
+    (build-system emacs-build-system)
+    (home-page "https://git.sr.ht/~yantar92/emacs-gc-stats")
+    (synopsis "Collect Emacs GC statistics")
+    (description
+     "This package collects Emacs @dfn{garbage collection} (GC) statistics over
+time and saves it in the format that can be shared with Emacs maintainers.
+
+This package does not upload anything automatically.  You will need to upload
+the data manually, by sending email attachment.  If necessary, you can review
+@code{emacs-gc-stats-file} (defaults to @code{~/.emacs.d/emacs-gc-stats.eld})
+before uploading-it is just a text file.")
+    (license license:gpl3+)))
+
 (define-public emacs-gcmh
   ;; No tagged release upstream, but the commit below correspond to the 0.2.1
   ;; release.
-- 
cgit 1.4.1


From 468e3604e482388204e58662c20ba51c986f07a6 Mon Sep 17 00:00:00 2001
From: Giacomo Leidi <goodoldpaul@autistici.org>
Date: Mon, 10 Jul 2023 23:43:42 +0200
Subject: gnu: gnome-shell-extension-dash-to-panel: Update to 56.

* gnu/packages/gnome-xyz.scm (gnome-shell-extension-dash-to-panel): Update to 56.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/gnome-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 0507fc749b..a1701aaa77 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -914,7 +914,7 @@ certain elements or change animation speeds.")
 (define-public gnome-shell-extension-dash-to-panel
   (package
     (name "gnome-shell-extension-dash-to-panel")
-    (version "51")
+    (version "56")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -922,7 +922,7 @@ certain elements or change animation speeds.")
                     (commit (string-append "v" version))))
               (sha256
                (base32
-                "103pl77dhafi2ayds5yma2smv3b58zcysnd6vl5m5zavjvk35sz7"))
+                "17rm3wjj8zfdxgh5vp5f35vgd4mc9f9c2w77hac4vyvkgvwfzcnn"))
               (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments
-- 
cgit 1.4.1


From 2e198540300127397bbf16228a811fd962ccdd54 Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Wed, 12 Jul 2023 20:24:58 +0400
Subject: gnu: Add emacs-transient-posframe.

* gnu/packages/emacs-xyz.scm (emacs-transient-posframe): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1c8ecdebe2..5c76202d21 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -37553,6 +37553,32 @@ a Vertico extension which provides a way to pop up a frame at point to show
 a vertical completion UI.")
     (license license:gpl3+)))
 
+;; No tagged release upstream
+(define-public emacs-transient-posframe
+  (let ((commit "dcd898d1d35183a7d4f2c8f0ebcb43b4f8e70ebe")
+        (revision "0"))
+    (package
+      (name "emacs-transient-posframe")
+      (version (git-version "0.1.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/yanghaoxie/transient-posframe")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1aq1vbkww55xplyaa3xagz9z4kdlsxk13x054asnk0dqps4bcgbf"))))
+      (build-system emacs-build-system)
+      (propagated-inputs (list emacs-posframe emacs-transient))
+      (home-page "https://github.com/yanghaoxie/transient-posframe")
+      (synopsis "Pop up a posframe (a child frame) to show Transients")
+      (description
+       "This package is a @code{transient} extension, which uses @code{posframe}
+(a child frame) to show @code{transient} popups in Emacs.  It was developed with
+@code{transient} popups of @code{magit} in mind.")
+      (license license:gpl3+))))
+
 (define-public emacs-tintin-mode
   (let ((commit "82e71e1db92ee3d94c7d0208bafc5de337193de8")
 	(revision "1"))
-- 
cgit 1.4.1


From 9eb37dd1959130c6fa6e27cde6fb7f136bac0a24 Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Wed, 12 Jul 2023 22:43:21 +0400
Subject: gnu: Add emacs-which-key-posframe.

* gnu/packages/emacs-xyz.scm (emacs-which-key-posframe): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 5c76202d21..316ab04900 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19351,6 +19351,34 @@ available key bindings that follow C-x (or as many as space allows given your
 settings).")
     (license license:gpl3+)))
 
+;; Tagged release upstream is from before the package was orphaned.
+;; The base version is extracted from the "Version" keyword in the main file
+;; with "-git" suffix removed.
+(define-public emacs-which-key-posframe
+  (let ((commit "e4a9ce9a1b20de550fca51f14d055821980d534a")
+        (revision "0"))
+    (package
+      (name "emacs-which-key-posframe")
+      (version (git-version "0.2.0.50" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url
+                       "https://github.com/emacsorphanage/which-key-posframe")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0kgc29pb5k6cb2m13cz1yhys1k8l4dpx6wjjgldpdlg9qw2i1b53"))))
+      (build-system emacs-build-system)
+      (propagated-inputs (list emacs-posframe emacs-which-key))
+      (home-page "https://github.com/emacsorphanage/which-key-posframe")
+      (synopsis "Display which-key popup in a posframe (a child frame)")
+      (description
+       "This package is a @code{which-key} extension, which uses posframe
+(a child frame) to show @code{which-key} popups.")
+      (license license:gpl3+))))
+
 (define-public emacs-display-wttr
   (package
     (name "emacs-display-wttr")
-- 
cgit 1.4.1


From d41d60b6089a3539971355705177413a2ecea319 Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Fri, 14 Jul 2023 22:57:38 +0400
Subject: gnu: Add emacs-zeno-theme.

* gnu/packages/emacs-xyz.scm (emacs-zeno-theme): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 316ab04900..e5c7436d0d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6579,6 +6579,31 @@ detecting specific uses of Ruby, e.g. when using rails, and using a
 appropriate console.")
     (license license:gpl3+)))
 
+;; Package has no release.  Version is extracted from "Version:" keyword in
+;; main file.
+(define-public emacs-zeno-theme
+  (let ((commit "70fa7b7442f24ea25eab538b5a22da690745fef5")
+        (revision "0"))
+    (package
+      (name "emacs-zeno-theme")
+      (version (git-version "1.0.2" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/zenobht/zeno-theme")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "10v6yf9c5qdsxrp6rk1n1xkv4byyfkinsikskdb2apjg05cx2273"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/zenobht/zeno-theme")
+      (synopsis "Dark theme using different shades of blue for Emacs")
+      (description
+       "This package provides a dark theme using different shades of blue for
+Emacs, inspired by @code{Dracula} theme.")
+      (license license:gpl3+))))
+
 (define-public emacs-zig-mode
   (let ((commit "dbc648f5bca8f3b9ca2cc7827f326f5530115144")
         (revision "0"))
-- 
cgit 1.4.1


From 68945743c2c67cce6129eb1014bccd1172abec04 Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Fri, 14 Jul 2023 22:48:05 +0400
Subject: gnu: Add emacs-exotica-theme.

* gnu/packages/emacs-xyz.scm (emacs-exotica-theme): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e5c7436d0d..8c929862b8 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17593,6 +17593,31 @@ DefaultEncrypt, please refer to the home page or read the comments in the
 source file, @file{jl-encrypt.el}.")
     (license license:gpl3+)))
 
+;; Package has no release.  Version is extracted from "Version:" keyword in
+;; main file.
+(define-public emacs-exotica-theme
+  (let ((commit "ff3ef4f6fa38c93b99becad977c7810c990a4d2f")
+        (revision "0"))
+    (package
+      (name "emacs-exotica-theme")
+      (version (git-version "1.0.2" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/zenobht/exotica-theme")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1kp6q55g3dcya4y79x877vqwxa4z2rkkvhs49pkwr3wljf4af2pd"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/zenobht/exotica-theme")
+      (synopsis "Dark theme for Emacs with vibrant colors")
+      (description
+       "A dark opinionated theme with vibrant colors for Emacs.  Inspired by
+@code{Molokai} and @code{Dracula} themes.")
+      (license license:gpl3+))))
+
 (define-public emacs-extend-smime
   (package
     (name "emacs-extend-smime")
-- 
cgit 1.4.1


From cc2e092c3dbb4a6610e9c2635988e13248328696 Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Fri, 14 Jul 2023 22:39:52 +0400
Subject: gnu: Add emacs-project-mode-line-tag.

* gnu/packages/emacs-xyz.scm (emacs-project-mode-line-tag): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 8c929862b8..86869adadf 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1261,6 +1261,32 @@ face properties and allows configuration of faces and colors.")
 some utility functions, and commands using that infrastructure.")
     (license license:gpl3+)))
 
+;; Package has no release.  Version is extracted from "Version:" keyword in
+;; main file.
+(define-public emacs-project-mode-line-tag
+  (let ((commit "a8809cc1a50cfdedaf7bed2810249ae262884716")
+        (revision "0"))
+    (package
+      (name "emacs-project-mode-line-tag")
+      (version (git-version "0.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url
+                       "https://github.com/fritzgrabo/project-mode-line-tag")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0bmx9a1g199axj9ypqisvfyf1517czw23zg96x1wdzqrpw3cb7cx"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/fritzgrabo/project-mode-line-tag")
+      (synopsis "Display a buffer's project in its mode line")
+      (description
+       "Display information about a buffer's project (a \"project tag\") in
+its mode line.")
+      (license license:gpl3+))))
+
 (define-public git-modes
   (package
     (name "emacs-git-modes")
-- 
cgit 1.4.1


From 4b83e94bd83c96da027df313e9e585c943101ffd Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Fri, 14 Jul 2023 22:10:41 +0400
Subject: gnu: Add emacs-mode-line-bell.

* gnu/packages/emacs-xyz.scm (emacs-mode-line-bell): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 86869adadf..6c32f4140a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7547,6 +7547,28 @@ Also included are keybindings for spec files and Dired buffers, as well as
 snippets for yasnippet.")
       (license license:gpl3+))))
 
+(define-public emacs-mode-line-bell
+  (package
+    (name "emacs-mode-line-bell")
+    (version "0.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/purcell/mode-line-bell")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "13n3di05lgqfm4f8krn3p36yika5znhymp5vr2d747x54hqmgh7y"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/purcell/mode-line-bell")
+    (synopsis "Flash the mode-line instead of ringing the bell")
+    (description
+     "This Emacs package provides a global minor mode @code{mode-line-bell-mode}
+which sets @code{ring-bell-function} to a function that will briefly flash the
+mode-line when the bell is rung.")
+    (license license:gpl3+)))
+
 (define-public emacs-mode-line-idle
   ;; Package has no release.  Version is extracted from "Version:" keyword in
   ;; main file.
-- 
cgit 1.4.1


From 440ce641cc0b6e7f64e2b087222c5d47ce8c597e Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Fri, 14 Jul 2023 23:32:57 +0400
Subject: gnu: Add emacs-persistent-scratch.

* gnu/packages/emacs-xyz.scm (emacs-persistent-scratch): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 6c32f4140a..1d1c11ba75 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -34622,6 +34622,27 @@ one file per value.  This makes it easy to delete or remove unused
 variables.")
     (license license:gpl3+)))
 
+(define-public emacs-persistent-scratch
+  (package
+    (name "emacs-persistent-scratch")
+    (version "0.3.9")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/Fanael/persistent-scratch")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "187cyl005csmmmh292km1v3ffl8x49h5qyn87i4adz9l5sqnpdgj"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/Fanael/persistent-scratch")
+    (synopsis "Preserve the scratch buffer across Emacs sessions")
+    (description
+     "Preserve the state of scratch buffers across Emacs sessions by saving the
+state to and restoring it from a file, with auto-saving and backups.")
+    (license license:bsd-2)))
+
 (define-public emacs-company-emoji
   (package
     (name "emacs-company-emoji")
-- 
cgit 1.4.1


From a0d576bf2695a9a0c1058b73b15eeeb40fceba87 Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Sun, 16 Jul 2023 10:10:26 +0400
Subject: gnu: Add emacs-mu4e-dashboard.

* gnu/packages/emacs-xyz.scm (emacs-mu4e-dashboard): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1d1c11ba75..6eb451e1bb 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -26437,6 +26437,33 @@ displayed in chronological order) or as an Org document where the node tree
 maps the thread tree.")
       (license license:gpl3+))))
 
+;; Package has no releases or tags.  Version is extracted from "Version:"
+;; keyword in main file.
+(define-public emacs-mu4e-dashboard
+  (let ((commit "16ffbb2a36817647e345f60acdfaac66dda28c0f")
+        (revision "0"))
+    (package
+      (name "emacs-mu4e-dashboard")
+      (version (git-version "0.1.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/rougier/mu4e-dashboard")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1fp2f9rvh20r3advbzcgm5vv2dzcyvy1618hfykbm6ac4wjscdll"))))
+      (build-system emacs-build-system)
+      (propagated-inputs (list mu))
+      (home-page "https://github.com/rougier/mu4e-dashboard")
+      (synopsis "Build your own dashboard for mu4e using org-mode")
+      (description
+       "This package provides an @code{org-mode} link type that allows
+execution of various @code{mu4e} queries when clicked.  Such links can be
+organized into a dashboard, by simply writing an org file.")
+      (license license:gpl3+))))
+
 (define-public emacs-pinentry
   (let ((commit "dcc9ba03252ee5d39e03bba31b420e0708c3ba0c")
         (revision "1"))
-- 
cgit 1.4.1


From f88a7d82c7daf84d074a14acbc9fad75b21dbe58 Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Sun, 16 Jul 2023 10:42:43 +0400
Subject: gnu: Add emacs-heaven-and-hell.

* gnu/packages/emacs-xyz.scm (emacs-heaven-and-hell): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 6eb451e1bb..3f2e168d32 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -27132,6 +27132,26 @@ text-tree applications inside GNU Emacs.  It consists of 2 subprojects:
 @command{ztree-diff}).")
       (license license:gpl3))))
 
+(define-public emacs-heaven-and-hell
+  (package
+    (name "emacs-heaven-and-hell")
+    (version "0.0.5")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/valignatev/heaven-and-hell")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1bgs638nsn9hyvc9wbc2jpqm5i3hblld1mhmf0h9z0j6fjr0aapx"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/valignatev/heaven-and-hell")
+    (synopsis "Easily toggle light/dark themes in Emacs")
+    (description "This package makes the process of switching between
+light and dark themes as easy as hitting a single keystroke.")
+    (license license:expat)))
+
 (define-public emacs-helm-org-contacts
   (let ((commit "741eca6239684950219c9a12802386a132491b8c")
         (revision "2"))
-- 
cgit 1.4.1


From 79af3f83665f6e0416259177ed4a1f27860a5c81 Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Sun, 16 Jul 2023 11:16:38 +0400
Subject: gnu: Add emacs-consult-flycheck.

* gnu/packages/emacs-xyz.scm (emacs-consult-flycheck): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3f2e168d32..2835e7d8f1 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -11402,6 +11402,31 @@ provides a front-end interface for the workspace/symbols LSP procedure
 call.")
    (license license:gpl3+)))
 
+(define-public emacs-consult-flycheck
+  ;; This particular commit introduces bug fixes above latest release.
+  (let ((commit "3f2a7c17cc2fe64e0c07e3bf90e33c885c0d7062")
+        (revision "0"))
+    (package
+      (name "emacs-consult-flycheck")
+      (version (git-version "0.9" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/minad/consult-flycheck")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0cvxl6ynbns3wlpzilhg4ldakb91ikpibbr9wpb2wkzbgi5c766c"))))
+      (build-system emacs-build-system)
+      (propagated-inputs (list emacs-consult emacs-flycheck))
+      (home-page "https://github.com/minad/consult-flycheck")
+      (synopsis "Consult integration for Flycheck")
+      (description
+       "This package provides the @code{consult-flycheck} command for Emacs,
+ which integrates @code{Consult} with @code{Flycheck}.")
+      (license license:gpl3+))))
+
 (define-public emacs-eglot-tempel
   (let ((commit "e08b203d6a7c495d4b91ed4537506b5f1ea8a84f")
         (revision "0"))
-- 
cgit 1.4.1


From 29c390673dc97239ee17d14219e2d37daebbd1a3 Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
Date: Sat, 22 Jul 2023 07:40:32 +0200
Subject: gnu: Remove drascula.

This package, along with other SCUMMVM-based games violate the FSDG: they are
neither built from nor point towards their corresponding source code.
See <https://lists.gnu.org/archive/html/guix-devel/2022-08/msg00039.html>
and <https://lists.gnu.org/archive/html/guix-devel/2023-06/msg00091.html>
for more information.

* gnu/packages/games.scm (drascula): Delete variable.
---
 gnu/packages/games.scm | 112 -------------------------------------------------
 1 file changed, 112 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index ec084553da..2ea1f1d02f 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9724,118 +9724,6 @@ the game avoids complex inventory management and character building, relying
 on items and player adaptability for character progression.")
     (license license:isc)))
 
-(define-public drascula
-  (package
-    (name "drascula")
-    (version "1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/scummvm/extras/"
-                                  "Drascula_%20The%20Vampire%20Strikes%20Back/"
-                                  "drascula-" version ".zip"))
-              (sha256
-               (base32
-                "1pj29rpb754sn6a56f8brfv6f2m1p5qgaqik7d68pfi2bb5zccdp"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils)
-                      (ice-9 match))
-         (let* ((out (assoc-ref %outputs "out"))
-                (share (string-append out "/share/drascula"))
-                (scummvm (assoc-ref %build-inputs "scummvm")))
-           ;; Install data.
-           (let ((unzip (search-input-file %build-inputs "/bin/unzip"))
-                 (doc (string-append out "/share/doc/" ,name "-" ,version)))
-             (for-each
-              (lambda (input)
-                (invoke unzip
-                        "-j"
-                        (assoc-ref %build-inputs input)
-                        "-x" "__MACOSX")
-                ;; Every input provides "readme.txt", and we want to
-                ;; preserve them all.  Therefore we rename them first.
-                (match input
-                  ("drascula-int"
-                   (rename-file "readme.txt" "readme-international.txt"))
-                  ("drascula-audio"
-                   (rename-file "readme.txt" "readme-audio.txt"))
-                  (_ #f))
-                ;; Install documentation.
-                (for-each (lambda (f) (install-file f doc))
-                          (find-files "." "\\.(txt|doc)$"))
-                ;; Install data.
-                (for-each (lambda (f) (install-file f share))
-                          (find-files "." "\\.(ogg|00[0-9])$")))
-              '("drascula-audio" "drascula-int" "source")))
-           ;; Create standalone executable.
-           (let* ((bin (string-append out "/bin"))
-                  (executable (string-append bin "/drascula"))
-                  (bash (search-input-file %build-inputs "/bin/bash")))
-             (mkdir-p bin)
-             (with-output-to-file executable
-               (lambda ()
-                 (format #t "#!~a~%" bash)
-                 (format #t
-                         "exec ~a/bin/scummvm --path=~a drascula~%"
-                         scummvm share)))
-             (chmod executable #o755))
-           ;; Create desktop file.  There is no dedicated icon for the
-           ;; game, so we borrow SCUMMVM's.
-           (let ((apps (string-append out "/share/applications")))
-             (mkdir-p apps)
-             (make-desktop-entry-file
-              (string-append apps "/drascula.desktop")
-              #:name "Drascula: The Vampire Strikes Back"
-              #:generic-name "Drascula"
-              #:exec (string-append out "/bin/drascula")
-              #:icon (string-append scummvm "/share/icons/hicolor/scalable/apps/scummvm.svg")
-              #:categories '("AdventureGame" "Game" "RolePlaying")
-              #:keywords '("game" "adventure" "roleplaying" "2D" "fantasy")
-              #:comment '((#f "Classic 2D point and click adventure game")
-                          ("de" "Klassisches 2D-Abenteuerspiel in Zeigen-und-Klicken-Manier")
-                          ("fr" "Jeu classique d'aventure pointer-et-cliquer en 2D")
-                          ("it" "Gioco classico di avventura punta e clicca 2D"))))
-           #t))))
-    (native-inputs
-     (list bash unzip))
-    (inputs
-     `(("scummvm" ,scummvm)
-       ("drascula-int"
-        ,(let ((version "1.1"))
-           (origin
-             (method url-fetch)
-             (uri (string-append "mirror://sourceforge/scummvm/extras/"
-                                 "Drascula_%20The%20Vampire%20Strikes%20Back/"
-                                 "drascula-int-" version ".zip"))
-             (sha256
-              (base32
-               "12236i7blamal92p1i8dgp3nhp2yicics4whsl63v682bj999n14")))))
-       ("drascula-audio"
-        ,(let ((version "2.0"))
-           (origin
-             (method url-fetch)
-             (uri (string-append "mirror://sourceforge/scummvm/extras/"
-                                 "Drascula_%20The%20Vampire%20Strikes%20Back/"
-                                 "drascula-audio-" version ".zip"))
-             (sha256
-              (base32
-               "00g4izmsqzxb8ry1vhfx6jrygl58lvlij09nw01ds4zddsiznsky")))))))
-    (home-page "https://www.scummvm.org")
-    (synopsis "Classic 2D point and click adventure game")
-    (description "Drascula: The Vampire Strikes Back is a classic humorous 2D
-point and click adventure game.
-
-In Drascula you play the role of John Hacker, a British estate agent, that
-gets to meet a gorgeous blond girl who is kidnapped by the notorious vampire
-Count Drascula and embark on a fun yet dangerous quest to rescue her.
-Unfortunately, Hacker is not aware of Drascula's real ambitions: DOMINATING
-the World and demonstrating that he is even more evil than his brother Vlad.")
-    ;; Drascula uses a BSD-like license.
-    (license (license:non-copyleft "file:///readme.txt"))))
-
 (define (make-lure-package name language hash)
   (package
     (name name)
-- 
cgit 1.4.1


From 4423298863933e1a497ba591ce64392223d61319 Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
Date: Sat, 22 Jul 2023 07:52:25 +0200
Subject: gnu: Remove lure.

This package, along with other SCUMMVM-based games violate the FSDG: they are
neither built from nor point towards their corresponding source code.
See <https://lists.gnu.org/archive/html/guix-devel/2022-08/msg00039.html>
and <https://lists.gnu.org/archive/html/guix-devel/2023-06/msg00091.html>
for more information.

* gnu/packages/games.scm (make-lure-package, lure, lure-de, lure-es)
(lure-fr, lure-it): Delete variable.
---
 gnu/packages/games.scm | 106 -------------------------------------------------
 1 file changed, 106 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2ea1f1d02f..26e9b35526 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9724,112 +9724,6 @@ the game avoids complex inventory management and character building, relying
 on items and player adaptability for character progression.")
     (license license:isc)))
 
-(define (make-lure-package name language hash)
-  (package
-    (name name)
-    (version "1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "mirror://sourceforge/scummvm/extras/"
-             "Lure%20of%20the%20Temptress/"
-             name "-" version ".zip"))
-       (sha256
-        (base32 hash))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let* ((out (assoc-ref %outputs "out"))
-                (share (string-append out "/share"))
-                (data (string-append share "/" ,name "/" ,language))
-                (apps (string-append share "/applications"))
-                (bin (string-append out "/bin"))
-                (executable (string-append bin "/" ,name))
-                (scummvm (assoc-ref %build-inputs "scummvm")))
-           (let ((unzip (search-input-file %build-inputs "/bin/unzip")))
-             (invoke unzip "-j" (assoc-ref %build-inputs "source")))
-           (let ((doc (string-append share "/doc/" ,name "-" ,version)))
-             (for-each (lambda (f) (install-file f doc))
-                       (find-files "." "\\.(txt|PDF|pdf)$")))
-           (for-each (lambda (f) (install-file f data))
-                     (find-files "." "\\.(vga|VGA)$"))
-           ;; Build the executable.
-           (mkdir-p bin)
-           (let ((bash (assoc-ref %build-inputs "bash")))
-             (with-output-to-file executable
-               (lambda ()
-                 (format #t "#!~a/bin/bash~%" bash)
-                 (format #t "exec ~a/bin/scummvm -q ~a -p ~a lure~%"
-                         scummvm ,language data))))
-           (chmod executable #o755)
-           ;; Create desktop file.  There is no dedicated
-           ;; icon for the game, so we borrow SCUMMVM's.
-           (mkdir-p apps)
-           (with-output-to-file (string-append apps "/" ,name ".desktop")
-             (lambda _
-               (format #t
-                       "[Desktop Entry]~@
-                     Name=Lure of the Temptress~@
-                     GenericName=Lure~@
-                     Exec=~a~@
-                     Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@
-                     Categories=AdventureGame;Game;RolePlaying;~@
-                     Keywords=game;adventure;roleplaying;2D,fantasy;~@
-                     Comment=Classic 2D point and click adventure game~@
-                     Comment[de]=klassisches 2D-Abenteuerspiel in Zeigen-und-Klicken-Manier~@
-                     Comment[fr]=Jeu classique d'aventure pointer-et-cliquer en 2D~@
-                     Comment[it]=Gioco classico di avventura punta e clicca 2D~@
-                     Type=Application~%"
-                       executable scummvm)))
-           #t))))
-    (native-inputs
-     (list unzip))
-    (inputs
-     (list bash scummvm))
-    (home-page "https://www.scummvm.org")
-    (synopsis "2D point and click fantasy adventure game")
-    (description
-     "Lure of the Temptress is a classic 2D point and click adventure game.
-
-You are Diermot, an unwilling hero who'd prefer a quiet life, and are, to all
-intents and purposes, a good man.  After decades of unrest the King has united
-the warring factions in his kingdom and all his lands are at peace, except
-a remote region around a town called Turnvale.  A revolt has recently taken
-place in Turnvale, a revolt orchestrated by an apprentice sorceress called
-Selena, the titular temptress.  The king calls together his finest horsemen
-and heads off (with you in tow) to Turnvale just to witness how hellish
-mercenary monsters called Skorl are invading the town.
-
-The king's men are defeated, the king is killed and you fall of your horse and
-bang your head heavily on the ground.  You have been *unconscious for a while
-when you realize that you are in a dingy cell guarded by a not so friendly
-Skorl.  Maybe it would be an idea to try and escape...")
-    (license (license:non-copyleft "file:///README"))))
-
-(define-public lure
-  (make-lure-package
-   "lure" "en" "0201i70qcs1m797kvxjx3ygkhg6kcl5yf49sihba2ga8l52q45zk"))
-
-(define-public lure-de
-  (make-lure-package
-   "lure-de" "de" "0sqq7h5llml6rv85x0bfv4bgzwhs4c82p4w4zmfcaab6cjlad0sy"))
-
-(define-public lure-es
-  (make-lure-package
-   "lure-es" "es" "1dvv5znvlsakw6w5r16calv9jkgw27aymgybsf4q22lcmpxbj1lk"))
-
-(define-public lure-fr
-  (make-lure-package
-   "lure-fr" "fr" "1y51jjb7f8023832g44vd1jsb6ni85586pi2n5hjg9qjk6gi90r9"))
-
-(define-public lure-it
-  (make-lure-package
-   "lure-it" "it" "1ks6n39r1cllisrrh6pcr39swsdv7ng3gx5c47vaw71zzfr70hjj"))
-
 (define (make-queen-package name file-prefix release language hash)
   (package
     (name name)
-- 
cgit 1.4.1


From 6ac90e894212a30f7d9bdc1acff90663916781ee Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
Date: Sat, 22 Jul 2023 07:53:29 +0200
Subject: gnu: Remove queen.

This package, along with other SCUMMVM-based games violate the FSDG: they are
neither built from nor point towards their corresponding source code.
See <https://lists.gnu.org/archive/html/guix-devel/2022-08/msg00039.html>
and <https://lists.gnu.org/archive/html/guix-devel/2023-06/msg00091.html>
for more information.

* gnu/packages/games.scm (make-queen-package, queen, queen-de, queen-fr)
(queen-it): Delete variable.
---
 gnu/packages/games.scm | 94 --------------------------------------------------
 1 file changed, 94 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 26e9b35526..1794f6afbd 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9724,100 +9724,6 @@ the game avoids complex inventory management and character building, relying
 on items and player adaptability for character progression.")
     (license license:isc)))
 
-(define (make-queen-package name file-prefix release language hash)
-  (package
-    (name name)
-    (version release)
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://sourceforge/scummvm/extras/"
-                           "Flight%20of%20the%20Amazon%20Queen/"
-                           file-prefix release ".zip"))
-       (sha256
-        (base32 hash))))
-    (build-system copy-build-system)
-    (arguments
-     (list
-      #:install-plan
-      #~'(("queen.1c" #$(string-append "share/" name "/"))
-          (#$name "bin/")
-          (#$(string-append name ".desktop") "share/applications/")
-          ("." #$(string-append "share/doc/" name "-" version)
-           #:include-regexp ("README" "readme")))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'build
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              (with-output-to-file #$name
-                (lambda ()
-                  (format #t "#!~a~%" (search-input-file inputs "bin/sh"))
-                  (format #t "exec ~a -q ~a -p ~a queen~%"
-                          (search-input-file inputs "bin/scummvm")
-                          #$language
-                          (string-append (assoc-ref outputs "out")
-                                         "/share/" #$name))))
-              (chmod #$name #o755)
-              (with-output-to-file #$(string-append name ".desktop")
-                (lambda ()
-                  (format
-                   #t
-                   "[Desktop Entry]~@
-                    Name=Flight of the Amazon Queen~@
-                    GenericName=Queen~@
-                    Comment=Embark on a quest to rescue a kidnapped princess~
-                    and in the process, discover the true sinister intentions~
-                    of a suspiciously located Lederhosen company~@
-                    Comment[de]=Begib dich auf ein Abenteuer, um eine entführte~
-                    Prinzessin zu retten und entdecke die wahren, finsteren~
-                    Absichten eines verdächtig erscheinenden~
-                    Lederhosen-Unternehmens~@
-                    Type=Application~@
-                    Exec=~a~@
-                    Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@
-                    Categories=AdventureGame;Game;RolePlaying;~@
-                    Keywords=adventure;game;roleplaying;fantasy;~%"
-                   (string-append (assoc-ref outputs "out") "/bin/" #$name)
-                   (search-input-file inputs "bin/scummvm")))))))))
-    (native-inputs (list unzip))
-    (inputs (list bash scummvm))
-    (home-page "https://www.scummvm.org/")
-    (synopsis "Classic 2D point and click adventure game")
-    (description "Flight of the Amazon Queen is a 2D point-and-click
-adventure game set in the 1940s.
-
-You assume the role of Joe King, a pilot for hire who is given the job
-of flying Faye Russell (a famous movie star) into the Amazon jungle
-for a photo shoot.  Of course, things never go according to plans.
-After an unfortunate turn of events they find themselves stranded in
-the heart of the Amazon jungle, where Joe will embark on a quest to
-rescue a kidnapped princess and in the process, discover the true
-sinister intentions of a suspiciously located Lederhosen company.  In
-a rich 2D environment, Joe will cross paths with a variety of unlikely
-jungle inhabitants including, but not limited to, a tribe of Amazon
-women and 6-foot-tall pygmies.")
-    (license (license:non-copyleft "file:///readme.txt"))))
-
-(define-public queen
-  (make-queen-package
-   "queen" "FOTAQ_Talkie-" "1.1" "en"
-   "1a6q71q1dl9vvw2qqsxk5h1sv0gaqy6236zr5905w2is01gdsp52"))
-
-(define-public queen-de
-  (make-queen-package
-   "queen-de" "FOTAQ_Ger_talkie-" "1.0" "de"
-   "13vn43x7214vyprlpqabvv71k890nff3d6fjscflr1ll7acjca3f"))
-
-(define-public queen-fr
-  (make-queen-package
-   "queen-fr" "FOTAQ_Fr_Talkie_" "1.0" "fr"
-   "0hq5g4qrkcwm2kn5i4kv4hijs9hi7bw9xl1vrwd1l69qqn30crwy"))
-
-(define-public queen-it
-  (make-queen-package
-   "queen-it" "FOTAQ_It_Talkie_" "1.0" "it"
-   "1h76y70lrpzfjkm53n4nr364nhyka54vbz9r7sadzyzl7c7ilv4d"))
-
 (define-public sky
   (package
     (name "sky")
-- 
cgit 1.4.1


From 445a0359083388b5ee686e6e855f94a3aac5f79c Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
Date: Sat, 22 Jul 2023 07:54:19 +0200
Subject: gnu: Remove sky.

This package, along with other SCUMMVM-based games violate the FSDG: they are
neither built from nor point towards their corresponding source code.
See <https://lists.gnu.org/archive/html/guix-devel/2022-08/msg00039.html>
and <https://lists.gnu.org/archive/html/guix-devel/2023-06/msg00091.html>
for more information.

* gnu/packages/games.scm (sky): Delete variable.
---
 gnu/packages/games.scm | 86 --------------------------------------------------
 1 file changed, 86 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 1794f6afbd..cc6bef1114 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9724,92 +9724,6 @@ the game avoids complex inventory management and character building, relying
 on items and player adaptability for character progression.")
     (license license:isc)))
 
-(define-public sky
-  (package
-    (name "sky")
-    (version "1.2")                     ;1.3 is floppy version
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://sourceforge/scummvm/extras/"
-                           "Beneath%20a%20Steel%20Sky/"
-                           "bass-cd-" version ".zip"))
-       (sha256
-        (base32 "14s5jz67kavm8l15gfm5xb7pbpn8azrv460mlxzzvdpa02a9n82k"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let* ((out (assoc-ref %outputs "out"))
-                (share (string-append out "/share"))
-                (data (string-append share "/" ,name))
-                (apps (string-append share "/applications"))
-                (bin (string-append out "/bin"))
-                (executable (string-append bin "/" ,name))
-                (scummvm (assoc-ref %build-inputs "scummvm")))
-           (let ((unzip (search-input-file %build-inputs "/bin/unzip")))
-             (invoke unzip "-j" (assoc-ref %build-inputs "source")))
-           (let ((doc (string-append share "/doc/bass-" ,version)))
-             (install-file "readme.txt" doc))
-           (for-each (lambda (f) (install-file f data))
-                     (find-files "." "^sky\\."))
-           ;; Build the executable.
-           (mkdir-p bin)
-           (let ((bash (assoc-ref %build-inputs "bash")))
-             (with-output-to-file executable
-               (lambda ()
-                 (format #t "#!~a/bin/bash~%" bash)
-                 (format #t "exec ~a/bin/scummvm -p ~a sky~%" scummvm data))))
-           (chmod executable #o755)
-           ;; Create desktop file.  There is no dedicated
-           ;; icon for the game, so we borrow SCUMMVM's.
-           (mkdir-p apps)
-           (with-output-to-file (string-append apps "/" ,name ".desktop")
-             (lambda _
-               (format #t
-                       "[Desktop Entry]~@
-                       Name=Beneath a Steel Sky~@
-                       GenericName=Bass~@
-                       Exec=~a~@
-                       Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@
-                       Categories=AdventureGame;Game;RolePlaying;~@
-                       Keywords=adventure;game;roleplaying;cyberpunk;~@
-                       Comment=A science-fiction adventure game set in a bleak post-apocalyptic vision of the future~@
-                       Comment[de]=Ein Science-Fiction-Abenteuerspiel \
-angesiedelt in einer düsteren, postapokalyptischen Vision der Zukunft~@
-                       Type=Application~%"
-                       executable scummvm)))
-           #t))))
-    (native-inputs
-     (list unzip))
-    (inputs
-     (list bash scummvm))
-    (home-page "https://www.scummvm.org/")
-    (synopsis "Classic 2D point and click science-fiction adventure game")
-    (description
-     "Beneath a Steel Sky is a science-fiction thriller set in a bleak
-post-apocalyptic vision of the future.  It revolves around Union City,
-where selfishness, rivalry, and corruption by its citizens seems to be
-all too common, those who can afford it live underground, away from
-the pollution and social problems which are plaguing the city.
-
-You take on the role of Robert Foster, an outcast of sorts from the
-city since a boy who was raised in a remote environment outside of
-Union City simply termed ``the gap''.  Robert's mother took him away
-from Union City as a child on their way to ``Hobart'' but the
-helicopter crashed on its way.  Unfortunately, Robert's mother died,
-but he survived and was left to be raised by a local tribe from the
-gap.
-
-Years later, Union City security drops by and abducts Robert, killing
-his tribe in the process; upon reaching the city the helicopter taking
-him there crashes with him escaping, high upon a tower block in the
-middle of the city.  He sets out to discover the truth about his past,
-and to seek vengeance for the killing of his tribe.")
-    (license (license:non-copyleft "file:///readme.txt"))))
-
 (define-public gnurobots
   (package
     (name "gnurobots")
-- 
cgit 1.4.1