unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3
@ 2021-07-04 23:44 Thiago Jung Bauermann via Guix-patches via
  2021-07-05  0:00 ` [bug#49408] [PATCH core-updates 1/5] gnu: TeX Live: Use IniTeX to build a couple of packages Thiago Jung Bauermann via Guix-patches via
                   ` (4 more replies)
  0 siblings, 5 replies; 19+ messages in thread
From: Thiago Jung Bauermann via Guix-patches via @ 2021-07-04 23:44 UTC (permalink / raw)
  To: 49408; +Cc: Thiago Jung Bauermann

Hello,

I verified the signatures of the
texlive-20210325-{source,extra,texmf}.tar.xz files. However, I don’t know
how I could verify the authenticity of the many texlive packages that are
obtained via svn checkout, so in those case I merely updated the expected
hash to match the one reported by Guix. It’s worth noting that the svn://
protocol is neither encrypted nor authenticated.

This is how I decided to organize the patch series, feel free to suggest a
different way:

• Patch 1 changes texlive-latex-l3kernel and texlive-latex-l3packages to be
  built with IniTeX so that they don’t create a dependency loop when the
  second patch is applied.

• Patch 2 updates all hashes for all packages except
  texlive-latex-pdftexcmds, which will be updated in the last patch. It also
  include the changes needed to make `guix pull` succeed.

• Patch 3 adds package texlive-latex-l3backend, which is a new dependency
  for texlive-latex-xkeyval.

• Patch 4 makes texlive-latex-xkeyval depend on texlive-latex-l3backend.

• Patch 5 updates the paths and hash for texlive-latex-pdftexcmds, which was
  moved to a new location since TeX Live 2020.

Between patches 2 and 5, texlive packages which don’t get built by
`guix pull` are broken. Please let me know if this is a problem.

I noticed that not all packages in the TeX Live repository are in Guix.
Since I don’t know what criteria are used to decide what to include, I’m not
adding any new package that became available since TeX Live 2020.

I tested that all packages matching “texlive*” build after this series is
applied using the following script:

--8<---------------cut here---------------start------------->8---
#!/bin/bash

set -e

LOG_FILE="$1"
ROUNDS=$2

function verify_package() {
    local package="$1"
    local log_file="$2"

    if ! guix build "$package"; then
        echo "failure while building $package" >> "$log_file"
        return
    fi

    echo "success while building $package" >> "$log_file"

    if [ "$ROUNDS" -eq 0 ]; then
        return
    fi

    if ! guix build --check --rounds=$ROUNDS "$package"; then
        echo "failure while checking $package" >> "$log_file"
        return
    fi

    echo "success while checking $package" >> "$log_file"

    return
}

guix describe >> "$LOG_FILE"
echo rounds = "$ROUNDS" >> "$LOG_FILE"
echo >> "$LOG_FILE"

for package in $(guix package --list-available='^texlive' | cut -f1)
do
    verify_package $package "$LOG_FILE"
done
--8<---------------cut here---------------end--------------->8---

This series is applied on top of the patch submitted for bug 48064¹.

It’s available in branch ‘texlive-2021-pdftex-by-default-patches’ at
https://gitlab.com/bauermann/guix.git

-- 
Thanks,
Thiago

¹ https://issues.guix.gnu.org/48064#15


Thiago Jung Bauermann (5):
  gnu: TeX Live: Use IniTeX to build a couple of packages
  gnu: TeX Live: Update to TeX Live 2021
  gnu: TeX Live: Add texlive-latex-l3backend
  gnu: TeX Live: Add new dependency to texlive-latex-xkeyval
  gnu: TeX Live: Update texlive-latex-pdftexcmds

 gnu/packages/tex.scm                | 292 +++++++++++++++++-----------
 guix/build-system/texlive.scm       |  13 +-
 guix/build/texlive-build-system.scm |  12 +-
 3 files changed, 195 insertions(+), 122 deletions(-)





^ permalink raw reply	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH core-updates 1/5] gnu: TeX Live: Use IniTeX to build a couple of packages
  2021-07-04 23:44 [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3 Thiago Jung Bauermann via Guix-patches via
@ 2021-07-05  0:00 ` Thiago Jung Bauermann via Guix-patches via
  2021-07-05  0:01   ` [bug#49408] [PATCH core-updates 2/5] gnu: TeX Live: Update to TeX Live 2021 Thiago Jung Bauermann via Guix-patches via
                     ` (3 more replies)
  2021-07-06  0:42 ` [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3 Thiago Jung Bauermann via Guix-patches via
                   ` (3 subsequent siblings)
  4 siblings, 4 replies; 19+ messages in thread
From: Thiago Jung Bauermann via Guix-patches via @ 2021-07-05  0:00 UTC (permalink / raw)
  To: 49408; +Cc: Thiago Jung Bauermann

The package texlive-latex-base in TeX Live 2021 will depend on
texlive-latex-l3kernel and texlive-latex-l3packages. Therefore we need to
remove their build dependency on texlive-latex-base to avoid a circular
dependency.

l3kernel and l3packages don’t need LaTeX during build, just IniTeX.
So to make them use it, modify texlive-build-system to allow disabling
the #:texlive-latex-base and #:tex-format parameters, and also add
a #:tex-engine parameter.

We also need to add texlive-docstrip as a native input, which was
previously provided by texlive-latex-base.

* gnu/packages/tex.scm (texlive-latex-l3kernel,
texlive-latex-l3packages)[arguments]: Add ‘#:tex-engine’, ‘#:tex-format’
and ‘#:texlive-latex-base’ parameters.
[native-inputs]: Add ‘texlive-docstrip’.
* guix/build-system/texlive.scm (lower)[build-inputs]: Don’t add
‘texlive-latex-base’ if its keyword parameter is false.
(texlive-build): Add ‘tex-engine’ keyword parameter.
[builder]: If a ‘tex-engine’ parameter was passed, use it. Otherwise, use
‘tex-format’ as the engine.
* guix/build/texlive-build-system.scm (compile-with-latex): Add ‘engine’
parameter. If the ‘format’ parameter is false, add “-ini” option to the
command line.
(build): Add ‘tex-engine’ parameter. Pass it down to ‘compile-with-latex’.
---
 gnu/packages/tex.scm                | 13 ++++++++++++-
 guix/build-system/texlive.scm       |  9 ++++++++-
 guix/build/texlive-build-system.scm | 12 +++++++-----
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7a78563a75e5..bf557a4cf8ea 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -16,6 +16,7 @@
 ;;; Copyright © 2020, 2021 Paul Garlick <pgarlick@tourbillion-technology.com>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
+;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3348,7 +3349,12 @@ Live distribution.")
                 "0w82d5a4d3rc950ms6ymj4mpw5ndz6qs5x53szcfgzgjxsns9l4w"))))
     (build-system texlive-build-system)
     (arguments
-     '(#:tex-directory "latex/l3kernel"))
+     '(#:tex-directory "latex/l3kernel"
+       #:tex-engine "tex"
+       #:tex-format #f
+       #:texlive-latex-base #f))
+    (native-inputs
+     `(("texlive-docstrip" ,texlive-docstrip)))
     (home-page "https://www.ctan.org/pkg/l3kernel")
     (synopsis "LaTeX3 programmers’ interface")
     (description
@@ -3373,6 +3379,9 @@ that the LaTeX3 conventions can be used with regular LaTeX 2e packages.")
     (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")
@@ -3394,6 +3403,8 @@ that the LaTeX3 conventions can be used with regular LaTeX 2e packages.")
                                       ":")))
              #t)))
        ))
+    (native-inputs
+     `(("texlive-docstrip" ,texlive-docstrip)))
     (propagated-inputs
      `(("texlive-latex-l3kernel" ,texlive-latex-l3kernel)))
     (home-page "https://www.ctan.org/pkg/l3packages")
diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm
index 00a36d5862d4..bb671e5e2b32 100644
--- a/guix/build-system/texlive.scm
+++ b/guix/build-system/texlive.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -116,7 +117,9 @@ level package ID."
                    ;; Keep the standard inputs of 'gnu-build-system'.
                    ,@(standard-packages)))
     (build-inputs `(("texlive-bin" ,texlive-bin)
-                    ("texlive-latex-base" ,texlive-latex-base)
+                    ,@(if texlive-latex-base
+                          `(("texlive-latex-base" ,texlive-latex-base))
+                          '())
                     ,@native-inputs))
     (outputs outputs)
     (build texlive-build)
@@ -128,6 +131,7 @@ level package ID."
                         (tests? #f)
                         tex-directory
                         (build-targets #f)
+                        (tex-engine #f)
                         (tex-format "pdftex")
                         (phases '(@ (guix build texlive-build-system)
                                     %standard-phases))
@@ -151,6 +155,9 @@ level package ID."
                                #:source #+source
                                #:tex-directory #$tex-directory
                                #:build-targets #$build-targets
+                               #:tex-engine #$(if tex-engine
+                                                  tex-engine
+                                                  tex-format)
                                #:tex-format #$tex-format
                                #:system #$system
                                #:tests? #$tests?
diff --git a/guix/build/texlive-build-system.scm b/guix/build/texlive-build-system.scm
index 4c255700bbd2..353fb934a652 100644
--- a/guix/build/texlive-build-system.scm
+++ b/guix/build/texlive-build-system.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -34,16 +35,17 @@
 ;;
 ;; Code:
 
-(define (compile-with-latex format file)
-  (invoke format
+(define (compile-with-latex engine format file)
+  (invoke engine
           "-interaction=nonstopmode"
           "-output-directory=build"
-          (string-append "&" format)
+          (if format (string-append "&" format) "-ini")
           file))
 
-(define* (build #:key inputs build-targets tex-format #:allow-other-keys)
+(define* (build #:key inputs build-targets tex-engine tex-format
+                #:allow-other-keys)
   (mkdir "build")
-  (for-each (cut compile-with-latex tex-format <>)
+  (for-each (cut compile-with-latex tex-engine tex-format <>)
             (if build-targets build-targets
                 (scandir "." (cut string-suffix? ".ins" <>)))))
 




^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH core-updates 2/5] gnu: TeX Live: Update to TeX Live 2021
  2021-07-05  0:00 ` [bug#49408] [PATCH core-updates 1/5] gnu: TeX Live: Use IniTeX to build a couple of packages Thiago Jung Bauermann via Guix-patches via
@ 2021-07-05  0:01   ` Thiago Jung Bauermann via Guix-patches via
  2021-07-05  0:01   ` [bug#49408] [PATCH core-updates 3/5] gnu: TeX Live: Add texlive-latex-l3backend Thiago Jung Bauermann via Guix-patches via
                     ` (2 subsequent siblings)
  3 siblings, 0 replies; 19+ messages in thread
From: Thiago Jung Bauermann via Guix-patches via @ 2021-07-05  0:01 UTC (permalink / raw)
  To: 49408; +Cc: Thiago Jung Bauermann

Use version 20210325 for the tarballs, which is the latest one available on
the historical releases repository. And use subversion tag 2021.3 which is
the latest one available as well.

TeX Live dropped support for using the system’s poppler library after the
2020 version.  Quoting from `m4/kpse-xpdf-flags.m4`:

  # Support for our semi-homegrown libs/xpdf library. This is derived
  # from xpdf source code, but xpdf does not distribute it as a library.
  # It is used by pdftex (and nothing else) to read PDF images.
  # Other engines use the semi-homegrown pplib library (q.v.) for that.

  # The well-known poppler library is also originally derived from xpdf
  # source code, but has been greatly revised and extended. TL used to
  # (sort of) support poppler as the system xpdf, but after the TL 2020
  # release we dropped this, because we switched XeTeX to use pplib, and
  # nothing else used poppler. (No engines ever used poppler to generate
  # their PDF output).
  #
  # poppler is aggressively developed, with requirements for new compilers
  # and language versions. That's fine for them, but since we don't need
  # anything new, it has become too time-consuming and problematic to
  # continue to support it in the TL sources, when we don't have any
  # requirement for it.

Therefore the main change in this commit is making the texlive-bin package
use the embedded pplib and xpdf libraries.

Another noteworthy change is to texlive-latex-l3packages, which now needs
to ship a few pre-generated files that cannot be reproduced during the
build process (the comments in the package definition have more details).

* guix/build-system/texlive.scm (%texlive-tag): Set to “texlive-2021.3”.
(%texlive-revision): Set to 59745.
* gnu/packages/tex.scm (hyph-utf8-scripts, texlive-docstrip,
texlive-unicode-data texlive-hyphen-base, texlive-metafont, texlive-cm,
texlive-courier, texlive-lm, texlive-knuth-lib, texlive-tex-plain,
texlive-hyphen-finnish, texlive-hyphen-german, texlive-hyph-utf8,
texlive-dehyph-exptl, texlive-kpathsea, texlive-latex-fancyvrb,
texlive-graphics-def, texlive-latex-graphics, texlive-hyperref,
texlive-oberdiek, texlive-latex-tools, texlive-latex-l3kernel,
texlive-l3build, texlive-luaotfload, texlive-latex-amsmath, texlive-amscls,
texlive-babel, texlive-generic-babel-german, texlive-babel-swedish,
texlive-psnfss, texlive-latex-draftwatermark, texlive-latex-etoc,
texlive-etoolbox, texlive-latex-polyglossia, texlive-tex-texinfo,
texlive-latex-bookmark, texlive-latex-cmap, texlive-latex-fancyhdr,
texlive-latex-kvoptions, texlive-latex-eso-pic, texlive-latex-multirow,
texlive-latex-parskip, texlive-latex-pdfpages, texlive-metapost,
texlive-latex-acmart, texlive-latex-preview, texlive-latex-acronym,
texlive-pdftex, texlive-latex-media9, texlive-latex-ocgx2,
texlive-latex-ms, texlive-latex-pgf, texlive-latex-pgf-generic,
texlive-latex-koma-script, texlive-generic-ltxcmds, texlive-bibtex,
texlive-context-base, texlive-context, texlive-beamer, texlive-pstricks,
texlive-tools, texlive-latex-xkeyval, texlive-csquotes, texlive-biblatex,
texlive-todonotes, texlive-microtype, texlive-caption, texlive-fontaxes,
texlive-cabin, texlive-newtx, texlive-xcharter, texlive-adjustbox,
texlive-tcolorbox): Update hash.
(texlive-extra-src, texlive-texmf-src): Update version to
“20210325”. Update hash.
(texlive-bin)[source]: Update version to “20210325”. Update hash. Preserve
‘libs/pplib’ and ‘libs/xpdf’.
[inputs]: Update hash for ‘texlive-scripts’.  Remove ‘poppler’.
[arguments]: Remove “--with-system-poppler” and “--with-system-xpdf” from
‘#:configure-flags’.  Remove build phase ‘use-code-for-new-poppler’.
(texlive-hyphen-schoolfinnish): Add public variable.
(texlive-hyphen-macedonian): Add 8bit patterns.  Update hash.
(texlive-latex-base)[template]: Update hash.
[arguments]: Set ‘LUAINPUTS’ environment variable in build phase.
[native-inputs]: Update hash for ‘texlive-luatexconfig’.
[propagated-inputs]: Add ‘texlive-hyphen-schoolfinnish’,
‘texlive-latex-l3kernel’ and ‘texlive-latex-l3packages’.
(texlive-latex-l3packages)[source]: Use ‘texlive-origin’. Update hash. Add
generated files.
[arguments]: Adjust paths for ‘TEXINPUTS’ environment variable. Add build
phase ‘copy-generated-files’.
(texlive-texmf, texlive): Update version to “20210325”.
---
 gnu/packages/tex.scm          | 249 +++++++++++++++++++---------------
 guix/build-system/texlive.scm |   4 +-
 2 files changed, 138 insertions(+), 115 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bf557a4cf8ea..21c263619b66 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -150,7 +150,7 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used."
                               "-checkout"))
     (sha256
      (base32
-      "1gdyc8nmvp5jqlc429rmfzfl0cqqsdayc70y1hxwz025pv9jn960"))))
+      "04xzf5gr3ylyh3ls09imrx4mwq3qp1k97r9njzlan6hlff875rx2"))))
 
 (define (texlive-hyphen-package name code locations hash)
   "Return a TeX Live hyphenation package with the given NAME, using source
@@ -223,37 +223,38 @@ files from LOCATIONS with expected checksum HASH.  CODE is not currently in use.
 (define texlive-extra-src
   (origin
     (method url-fetch)
-    (uri "ftp://tug.org/historic/systems/texlive/2020/texlive-20200406-extra.tar.xz")
+    (uri "ftp://tug.org/historic/systems/texlive/2021/texlive-20210325-extra.tar.xz")
     (sha256 (base32
-             "0kx6r2ncnqpmhs0jhjk4ypq99czcvql9l9n0npcgqzrv4qmzsg94"))))
+             "171kg1n9zapw3d2g47d8l0cywa99bl9m54xkqvp9625ks22z78s6"))))
 
 (define texlive-texmf-src
   (origin
     (method url-fetch)
-    (uri "ftp://tug.org/historic/systems/texlive/2020/texlive-20200406-texmf.tar.xz")
+    (uri "ftp://tug.org/historic/systems/texlive/2021/texlive-20210325-texmf.tar.xz")
     (sha256 (base32
-             "15ashyxm3j78wjik1pp7vwi1wg07xjgh9zv0vkhqim6g7rc7xa8a"))))
+             "070gczcm1h9rx29w2f02xd3nhd84c4k28nfmm8qgp69yq8vd84pz"))))
 
 (define-public texlive-bin
   (package
     (name "texlive-bin")
-    (version "20200406")
+    (version "20210325")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "ftp://tug.org/historic/systems/texlive/2020/"
+       (uri (string-append "ftp://tug.org/historic/systems/texlive/2021/"
                            "texlive-" version "-source.tar.xz"))
        (sha256
         (base32
-         "0y4h4j2qg714srhvf1hvn165w7sanr1j2vzrsgc23kxvrc43sbz3"))
+         "0jsq1p66l46k2qq0gbqmx25flj2nprsz4wrd1ybn286p11kdkvvs"))
        (modules '((guix build utils)
                   (ice-9 ftw)))
        (snippet
         '(begin
            (with-directory-excursion "libs"
-             (let ((preserved-directories '("." ".." "lua53" "luajit")))
+             (let ((preserved-directories '("." ".." "lua53" "luajit" "pplib" "xpdf")))
                ;; Delete bundled software, except Lua which cannot easily be
-               ;; used as an external dependency.
+               ;; 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)
@@ -278,7 +279,7 @@ files from LOCATIONS with expected checksum HASH.  CODE is not currently in use.
                                      "-checkout"))
            (sha256
             (base32
-             "0p3ff839q4kv3zj4xxc76fqcjcjinv8xf7ix0zgwl7yhy5p3sm80"))))
+             "10xpa4nnz1biap7qfv7fb0zk6132ki5g1j8w0bqwkggfncdfl07d"))))
        ("cairo" ,cairo)
        ("fontconfig" ,fontconfig)
        ("fontforge" ,fontforge)
@@ -296,7 +297,6 @@ files from LOCATIONS with expected checksum HASH.  CODE is not currently in use.
        ("mpfr" ,mpfr)
        ("perl" ,perl)
        ("pixman" ,pixman)
-       ("poppler" ,poppler)
        ("potrace" ,potrace)
        ("python" ,python)
        ("ruby" ,ruby)
@@ -329,10 +329,8 @@ files from LOCATIONS with expected checksum HASH.  CODE is not currently in use.
          "--with-system-libpng"
          "--with-system-mpfr"
          "--with-system-pixman"
-         "--with-system-poppler"
          "--with-system-potrace"
          "--with-system-teckit"
-         "--with-system-xpdf"
          "--with-system-zlib"
          "--with-system-zziplib"
          ;; LuaJIT is not ported to powerpc64le* yet.
@@ -365,13 +363,6 @@ files from LOCATIONS with expected checksum HASH.  CODE is not currently in use.
                (("\"gs\"")
                 (string-append "\"" (assoc-ref inputs "ghostscript") "/bin/gs\"")))
              #t))
-         (add-after 'unpack 'use-code-for-new-poppler
-           (lambda _
-             (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.86.0.cc"
-                        "texk/web2c/pdftexdir/pdftoepdf.cc")
-             (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.83.0.cc"
-                        "texk/web2c/pdftexdir/pdftosrc.cc")
-             #t))
          (add-after 'unpack 'patch-dvisvgm-build-files
            (lambda _
              ;; XXX: Ghostscript is detected, but HAVE_LIBGS is never set, so
@@ -538,7 +529,7 @@ This package contains the binaries.")
               "texlive-docstrip"
               (list "/tex/latex/base/docstrip.tex")
               (base32
-               "1vyn0vskxqmq58fbq4r4pknbzpxpyw30nmlmsncnialrmrwqm7k5")
+               "1pxbqbia0727vg01xv8451szm55z2w8sb0vv3kf4iqx5ibb6m0d2")
               #:trivial? #t))
     (home-page "https://www.ctan.org/texlive")
     (synopsis "Utility to strip documentation from TeX files.")
@@ -553,7 +544,7 @@ documentation from TeX files.  It is part of the LaTeX base.")
               (list "/tex/generic/unicode-data/"
                     "/doc/generic/unicode-data/")
               (base32
-               "1mxb55ml92zd00w0zbr0dkscnxdgpxamfabl0izhk3cpz81n9g92")
+               "1d41zvjsig7sqf2j2m89dnbv3gicpb16r04b4ikps4gabhbky83k")
               #:trivial? #t))
     (home-page "https://www.ctan.org/pkg/unicode-data")
     (synopsis "Unicode data and loaders for TeX")
@@ -586,7 +577,7 @@ out to date by @code{unicode-letters.tex}. ")
                     "/tex/generic/hyphen/hypht1.tex"
                     "/tex/generic/hyphen/zerohyph.tex")
               (base32
-               "1vakayd82a4ga0b80mxypbibw2vrf2a8p4v6bim7s97zh8b9mzk3")
+               "1sagn9aybs34m1s6m3zwya5g5kbiwfnw8ifcgxssygmzzs88dgjp")
               #:trivial? #t))
     (home-page "https://tug.org/texlive/")
     (synopsis "Core hyphenation support files")
@@ -650,7 +641,7 @@ to adapt the plain e-TeX source file to work with XeTeX and LuaTeX.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "1r1v3zm600nrl3iskx130fjwj1qib82n02dlca446zb53x0hg6gr"))))
+                "17y72xmz5a36vdsq7pfrwj0j4c7llrm9j5kcq349cpaas7r32lmb"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; no test target
@@ -811,7 +802,7 @@ documents.")
                          "/fonts/map/dvips/cm/cmtext-bsr-interpolated.map"
                          "/doc/fonts/cm/")
                    (base32
-                    "09mvl94qrwlb9b4pkigi151l256v3djhwl4m5lgvk6yhn5y75zrp")
+                    "1ky4gvcn8qn3d61bvb39512b8r92igv6il7vh02hw04223yj6q8i")
                    #:trivial? #t)))
     (package
       (inherit template)
@@ -934,7 +925,7 @@ originals.")
                     "/tex4ht/ht-fonts/alias/adobe/courier/"
                     "/tex4ht/ht-fonts/unicode/adobe/courier/")
               (base32
-               "03vz7zd7gayry9h4pq81s2bqqn2kmxf9yyzs0vap0w9rkf99rrci")
+               "05lglavi073glj26k9966351hka5ac22g4vim61dkfy001vz4i7r")
               #:trivial? #t))
     (home-page "https://ctan.org/pkg/urw-base35")
     (synopsis "URW Base 35 font pack for LaTeX")
@@ -996,7 +987,7 @@ support (for use with a variety of encodings) is provided.")
                     "/fonts/type1/public/lm/"
                     "/tex/latex/lm/")
               (base32
-               "0i1hwr8rp0jqyvs4qyplrirscd4w7lsgwsncyv3yzy80bsa56jq5")
+               "0yyk0dr4yms82mwy4dc03zf5igyhgcb65icdah042rk23rlpxygv")
               #:trivial? #t))
     (home-page "http://www.gust.org.pl/projects/e-foundry/latin-modern/")
     (synopsis "Latin Modern family of fonts")
@@ -1018,7 +1009,7 @@ Computers & Typesetting series.")
                          "/tex/generic/knuth-lib/"
                          "/tex/plain/knuth-lib/")
                    (base32
-                    "0lizrhdr4pirhh4ry44znddksd7akkxli2i6sddm5rzqljiqdy3v")
+                    "1cxyqqprp8sj2j4zp9l0wry8cq2awpz3a8i5alzpc4ndg7a6pgdf")
                    #:trivial? #t)))
     (package
       (inherit template)
@@ -1475,7 +1466,7 @@ incorporates the e-TeX extensions.")
               "texlive-tex-plain"
               (list "/tex/plain/")
               (base32
-               "1qryji08shim7fwjfcm0rcb0m5pwagjv1ahpr3xkfg8mkj160nrg")
+               "0gwygkm8i2jmpf7bfg6fb6824rl7fq4a2s0wni73v0fz6s4chr1n")
               #:trivial? #t))
     (home-page "https://www.ctan.org/pkg/plain")
     (synopsis "Plain TeX format and supporting files")
@@ -1753,12 +1744,24 @@ be replaced by files tailored to individual languages.")
               "texlive-hyphen-finnish" "fi"
               (list "/tex/generic/hyph-utf8/patterns/tex/hyph-fi.tex")
               (base32
-               "1f72b4ydb4zddvw2i004948khmwzigxkdkwfym5v1kkq0183sfpj")))
+               "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
@@ -1820,7 +1823,7 @@ T8M, T8K, and UTF-8 encodings.")
                     "/tex/generic/dehyph/dehyphtex.tex"
                     "/tex/generic/dehyph/README")
               (base32
-               "0wp5by5kkf4ac6li5mbppqzw11500wa7f22p5vpz3m1kwd15zavw")))
+               "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
@@ -2016,9 +2019,10 @@ L7X and UTF-8 encodings.")
   (package
     (inherit (texlive-hyphen-package
               "texlive-hyphen-macedonian" "mk"
-              '("/tex/generic/hyph-utf8/patterns/tex/hyph-mk.tex")
+              '("/tex/generic/hyph-utf8/patterns/tex/hyph-mk.tex"
+                "/tex/generic/hyph-utf8/patterns/tex-8bit/hyph-mk.macedonian.tex")
               (base32
-               "01w4cv8jm9q2gijys7cd7s6lfycdpgw9m26yxicc14ywbpi4ij3i")))
+               "1fv6y8gpic5ciw8cclfxc8h3wr5xir1j0a7shixja1pmdyz7db2b")))
     (synopsis "Macedonian hyphenation patterns")
     (description "This package provides hypenation patterns for Macedonian.")
     ;; XXX: License just says 'GPL'.  Assume GPL2 since the file predates GPL3.
@@ -2343,7 +2347,7 @@ T1/EC and UTF-8 encodings.")
                     "/doc/generic/hyph-utf8/img/miktex-languages.png"
                     "/doc/generic/hyph-utf8/img/texlive-collection.png")
               (base32
-               "1v6f59r1fcp7pk7ddskqdzl7hzbszsxd04mfd3xznv8fc73iv72l")))
+               "0rgp0zn36gwzqwpmjb9h01ns3m19v3r7lpw1h0pc9bx115w6c9jx")))
     (outputs '("out" "doc"))
     (build-system gnu-build-system)
     (arguments
@@ -2476,7 +2480,7 @@ converters, will completely supplant the older patterns.")
               (list "/tex/generic/dehyph-exptl/"
                     "/doc/generic/dehyph-exptl/")
               (base32
-               "1fnqc63gz8gvdyfz45bx8dxn1r1rwrypahs3bqd2vlc8ff76xp86")
+               "0l57a0r4gycp94kz6lrxqvh9m57j2shmbr2laf5zjb0qnrisq46d")
               #:trivial? #t))
     (propagated-inputs
      `(("texlive-hyphen-base" ,texlive-hyphen-base)
@@ -2583,7 +2587,7 @@ UCY (Omega Unicode Cyrillic), LCY, LWN (OT2), and koi8-r.")
                     "/web2c/tcvn-t5.tcx"
                     "/web2c/viscii-t5.tcx")
               (base32
-               "1prvxq211hqfss1bhiykazqfcy298lsz3x8lbmbyrh9c8grnj4ip")
+               "00q2nny7lw7jxyln6ch4h0alygbrzk8yynliyc291m53kds1h0mr")
               #:trivial? #t))
     (home-page "https://www.tug.org/texlive/")
     (synopsis "Files related to the path searching library for TeX")
@@ -2625,7 +2629,7 @@ formats.")
                          "/tex/latex/base/testpage.tex"
                          "/tex/latex/base/texsys.cfg")
                    (base32
-                    "11bcjmn0n7sv7g6r8v6nxl4x1pw0famqmq0v0pbjyz04akhvfvry")
+                    "0msyjz0937rc7hs77v6la152sdiwd73qj41z1mlyh0m3dns9qz4g")
                    #:trivial? #t)))
     (package
       (inherit template)
@@ -2669,7 +2673,8 @@ formats.")
                             cwd "/build:"
                             (string-join
                              (map (match-lambda ((_ . dir) dir)) inputs)
-                             "//:"))))
+                             "//:")))
+                   (setenv "LUAINPUTS" (string-append cwd "/build:")))
 
                  ;; This is the actual build step.
                  (mkdir "build")
@@ -2754,7 +2759,7 @@ formats.")
                   "/tex/generic/config/luatexiniconfig.tex"
                   "/web2c/texmfcnf.lua")
             (base32
-             "0pk0ckwd5p58nqmhlajhbgxynym25jmhv48xm5ns540r996k0g2r")))))
+             "0yjx7nw9mgfgnq1givkzbxh7z7ncw1liaddjgm7n2nwn0aw6xfdg")))))
       (propagated-inputs
        `(("texlive-dehyph-exptl" ,texlive-dehyph-exptl)
          ("texlive-etex" ,texlive-etex)
@@ -2779,6 +2784,7 @@ formats.")
          ("texlive-hyphen-estonian" ,texlive-hyphen-estonian)
          ("texlive-hyphen-ethiopic" ,texlive-hyphen-ethiopic)
          ("texlive-hyphen-finnish" ,texlive-hyphen-finnish)
+         ("texlive-hyphen-schoolfinnish" ,texlive-hyphen-schoolfinnish)
          ("texlive-hyphen-french" ,texlive-hyphen-french)
          ("texlive-hyphen-friulan" ,texlive-hyphen-friulan)
          ("texlive-hyphen-galician" ,texlive-hyphen-galician)
@@ -2822,6 +2828,11 @@ formats.")
          ("texlive-unicode-data" ,texlive-unicode-data)
          ("texlive-ukrhyph" ,texlive-ukrhyph)
          ("texlive-ruhyphen" ,texlive-ruhyphen)
+         ("texlive-latex-l3kernel" ,texlive-latex-l3kernel)
+         ;; 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-latex-l3packages)
          ("texlive-latexconfig" ,texlive-latexconfig)))
       (home-page "https://www.ctan.org/pkg/latex-base")
       (synopsis "Base sources of LaTeX")
@@ -2941,7 +2952,7 @@ users, via its Plain TeX version.)")
               (list "/doc/latex/fancyvrb/README"
                     "/tex/latex/fancyvrb/")
               (base32
-               "005ylzlysmvy21rwkbnrf0hnp5bmsjsj11hydg1d9dnq9ffv2s1h")
+               "0pdilgpw4zc0ipp4z9kdi61nymifyjy2mfpk74xk2cw9vhynkk3w")
               #:trivial? #t))
     (home-page "https://www.ctan.org/pkg/fancyvrb")
     (synopsis "Sophisticated verbatim text")
@@ -2961,7 +2972,7 @@ verbatim source).")
               (list "/doc/latex/graphics-def/README.md"
                     "/tex/latex/graphics-def/")
               (base32
-               "125lm2m9813p29yl7am21kgqdpigyqvrjarg73jpaczifbbbqklf")
+               "0b66fy06safyrd717rfr476g1gz6nqfv1vqvam7ac2yy0g0djb17")
               #:trivial? #t))
     (propagated-inputs
      `(("texlive-latex-epstopdf-pkg" ,texlive-latex-epstopdf-pkg)))
@@ -3000,7 +3011,7 @@ set default \"driver\" options for the color and graphics packages.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0asln498brkd1miyhc7029fjx7gcj6vbbas5aan6w289ac4yz54h"))))
+                "0fgjl58f25zvagssz4dwmmsclzw8cr7mx00kdrbx2kcnamcb7h8d"))))
     (build-system texlive-build-system)
     (arguments '(#:tex-directory "latex/graphics"))
     (propagated-inputs
@@ -3149,7 +3160,7 @@ XML, using UTF-8 or a suitable 8-bit encoding.")
                          "/tex/latex/hyperref/ntheorem-hyper.sty"
                          "/tex/latex/hyperref/xr-hyper.sty")
                    (base32
-                    "1d9myrrwf9zr62j5vp9q4drxs7rj4b06wq04imrnzban5s4gaq6v"))))
+                    "0nmbxaq676m2y9fgdji0bxqchmrli4hwhspijaszx51b3ki6bj2h"))))
     (package
       (inherit template)
       (arguments
@@ -3207,7 +3218,7 @@ pdf and HTML backends.  The package is distributed with the @code{backref} and
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "1ff6yjchdmn7lyllfrnxygjr2ipkrjbb1rs5iyryn47rc3r8mpmk"))))
+                "1cadrkpdqs65gxsaszfgfd8wqp8pvpik2sjmlyq3hz5p9yna3p9m"))))
     (build-system texlive-build-system)
     (arguments
      '(#:tex-directory "latex/oberdiek"
@@ -3265,7 +3276,7 @@ files have changed.  It is based on MD5 checksum, provided by pdfTeX.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "1p92bg1wdlg28m7xbdipx8rxavvpbmsx8zy845bk2rdqhc9gbhkl"))))
+                "1vm5wfyd0vbmv31a29fc7k8y14xiw00msvdx9n7dzsn9zpfjflqs"))))
     (build-system texlive-build-system)
     (arguments
      '(#:tex-directory "latex/tools"
@@ -3346,7 +3357,7 @@ Live distribution.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0w82d5a4d3rc950ms6ymj4mpw5ndz6qs5x53szcfgzgjxsns9l4w"))))
+                "068xkinrkl6qjf8r6a9i0msvnzp4y7a3gnd2h12ws0km1dv19r20"))))
     (build-system texlive-build-system)
     (arguments
      '(#:tex-directory "latex/l3kernel"
@@ -3369,13 +3380,20 @@ that the LaTeX3 conventions can be used with regular LaTeX 2e packages.")
   (package
     (name "texlive-latex-l3packages")
     (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "l3packages"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "15m3ly55gj8hk5xrkpw5bkj0ddwkk4v7qxa6sl3rkymdka1xl3cc"))))
+    (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")))
     (build-system texlive-build-system)
     (arguments
      '(#:tex-directory "latex/l3packages"
@@ -3393,15 +3411,20 @@ that the LaTeX3 conventions can be used with regular LaTeX 2e packages.")
            (lambda _
              (let ((cwd (getcwd)))
                (setenv "TEXINPUTS"
-                       (string-append cwd "/l3keys2e:"
-                                      cwd "/xparse:"
-                                      cwd "/xfrac:"
-                                      cwd "/xfp:"
-                                      cwd "/xtemplate"
+                       (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)))
+             #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)))))
        ))
     (native-inputs
      `(("texlive-docstrip" ,texlive-docstrip)))
@@ -3470,7 +3493,7 @@ the l3kernel and xparse bundles from the LaTeX 3 development team.")
                          ;; /doc/latex/l3build and the man page in the future.
                          "/source/latex/l3build/")
                    (base32
-                    "0hqb0f5rpj3mfmxfyn8cgxrm1j5ij466a9y23s0xxpmv11ma5i0i")
+                    "1fcay05jj53qgp2b98jpawi0id298fs5xc4y1r5krrfr4sp4hd59")
                    #:trivial? #t)))
     (package
       (inherit template)
@@ -3555,7 +3578,7 @@ this bundle for use independent of ConTeXt.")
                          "/scripts/luaotfload/luaotfload-tool.lua"
                          "/tex/luatex/luaotfload/")
                    (base32
-                    "0a07m8gckkhzj30rjglj4abpx6pqhl9bx4vq2ak29k0wa3s9rm76")
+                    "10wznvxx3qsl88n560py5vyx5r3a3914anbqfhwcmhmwg097xxl4")
                    #:trivial? #t)))
     (package
       (inherit template)
@@ -3585,7 +3608,7 @@ loading fonts by their proper names instead of file names.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "1jx4sd35iwcr5qpvnirshp4rdffqq09k6sbmhwxi8kkir4x5hkmc"))))
+                "172zybw7rp05jca8wl6x0mh6z6gncdyi1j9wdfyjnhbvqw0z4wi4"))))
     (build-system texlive-build-system)
     (arguments '(#:tex-directory "latex/amsmath"))
     (home-page "https://www.ctan.org/pkg/amsmath")
@@ -3611,7 +3634,7 @@ definitions.")
                          "/source/latex/amscls/"
                          "/bibtex/bst/amscls/")
                    (base32
-                    "1mv96i5372257zaciv06n1wwa7v09q0fa9pbq9kck826a0syidvs"))))
+                    "0vw0b815slvfqfd8qffyfzb3xfvyv6k77m12xp0l67hs8p08s5b7"))))
     (package
       (inherit template)
       (arguments
@@ -3642,7 +3665,7 @@ distribution.")
                          "/source/latex/babel/"
                          "/makeindex/babel/")
                    (base32
-                    "0xjj4h48vdb9ydyg13c5jyfi4vm39117c8jv2gjrvjw89h0djbp1"))))
+                    "0qr5vjp79g1c1l6k173qhfdfabgbky73wymzhm56pazx4a8r08wz"))))
     (package
       (inherit template)
       (arguments
@@ -3717,7 +3740,7 @@ for Canadian and USA text.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "129f9w41cb6yyrr6kpv3zz9ml6334hyq1wcz7j9jn47p0hlxqfk8"))))
+                "1x9hnr9gz5mqdb97cinivn9xjnfr4qi996aa4cnr2sm2dsbhqxnp"))))
     (build-system texlive-build-system)
     (arguments '(#:tex-directory "generic/babel-german"))
     (home-page "https://www.ctan.org/pkg/babel-german")
@@ -3735,7 +3758,7 @@ Swiss varieties of German.")
                    "texlive-babel-swedish"
                    (list "/source/generic/babel-swedish/")
                    (base32
-                    "0swdg2l5i7cbcvy4q4xgsnwwnbxiyvs6f5b72kiw7mjn24v27g8f"))))
+                    "03rp4n9wkqyckman765r8v8j2pg5fg9frbfxsnhq0i2mr0yhbr6v"))))
     (package
       (inherit template)
       (arguments
@@ -3873,7 +3896,7 @@ language that is written in a Cyrillic alphabet.")
                          "/tex/latex/psnfss/upsy.fd"
                          "/tex/latex/psnfss/upzd.fd")
                    (base32
-                    "1ql4gidwf5m5gwcwwmx7vj60lj4xygw02pm5mzin49nlwsa1vbnv"))))
+                    "11f14dzhwsy4pli21acccip43d36nf3pac33ihjffnps1i2mhqkd"))))
     (package
       (inherit template)
       (arguments
@@ -4192,7 +4215,7 @@ package.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0alshj9d2cdssqfawhyqmgsvqysmn7dgfk8bc59ni1bii3ydm2zm"))))
+                "0rhn74ywv000b89w8qjf1i0qsk6kd1mjapfwis14jwjvbjqgvj95"))))
     (build-system texlive-build-system)
     (arguments '(#:tex-directory "latex/draftwatermark"))
     (home-page "https://www.ctan.org/pkg/draftwatermark")
@@ -4264,7 +4287,7 @@ also provided.")
                 "/doc/latex/etoc/etoc.pdf"
                 "/tex/latex/etoc/")
               (base32
-               "0i4fgqzqajirjyih6gbx890l17y648mdfqm09v3iz4af0dz4mbdy")
+               "0198cn75m1y8ggbfv1qlnif0d9275f6mxqsansyqw4np0rv6q9sv")
               #:trivial? #t))
     (home-page "https://www.ctan.org/pkg/etoc")
     (synopsis "Completely customisable TOCs")
@@ -4676,7 +4699,7 @@ hyperlink to the target of the DOI.")
               (list "/doc/latex/etoolbox/"
                     "/tex/latex/etoolbox/")
               (base32
-               "1w9mycfa0lx9whjzfybx58608phcrfk33w3igy566qv23a1z9rzc")
+               "070iaj540rglf0c80l0hjkwg6aa7qyskhh4iwyhf7n8vrg5cjjab")
               #:trivial? #t))
     (home-page "https://www.ctan.org/pkg/etoolbox")
     (synopsis "e-TeX tools for LaTeX")
@@ -4902,7 +4925,7 @@ array environments; verbatim handling; and syntax diagrams.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0c3hrki9pmhz4iall0436wrlrg6qkb1fsdfhz9hv7ysxryr2gihj"))))
+                "1ci6hr8hx4g2x359n6wqvw6w8fv42cjjpzxxxd3pn6av5nkaiav3"))))
     (build-system texlive-build-system)
     (arguments '(#:tex-directory "latex/polyglossia"))
     (home-page "https://www.ctan.org/pkg/polyglossia")
@@ -4948,7 +4971,7 @@ situations where longtable has problems.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "1ngzgiy8wd3b9gnbx802x90xa179xxm7vf5jhfdkpgrfxwlycfby"))))
+                "1qcmcsxdsibca0mad559vhz36xaxsbkivgv1hc98vdyd90fg4y31"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
@@ -5062,7 +5085,7 @@ command.")
               (list "/doc/latex/bookmark/"
                     "/tex/latex/bookmark/")
               (base32
-               "1vl1rrydh5jh78llp4i5r1hvznghm9gddwcnfnzwlgp9z67gybh1")
+               "0xwjdah0p4an0fknvgj9y5phl62sf522z6570pvy6c09hkz0j4h1")
               #:trivial? #t))
     (home-page "https://www.ctan.org/pkg/bookmark")
     (synopsis "Bookmark (outline) organization for hyperref")
@@ -5109,7 +5132,7 @@ drivers, and VTeX and pdfTeX.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "1s1rv6zgw105w2j6ffhnk914qrix87y1ndzri1q72g2kbr91zlbg"))))
+                "0m4r52gw9vwsi1pzwh0cy03jxhwizymi4a2fj3jfs5rrvh105r5y"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
@@ -5198,7 +5221,7 @@ floats, center, flushleft, and flushright, lists, and pages.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0hrwspqkqfahxyzzsnjyrxlgxj06zw1f3636gx76pvl4xhvdj1cj"))))
+                "1h2zv7cps0pknqhy2dyfclyi002lmsfshm0rn6ywfl9p4fnvh0bc"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
@@ -5354,7 +5377,7 @@ in SGML; use maths minus in text as appropriate; simple Young tableaux.")
               (list "/doc/latex/kvoptions/"
                     "/tex/latex/kvoptions/")
               (base32
-               "04v733njj6ynf1prj5rxljqbjq925jyycdprc78n7g01knn13wgr")
+               "02i4n2n3j4lg68d3nam08m63kb4irc99wfhyc2z51r02lm1wwmvw")
               #:trivial? #t))
     (propagated-inputs
      `(("texlive-generic-kvsetkeys" ,texlive-generic-kvsetkeys)
@@ -5668,7 +5691,7 @@ one of the packages @code{calrsfs} and @code{mathrsfs}.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0y2y08kr3w6asm9lblj9yywqmhaal36fq71zzcbfsc7cvwf641q7"))))
+                "12f7pbhiav4iz3rra5vq85v9f14h8j1ybi42kvnkzgjsay87p7gf"))))
     (build-system texlive-build-system)
     (arguments '(#:tex-directory "latex/eso-pic"))
     (home-page "https://www.ctan.org/pkg/eso-pic")
@@ -5762,7 +5785,7 @@ in the form @code{key=value} are available, for example:
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "1bfpl8mr4h3p46649wb7pdkc3l44r8fqbv89abb3jj0zh8c10928"))))
+                "1kak9i6nwz6vc4xjj6lbvkb69s49pis6qynjzvsjraxbdw28y2dq"))))
     (build-system texlive-build-system)
     (arguments '(#:tex-directory "latex/multirow"))
     (home-page "https://www.ctan.org/pkg/multirow")
@@ -5823,7 +5846,7 @@ positions; a grid for orientation is available.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "12kdsrr55lp0s4xl279gh6mi9gw909vmd96p10dvhbazgxn3ccxs"))))
+                "1zll8jci8lsd7y44j567akf6y8fp2p7qq23rs527zhr0br9mn3sh"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
@@ -5853,7 +5876,7 @@ designed class) helps alleviate this untidiness.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "1r1g9lb6bqjrahqmdkazsnifcyxgkp8r33za2h60h50jfvrab66f"))))
+                "140kl8r7g2ak2frjn5pmwiwibfynyfwp897r9vk8pypmn390lzr2"))))
     (build-system texlive-build-system)
     (arguments '(#:tex-directory "latex/pdfpages"))
     (home-page "https://www.ctan.org/pkg/pdfpages")
@@ -6413,7 +6436,7 @@ the derived Type 1 font, together with support files for TeX (LaTeX).")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "01ghqyaxxkfscs9jjgnx65hmvqllfzgxc0r5vwpqs7y1h97y6cgc"))))
+                "140k9dz2g2vj5ypgyqx3px9c1y9a820y8kq139p96lw0yk6839aw"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
@@ -6442,7 +6465,7 @@ than the bitmaps Metafont creates.")
               (uri (texlive-ref "latex" "acmart"))
               (sha256
                (base32
-                "1avk9wl7hmgxvv8axd134wl6l8khvw7chw568nc8q70xwiwcqcpk"))
+                "12wxav9r6v7dlfja9myrwz7famgfpcfwd292qzmgg283xgngh9kd"))
               (file-name (string-append name "-" version "-checkout"))))
     (build-system texlive-build-system)
     (arguments '(#:tex-directory "latex/acmart"))
@@ -6614,7 +6637,7 @@ package of that name now exists.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "1mcp0x3snhx9phhfxqwn6d12b84vi049ljd1l11ianp3i4kad6ls"))))
+                "0hnf821yvki9bzfkz79ns9m1msjp3yvd4dhf3268wrpr1zjx6w8v"))))
     (build-system texlive-build-system)
     (arguments
      '(#:tex-directory "latex/preview"
@@ -6646,7 +6669,7 @@ files.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0dl3dliz0vwds3804s1kxaj0ghd721v2c6hws9ghx0bjky09yxbx"))))
+                "09pd4wynksg1y1ddxnqbhk2dc185zw5nyi794d86n3qx8l014ijy"))))
     (build-system texlive-build-system)
     (arguments '(#:tex-directory "latex/acronym"))
     (home-page "https://www.ctan.org/pkg/acronym")
@@ -6675,7 +6698,7 @@ e-TeX.")
                     "/tex/generic/config/pdftex-dvi.tex"
                     "/tex/generic/pdftex/")
               (base32
-               "181krzhxs61s62fr6gz7x08c57rbgc2b8i2pr7r8hr6f706ywp26")
+               "1wx928rqsv0x1a8vc7aq49w3nglr4bmlhl822slqglymfxrmb91b")
               #:trivial? #t))
     (home-page "https://www.ctan.org/pkg/pdftex")
     (synopsis "TeX extension for direct creation of PDF")
@@ -6690,7 +6713,7 @@ directly generate PDF documents instead of DVI.")
 (define texlive-texmf
   (package
    (name "texlive-texmf")
-   (version "20200406")
+   (version "20210325")
    (source texlive-texmf-src)
    (build-system gnu-build-system)
    (inputs
@@ -6767,7 +6790,7 @@ This package contains the complete tree of texmf-dist data.")
 (define-public texlive
   (package
    (name "texlive")
-   (version "20200406")
+   (version "20210325")
    (source #f)
    (build-system trivial-build-system)
    (inputs `(("bash" ,bash-minimal)     ;for wrap-program
@@ -7159,7 +7182,7 @@ required: automatic sectioning and pagination, spell checking and so forth.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0ganz4r78zmvq0s3w9d59pc2qh9pv0akv21f57yc3d5yyb520p6x"))))
+                "0a1v70k6231323y1lazfda1y9568w8hn7c8jhc7rblkhdfv3slw7"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
@@ -7199,7 +7222,7 @@ specification.  It replaces the now obsolete @code{movie15} package.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0x7v3ih7k9hqfcnya0wchks63b67yngi21a6343vlwzdqn84mbyp"))))
+                "1mrz1mj59m27bfya52vi4lm84ifisaf30pmf8id1biqwcq4jyynh"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
@@ -7240,7 +7263,7 @@ It also ensures compatibility with the @code{media9} and @code{animate} packages
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "07zqxynjh3qnnb4fxx5bhw4r21dbsrhanrq38ag62acr876l7agm"))))
+                "04ww5abfm7dx81d21yr2gwy9jswaalnfm2384xp4cyx7srd9spfv"))))
     (build-system texlive-build-system)
     (arguments
      '(#:tex-directory "latex/ms"
@@ -7400,7 +7423,7 @@ striking out (line through words) and crossing out (/// over words).")
        (file-name (string-append name "-" version "-checkout"))
        (sha256
         (base32
-         "1hxivv4iq4ji1rz34fdx3hf9i0dj3a8336w1pa87jyavbl07n5g7"))))
+         "1jk10rxz5f8vh46am11b40hxhhikk67h9jr3z877q5qc8kwppgza"))))
     (build-system trivial-build-system)
     (native-inputs
      `(("texlive-latex-pgf-generic"
@@ -7414,7 +7437,7 @@ striking out (line through words) and crossing out (/// over words).")
            (file-name (string-append "texlive-latex-pgf-generic" version "-checkout"))
            (sha256
             (base32
-             "1gh1vm8hkfgz1kw1cdws9hbw9llzw6n7w0v7z763am5amd3cyhhm"))))))
+             "05zdq7y3am109m5534ahqqp9x5iar3ha68v1r4zkrdly2mijxz2j"))))))
     (propagated-inputs
      `(("texlive-latex-xcolor" ,texlive-latex-xcolor)))
     (arguments
@@ -7458,7 +7481,7 @@ produce either PostScript or PDF output.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "18bfdfhdfc7nxr29wvcmp08wgq6f3fc7yysg1sgzgsqrffr1viwa"))))
+                "1m6i8162r6ka19q517llrf0lax80rrsq564qirwk1chv5dqsmnfi"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
@@ -7702,7 +7725,7 @@ these items with a simple syntax.")
               "texlive-generic-ltxcmds"
               '("/tex/generic/ltxcmds/")
               (base32
-               "0mdzy76sbc3pmas5zqxn35w9xcg4v7j4p31jcjm9f4hzm27y974a")
+               "1lr77yai2qivlx26s5094czpfxmg96bhxps5wbm8xn7cpsw0zbd9")
               #:trivial? #t))
     (home-page "https://www.ctan.org/pkg/ltxcmds")
     (synopsis "LaTeX kernel commands extracted for general use")
@@ -7917,7 +7940,7 @@ AMS-LaTeX, AMS-TeX, and plain TeX).  The distribution includes Michael Barr's
        (file-name (string-append name "-" version "-checkout"))
        (sha256
         (base32
-         "056q9sg3bn8j70laspwdvh7fr3635l7vv3762h6rq79a58g3bya4"))))
+         "0fr0s3jhrvplddb42if570dxllz54fa0pf4d2am27h8m385nghbf"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
@@ -7976,7 +7999,7 @@ Support for use with LaTeX is available in @code{freenfss}, part of
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "145klhcf1i1n9rldjxccd3gkjxwp3i36601xlhch8kyf64rrgybk"))))
+                "1xprxdy0a5bwhyiyzdffq0q0dd4ijhra8hs39djdjd32r1mk3n8a"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
@@ -8028,7 +8051,7 @@ of support information.")
                     "/tex/generic/context/ppchtex/"
                     "/tex/latex/context/")
               (base32
-               "0krbxj0cjyy9b6xv5xx670rh8y3pxbqziljjj80qbdwixk1lf01q")
+               "0qrc9278h50c9k94jdjlbcbjnsmidxf7pqh10azqf6sgzifx3d7s")
               #:trivial? #t))
     (home-page "https://www.ctan.org/pkg/context")
     (synopsis "ConTeXt macro package")
@@ -8048,7 +8071,7 @@ for a wealth of support information.")
               (list "/doc/latex/beamer/"
                     "/tex/latex/beamer/")
               (base32
-               "1yw9ixmjc0h1nqxsvd8lvibdggcysx25001pzzixg1b00l2jf242")
+               "091n27n4l3iac911bvmpp735ffryyzaq46mkclgn3q9jsvc4ngiv")
               #:trivial? #t))
     (propagated-inputs
      `(("texlive-latex-hyperref" ,texlive-latex-hyperref)
@@ -8182,7 +8205,7 @@ change.")
                          "/tex/generic/pstricks/"
                          "/tex/latex/pstricks/")
                    (base32
-                    "0sdq0ij83vg154205n1cps9yirr45240dfcly4bms2cqc789bk5a")
+                    "15c9iqfq2y9c8c78cvqb6vzd5a5rm7qq5x7m05jq1hb8sgqrqb0j")
                    #:trivial? #t)))
     (package
       (inherit template)
@@ -8281,7 +8304,7 @@ LuaTeX (respectively) is not the engine in use.")
                    (list "/doc/latex/tools/"
                          "/source/latex/tools/")
                    (base32
-                    "1860bll28mr8nhbdfx073mj87vgg3gpc62v8bk9q0kq8pg0wsx1a"))))
+                    "1xas0b69r3d5x4zhcqysgybyqaikd9avv6r1bdckb947id3iaz58"))))
     (package
       (inherit template)
       (arguments
@@ -8316,7 +8339,7 @@ are part of the LaTeX required tools distribution, comprising the packages:
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0wancavix39j240pd8m9cgmwsijwx6jd6n54v8wg0x2rk5m44myp"))))
+                "0w4x82wmdvcmy8z3p55xvpz5q7jac1q1j591hi8mngfyqa8rda1c"))))
     (build-system texlive-build-system)
     (arguments
      '(#:tex-directory "latex/xkeyval"
@@ -8482,7 +8505,7 @@ to what constitutes a good table in this context.  The package offers
                    (list "/doc/latex/csquotes/"
                          "/tex/latex/csquotes/")
                    (base32
-                    "1k7riymar0xx41n03p6yscrsjr2mzmzzkqihh2yv4lixd1nd7l8j")
+                    "17y5mrmjmi7n0cgq4cnqr55f4bni6lx1pfdv5pzsmbrzha3mhbfg")
                    #:trivial? #t)))
     (package
       (inherit template)
@@ -8540,7 +8563,7 @@ XML file.
                    (list "/doc/latex/biblatex/"
                          "/tex/latex/biblatex/")
                    (base32
-                    "0bq15ynx84v3ppz5ar1k321k1ck85x2p0irgxgzjh1lna9h6w7v0")
+                    "091cz2vrq22d1fr05wljd8vbllsz95q2hn2p8hhrwb2l2xrmxwn8")
                    #:trivial? #t)))
     (package
       (inherit template)
@@ -8579,7 +8602,7 @@ section.
                    (list "/doc/latex/todonotes/"
                          "/tex/latex/todonotes/")
                    (base32
-                    "0lvxsskz4bdfxhd59hf77kiq8k4nh2spb66vc6hifdgi21z8r8wm")
+                    "1jqw8jy73488bdr971w0dnlggsvicagpnpx8ddqkma920ba8rabp")
                    #:trivial? #t)))
     (package
       (inherit template)
@@ -8618,7 +8641,7 @@ included in the @code{units} bundle.")
                    (list "/doc/latex/microtype/"
                          "/tex/latex/microtype/")
                    (base32
-                    "1yig4i0alqrb1a6hhhlh5y0y4dzpznh698j0cb9632m2cd3aghwz")
+                    "07861ixrjzxm0l24z82ivhaj4v6xm4ijbaabp66jxsf8s8h7dq9n")
                    #:trivial? #t)))
     (package
       (inherit template)
@@ -8643,7 +8666,7 @@ the bundle.")
                    (list "/doc/latex/caption/"
                          "/tex/latex/caption/")
                    (base32
-                    "11wnakgbqbpqvc6rr1j0s7qw5jvkhf3miizax4l73i87a90gxk6b")
+                    "1isnn375d14xsx398j3m8rbb0pdk12kijw4xcgl82xici170klwq")
                    #:trivial? #t)))
     (package
       (inherit template)
@@ -8866,7 +8889,7 @@ matching maths fonts are provided by the @code{fourier} and
        (file-name (string-append name "-" version "-checkout"))
        (sha256
         (base32
-         "19mhp9l7cjw0sbq55c9lz0l2pffkyhyir3i63jqynifjmglbgkl7"))))
+         "0j3w1y66pkf3bjl9dh5xy3lfg33rg08s4wx37a3jcndvcji20j3f"))))
     (build-system texlive-build-system)
     (arguments '(#:tex-directory "latex/fontaxes"))
     (home-page "http://www.ctan.org/pkg/fontaxes")
@@ -8911,7 +8934,7 @@ or if it differs from the weight desired for another font family.  The
                     "/fonts/vf/impallari/cabin/"
                     "/tex/latex/cabin/")
               (base32
-               "0878gc4aqs9168kfb1j3js7rrxvf9lrxwfqzc9cag1cjy60nqljy")
+               "1gqqqbj7i18fs1ss5n3axd821hzq5kbv1dl7dqxp4gba619f1rli")
               #:trivial? #t))
     (home-page "https://www.ctan.org/pkg/cabin")
     (synopsis "Humanist Sans Serif font with LaTeX support")
@@ -8942,7 +8965,7 @@ use with [pdf]LaTeX.")
                     "/fonts/vf/public/newtx/"
                     "/tex/latex/newtx/")
               (base32
-               "0fa90qz8px369yk0x1nhmq4901rvnclx06ijb4ir57f2324rrg8d")
+               "0h0wm3cd0wxag5x7vy3vgr42jd8m6ffkl90pnkvqdxzbnfdjv3l6")
               #:trivial? #t))
     (home-page "https://www.ctan.org/pkg/newtx")
     (synopsis "Repackaging of the TX fonts with improved metrics")
@@ -8970,7 +8993,7 @@ mathematics package that matches Libertine text quite well.")
                     "/fonts/vf/public/xcharter/"
                     "/tex/latex/xcharter/")
               (base32
-               "1qlid98lg0wcdq6hpk9kl2cl139pxcw6y8x8mfah2j95wq1i64lm")
+               "0d8rvcmvxrlxqqxpirxqbhmiijpsz5y4vvldh1jnc018aannjlhm")
               #:trivial? #t))
     (home-page "https://www.ctan.org/pkg/xcharter")
     (synopsis "Extension of the Bitstream Charter fonts")
@@ -9247,7 +9270,7 @@ The macros were designed for use within other macros.")
                    (list "/doc/latex/adjustbox/"
                          "/source/latex/adjustbox/")
                    (base32
-                    "14vd0yd50bky2pbbjkn59q1aglnqpdhh8vwjdyan0jkzljsr2ch8"))))
+                    "074nxbnl184b6iwhis5n85pilq3b2pld3bbrq0wc30hw462m898k"))))
     (package
       (inherit template)
       (arguments
@@ -9288,7 +9311,7 @@ provided box macros are @code{\\lapbox}, @code{\\marginbox},
                    (list "/doc/latex/tcolorbox/"
                          "/tex/latex/tcolorbox/")
                    (base32
-                    "1swhagdj0a39ssifp29a36ldrjqmx8w92dqsgsjpal6lhksvzn2w")
+                    "1qnsbblkadzdn1fx2k21xnlwcb35pg9xya24chkm66jmidi22qp0")
                    #:trivial? #true)))
     (package
       (inherit template)
diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm
index bb671e5e2b32..279235f38498 100644
--- a/guix/build-system/texlive.scm
+++ b/guix/build-system/texlive.scm
@@ -45,8 +45,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-2020.0")
-(define %texlive-revision 54632)
+(define %texlive-tag "texlive-2021.3")
+(define %texlive-revision 59745)
 
 (define (texlive-origin name version locations hash)
   "Return an <origin> object for a TeX Live package consisting of multiple




^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH core-updates 3/5] gnu: TeX Live: Add texlive-latex-l3backend
  2021-07-05  0:00 ` [bug#49408] [PATCH core-updates 1/5] gnu: TeX Live: Use IniTeX to build a couple of packages Thiago Jung Bauermann via Guix-patches via
  2021-07-05  0:01   ` [bug#49408] [PATCH core-updates 2/5] gnu: TeX Live: Update to TeX Live 2021 Thiago Jung Bauermann via Guix-patches via
@ 2021-07-05  0:01   ` Thiago Jung Bauermann via Guix-patches via
  2021-07-05  0:01   ` [bug#49408] [PATCH core-updates 4/5] gnu: TeX Live: Add new dependency to texlive-latex-xkeyval Thiago Jung Bauermann via Guix-patches via
  2021-07-05  0:01   ` [bug#49408] [PATCH core-updates 5/5] gnu: TeX Live: Update texlive-latex-pdftexcmds Thiago Jung Bauermann via Guix-patches via
  3 siblings, 0 replies; 19+ messages in thread
From: Thiago Jung Bauermann via Guix-patches via @ 2021-07-05  0:01 UTC (permalink / raw)
  To: 49408; +Cc: Thiago Jung Bauermann

* gnu/packages/tex.scm (texlive-latex-l3backend): New public variable.
---
 gnu/packages/tex.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 21c263619b66..a4b0bc95fa91 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3376,6 +3376,35 @@ 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.")
     (license license:lppl1.3c+)))
 
+(define-public texlive-latex-l3backend
+  (package
+    (name "texlive-latex-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"))))
+    (build-system texlive-build-system)
+    (arguments
+     '(#:tex-directory "latex/l3backend"
+       #:tex-engine "tex"
+       #:tex-format #f
+       #:texlive-latex-base #f))
+    (native-inputs
+     `(("texlive-docstrip" ,texlive-docstrip)))
+    (home-page "https://www.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
+are distributed separately from l3kernel to allow this code to be updated on
+an independent schedule.")
+    (license license:lppl1.3c+)))
+
 (define-public texlive-latex-l3packages
   (package
     (name "texlive-latex-l3packages")




^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH core-updates 4/5] gnu: TeX Live: Add new dependency to texlive-latex-xkeyval
  2021-07-05  0:00 ` [bug#49408] [PATCH core-updates 1/5] gnu: TeX Live: Use IniTeX to build a couple of packages Thiago Jung Bauermann via Guix-patches via
  2021-07-05  0:01   ` [bug#49408] [PATCH core-updates 2/5] gnu: TeX Live: Update to TeX Live 2021 Thiago Jung Bauermann via Guix-patches via
  2021-07-05  0:01   ` [bug#49408] [PATCH core-updates 3/5] gnu: TeX Live: Add texlive-latex-l3backend Thiago Jung Bauermann via Guix-patches via
@ 2021-07-05  0:01   ` Thiago Jung Bauermann via Guix-patches via
  2021-07-05  0:01   ` [bug#49408] [PATCH core-updates 5/5] gnu: TeX Live: Update texlive-latex-pdftexcmds Thiago Jung Bauermann via Guix-patches via
  3 siblings, 0 replies; 19+ messages in thread
From: Thiago Jung Bauermann via Guix-patches via @ 2021-07-05  0:01 UTC (permalink / raw)
  To: 49408; +Cc: Thiago Jung Bauermann

Starting with TeX Live 2021, texlive-latex-xkeyval depends on
texlive-latex-l3backend.

* gnu/packages/tex.scm(texlive-latex-xkeyval)[native-inputs]: Add
‘texlive-latex-l3backend’.
---
 gnu/packages/tex.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a4b0bc95fa91..ff0826d70890 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8414,6 +8414,7 @@ are part of the LaTeX required tools distribution, comprising the packages:
                #t))))))
     (native-inputs
      `(("texlive-latex-base" ,texlive-latex-base)
+       ("texlive-latex-l3backend" ,texlive-latex-l3backend)
        ("texlive-cm" ,texlive-cm)
        ("texlive-lm" ,texlive-lm)
        ("texlive-url" ,texlive-url)




^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH core-updates 5/5] gnu: TeX Live: Update texlive-latex-pdftexcmds
  2021-07-05  0:00 ` [bug#49408] [PATCH core-updates 1/5] gnu: TeX Live: Use IniTeX to build a couple of packages Thiago Jung Bauermann via Guix-patches via
                     ` (2 preceding siblings ...)
  2021-07-05  0:01   ` [bug#49408] [PATCH core-updates 4/5] gnu: TeX Live: Add new dependency to texlive-latex-xkeyval Thiago Jung Bauermann via Guix-patches via
@ 2021-07-05  0:01   ` Thiago Jung Bauermann via Guix-patches via
  3 siblings, 0 replies; 19+ messages in thread
From: Thiago Jung Bauermann via Guix-patches via @ 2021-07-05  0:01 UTC (permalink / raw)
  To: 49408; +Cc: Thiago Jung Bauermann

texlive-latex-pdftexcmds moved to a different directory in TeX Live 2021.

* gnu/packages/tex.scm (texlive-latex-pdftexcmds): Update hash and paths.
---
 gnu/packages/tex.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ff0826d70890..4925c79be8fa 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4481,10 +4481,10 @@ Unicode option of @code{inputenc} or @code{inputenx}, or by XeLaTeX/LuaLaTeX.")
   (package
     (inherit (simple-texlive-package
               "texlive-latex-pdftexcmds"
-              '("/doc/latex/pdftexcmds/"
-                "/tex/latex/pdftexcmds/")
+              '("/doc/generic/pdftexcmds/"
+                "/tex/generic/pdftexcmds/")
               (base32
-               "0kqav8jri789698wxwr2ww8ssn74fvw3agrv677nz5qyq5zmix8h")
+               "1hph0djbfc8hlwfc41rzlf8l3ccyyvc0n7a0qdrr9881jwd6iv1b")
               #:trivial? #t))
     (propagated-inputs
      `(("texlive-generic-iftex" ,texlive-generic-iftex)




^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3
  2021-07-04 23:44 [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3 Thiago Jung Bauermann via Guix-patches via
  2021-07-05  0:00 ` [bug#49408] [PATCH core-updates 1/5] gnu: TeX Live: Use IniTeX to build a couple of packages Thiago Jung Bauermann via Guix-patches via
@ 2021-07-06  0:42 ` Thiago Jung Bauermann via Guix-patches via
  2021-07-08 12:44 ` [bug#49408] [PATCH 1/2] gnu: perl-text-bibtex: update to 0.88 Nathan Benedetto Proença
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 19+ messages in thread
From: Thiago Jung Bauermann via Guix-patches via @ 2021-07-06  0:42 UTC (permalink / raw)
  To: 49408

Hi,

Today I thought of a couple more tests I could do on these patches:

1. Ran `make check TESTS=”tests/texlive.scm”`.

Unexpectedly, this ran more tests, but the TeX Live one did pass. Some 
other tests failed. I looked at a few of the failures and they don’t seem 
related to TeX at all.

2. Built the Guix manual and checked en/guix.pdf and es/guix.es.pdf.

Browsing through the PDFs, they look fine. The Spanish one does have the 
accented characters as expected. I also checked the build log and confirmed 
that TeX Live 2021 was used to generate them. I do see the following error 
messages in the pdfTeX output:

l.149: Unicode char @u8:å<8f><82> not defined for Texinfo

I tried building the manual using Guix master but I get a segmentation 
fault during the build process, so I can’t check whether the error message 
is also present in the current TeX Live version.

-- 
Thanks,
Thiago






^ permalink raw reply	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH 1/2] gnu: perl-text-bibtex: update to 0.88
  2021-07-04 23:44 [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3 Thiago Jung Bauermann via Guix-patches via
  2021-07-05  0:00 ` [bug#49408] [PATCH core-updates 1/5] gnu: TeX Live: Use IniTeX to build a couple of packages Thiago Jung Bauermann via Guix-patches via
  2021-07-06  0:42 ` [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3 Thiago Jung Bauermann via Guix-patches via
@ 2021-07-08 12:44 ` Nathan Benedetto Proença
  2021-07-12  1:41   ` Thiago Jung Bauermann via Guix-patches via
  2021-07-09 13:42 ` [bug#49408] Biber update Nathan Benedetto Proença
  2021-07-09 13:45 ` [bug#49408] [PATCH 2/2] gnu: biber: Update to 2.16 Nathan Benedetto Proença
  4 siblings, 1 reply; 19+ messages in thread
From: Nathan Benedetto Proença @ 2021-07-08 12:44 UTC (permalink / raw)
  To: 49408

 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 b380a604b7..b8059b7b73 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6882,7 +6882,7 @@ This package contains the complete TeX Live distribution.")
 (define-public perl-text-bibtex
   (package
     (name "perl-text-bibtex")
-    (version "0.85")
+    (version "0.88")
     (source
      (origin
        (method url-fetch)
@@ -6890,7 +6890,7 @@ This package contains the complete TeX Live distribution.")
                            version ".tar.gz"))
        (sha256
         (base32
-         "036kxgbn1jf70pfm2lmjlzjwnhbkd888fp5lyvmkjpdd15gla18h"))))
+         "0b7lmjvfmypps1nw6nsdikgaakm0n0g4186glaqazg5xd1p5h55h"))))
     (build-system perl-build-system)
     (arguments
      `(#:phases
-- 
2.32.0





^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [bug#49408] Biber update
  2021-07-04 23:44 [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3 Thiago Jung Bauermann via Guix-patches via
                   ` (2 preceding siblings ...)
  2021-07-08 12:44 ` [bug#49408] [PATCH 1/2] gnu: perl-text-bibtex: update to 0.88 Nathan Benedetto Proença
@ 2021-07-09 13:42 ` Nathan Benedetto Proença
  2021-07-09 13:45 ` [bug#49408] [PATCH 2/2] gnu: biber: Update to 2.16 Nathan Benedetto Proença
  4 siblings, 0 replies; 19+ messages in thread
From: Nathan Benedetto Proença @ 2021-07-09 13:42 UTC (permalink / raw)
  To: 49408


Biber must be upgraded together with texlive-biblatex.
I will send two patches which address this issue:

* the first updates perl-text-bibtex
* the second updates biber itself




^ permalink raw reply	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH 2/2] gnu: biber: Update to 2.16
  2021-07-04 23:44 [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3 Thiago Jung Bauermann via Guix-patches via
                   ` (3 preceding siblings ...)
  2021-07-09 13:42 ` [bug#49408] Biber update Nathan Benedetto Proença
@ 2021-07-09 13:45 ` Nathan Benedetto Proença
  2021-07-12  1:42   ` Thiago Jung Bauermann via Guix-patches via
  4 siblings, 1 reply; 19+ messages in thread
From: Nathan Benedetto Proença @ 2021-07-09 13:45 UTC (permalink / raw)
  To: 49408


Add perl-unicode-collate as biber input

Upstream appears to have fixed this: recent issue was closed after
telling user to use perl-unicode-collate 1.29, which is the one
available.

https://github.com/plk/biber/issues/378
---
 gnu/packages/tex.scm | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b8059b7b73..d86435e1bd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6927,20 +6927,16 @@ values (strings, macros, or numbers) pasted together.")
     ;; checking the Biber/BibLaTeX compatibility matrix in the BibLaTeX manual
     ;; at <https://ctan.org/pkg/biblatex>.
     (name "biber")
-    (version "2.12")
+    (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))
-              ;; TODO: Patch awaiting inclusion upstream (see:
-              ;; https://github.com/plk/biber/issues/239).
-              (patches (search-patches "biber-fix-encoding-write.patch"
-                                       "biber-sortinithash.patch"))
               (sha256
                (base32
-                "1g1hi6zvf2hmrjly1sidjaxy5440gfqm4p7p3n7kayshnjsmlskx"))))
+                "0586q8y1f2k23mvb02ccm3qsb35cwskafksixsjaih7a7xcf5gxx"))))
     (build-system perl-build-system)
     (arguments
      `(#:phases
@@ -6963,6 +6959,7 @@ values (strings, macros, or numbers) pasted together.")
        ("perl-datetime-format-builder" ,perl-datetime-format-builder)
        ("perl-datetime-calendar-julian" ,perl-datetime-calendar-julian)
        ("perl-file-slurper" ,perl-file-slurper)
+       ("perl-io-string" ,perl-io-string)
        ("perl-ipc-cmd" ,perl-ipc-cmd)
        ("perl-ipc-run3" ,perl-ipc-run3)
        ("perl-list-allutils" ,perl-list-allutils)
@@ -6970,10 +6967,8 @@ values (strings, macros, or numbers) pasted together.")
        ("perl-mozilla-ca" ,perl-mozilla-ca)
        ("perl-regexp-common" ,perl-regexp-common)
        ("perl-log-log4perl" ,perl-log-log4perl)
-       ;; We cannot use perl-unicode-collate here, because otherwise the
-       ;; hardcoded hashes in the tests would differ.  See
-       ;; https://mail-archive.com/debian-bugs-dist@lists.debian.org/msg1469249.html
-       ;;("perl-unicode-collate" ,perl-unicode-collate)
+       ("perl-parse-recdescent" ,perl-parse-recdescent)
+       ("perl-unicode-collate" ,perl-unicode-collate)
        ("perl-unicode-normalize" ,perl-unicode-normalize)
        ("perl-unicode-linebreak" ,perl-unicode-linebreak)
        ("perl-encode-eucjpascii" ,perl-encode-eucjpascii)
-- 
2.32.0





^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH 1/2] gnu: perl-text-bibtex: update to 0.88
  2021-07-08 12:44 ` [bug#49408] [PATCH 1/2] gnu: perl-text-bibtex: update to 0.88 Nathan Benedetto Proença
@ 2021-07-12  1:41   ` Thiago Jung Bauermann via Guix-patches via
  0 siblings, 0 replies; 19+ messages in thread
From: Thiago Jung Bauermann via Guix-patches via @ 2021-07-12  1:41 UTC (permalink / raw)
  To: Nathan Benedetto Proença; +Cc: 49408

Hi Nathan,

Thank you for these patches! They look very good in my opinion. Though 
please keep in mind that I’ve just started contributing to Guix. I just 
have some minor comments on them.

Em quinta-feira, 8 de julho de 2021, às 09:44:04 -03, Nathan Benedetto 
Proença escreveu:
>  gnu/packages/tex.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

The patch itself looks good to me. The description needs a changelog 
entry. In this case it would be very simple:

* gnu/packages/tex.scm (perl-text-bibtex): Update to 0.88.

> diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
> index b380a604b7..b8059b7b73 100644
> --- a/gnu/packages/tex.scm
> +++ b/gnu/packages/tex.scm
> @@ -6882,7 +6882,7 @@ This package contains the complete TeX Live
> distribution.") (define-public perl-text-bibtex
>    (package
>      (name "perl-text-bibtex")
> -    (version "0.85")
> +    (version "0.88")
>      (source
>       (origin
>         (method url-fetch)
> @@ -6890,7 +6890,7 @@ This package contains the complete TeX Live
> distribution.") version ".tar.gz"))
>         (sha256
>          (base32
> -         "036kxgbn1jf70pfm2lmjlzjwnhbkd888fp5lyvmkjpdd15gla18h"))))
> +         "0b7lmjvfmypps1nw6nsdikgaakm0n0g4186glaqazg5xd1p5h55h"))))
>      (build-system perl-build-system)
>      (arguments
>       `(#:phases

I applied the patch and verified that perl-text-bibtex builds.

-- 
Thanks,
Thiago







^ permalink raw reply	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH 2/2] gnu: biber: Update to 2.16
  2021-07-09 13:45 ` [bug#49408] [PATCH 2/2] gnu: biber: Update to 2.16 Nathan Benedetto Proença
@ 2021-07-12  1:42   ` Thiago Jung Bauermann via Guix-patches via
  2021-07-13 13:19     ` Nathan Benedetto Proença
  0 siblings, 1 reply; 19+ messages in thread
From: Thiago Jung Bauermann via Guix-patches via @ 2021-07-12  1:42 UTC (permalink / raw)
  To: Nathan Benedetto Proença; +Cc: 49408

Hi Nathan,

Em sexta-feira, 9 de julho de 2021, às 10:45:16 -03,
Nathan Benedetto Proença escreveu:
> Add perl-unicode-collate as biber input
> 
> Upstream appears to have fixed this: recent issue was closed after

It took me a while to understand that “this” referred to being able to add
perl-unicode-collate as input. I suggest joining the two phrases above or
otherwise rewording them to make it clearer.

> telling user to use perl-unicode-collate 1.29, which is the one
> available.
> 
> https://github.com/plk/biber/issues/378

I also suggest mentioning that the resolution of the issue above is why you 
are able to drop ‘biber-sortinithash.patch’.

Similarly, I suggest mentioning that issue 239 is also fixed and thus you 
can drop ‘biber-fix-encoding-write.patch’.

On the other hand, I’m new to the Guix community myself and I noticed that 
most patches don’t have any description beyond the changelog entry, so an 
alternate course of action is to remove the description and just using the 
changelog entry. I have the impression that I’m more attached to commit 
descriptions than most here.  :-)

Either way, this patch is also missing a changelog entry.

> ---
>  gnu/packages/tex.scm | 15 +++++----------
>  1 file changed, 5 insertions(+), 10 deletions(-)
> 
> diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
> index b8059b7b73..d86435e1bd 100644
> --- a/gnu/packages/tex.scm
> +++ b/gnu/packages/tex.scm
> @@ -6927,20 +6927,16 @@ values (strings, macros, or numbers) pasted
> together.") ;; checking the Biber/BibLaTeX compatibility matrix in the
> BibLaTeX manual ;; at <https://ctan.org/pkg/biblatex>.
>      (name "biber")
> -    (version "2.12")
> +    (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))
> -              ;; TODO: Patch awaiting inclusion upstream (see:
> -              ;; https://github.com/plk/biber/issues/239).
> -              (patches (search-patches "biber-fix-encoding-write.patch"
> -                                       "biber-sortinithash.patch"))

Since these patches aren’t used anymore, you should also `git rm` them and
remove them from `gnu/local.mk`.

>                (sha256
>                 (base32
> -               
"1g1hi6zvf2hmrjly1sidjaxy5440gfqm4p7p3n7kayshnjsmlskx"))))
> +               
"0586q8y1f2k23mvb02ccm3qsb35cwskafksixsjaih7a7xcf5gxx"))))
>      (build-system perl-build-system)
>      (arguments
>       `(#:phases
> @@ -6963,6 +6959,7 @@ values (strings, macros, or numbers) pasted 
together.")
>         ("perl-datetime-format-builder" ,perl-datetime-format-builder)
>         ("perl-datetime-calendar-julian" ,perl-datetime-calendar-julian)
>         ("perl-file-slurper" ,perl-file-slurper)
> +       ("perl-io-string" ,perl-io-string)
>         ("perl-ipc-cmd" ,perl-ipc-cmd)
>         ("perl-ipc-run3" ,perl-ipc-run3)
>         ("perl-list-allutils" ,perl-list-allutils)

I removed perl-io-string from the inputs and I was still able to build the 
package. If it is needed, can you add a comment somewhere (not sure if it’s 
better to mention it in the commit message or put it as a comment in the 
code) explaining why it’s necessary?

> @@ -6970,10 +6967,8 @@ values (strings, macros, or numbers) pasted
> together.") ("perl-mozilla-ca" ,perl-mozilla-ca)
>         ("perl-regexp-common" ,perl-regexp-common)
>         ("perl-log-log4perl" ,perl-log-log4perl)
> -       ;; We cannot use perl-unicode-collate here, because otherwise the
> -       ;; hardcoded hashes in the tests would differ.  See
> -       ;; https://mail-archive.com/debian-bugs-dist@lists.debian.org/
msg1469249.html
> -       ;;("perl-unicode-collate" ,perl-unicode-collate)
> +       ("perl-parse-recdescent" ,perl-parse-recdescent)
> +       ("perl-unicode-collate" ,perl-unicode-collate)
>         ("perl-unicode-normalize" ,perl-unicode-normalize)
>         ("perl-unicode-linebreak" ,perl-unicode-linebreak)
>         ("perl-encode-eucjpascii" ,perl-encode-eucjpascii)

I applied the patch and verified that perl-text-bibtex builds. You 
mentioned in my GitLab repo that you use biber for your dissertation.
With these patches applied, is it working well for you?

-- 
Thanks,
Thiago






^ permalink raw reply	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH 2/2] gnu: biber: Update to 2.16
  2021-07-12  1:42   ` Thiago Jung Bauermann via Guix-patches via
@ 2021-07-13 13:19     ` Nathan Benedetto Proença
  2021-07-13 21:22       ` Thiago Jung Bauermann via Guix-patches via
  0 siblings, 1 reply; 19+ messages in thread
From: Nathan Benedetto Proença @ 2021-07-13 13:19 UTC (permalink / raw)
  To: Thiago Jung Bauermann; +Cc: 49408

Thiago Jung Bauermann <bauermann@kolabnow.com> writes:

> Hi Nathan,
>
> Em sexta-feira, 9 de julho de 2021, às 10:45:16 -03,
> Nathan Benedetto Proença escreveu:
>> Add perl-unicode-collate as biber input
>> 
>> Upstream appears to have fixed this: recent issue was closed after
>
> It took me a while to understand that “this” referred to being able to add
> perl-unicode-collate as input. I suggest joining the two phrases above or
> otherwise rewording them to make it clearer.
>
>> telling user to use perl-unicode-collate 1.29, which is the one
>> available.
>> 
>> https://github.com/plk/biber/issues/378
>
> I also suggest mentioning that the resolution of the issue above is why you 
> are able to drop ‘biber-sortinithash.patch’.
>
> Similarly, I suggest mentioning that issue 239 is also fixed and thus you 
> can drop ‘biber-fix-encoding-write.patch’.
>
> On the other hand, I’m new to the Guix community myself and I noticed that 
> most patches don’t have any description beyond the changelog entry, so an 
> alternate course of action is to remove the description and just using the 
> changelog entry. I have the impression that I’m more attached to commit 
> descriptions than most here.  :-)
>
> Either way, this patch is also missing a changelog entry.

What would be the appropriate course of action? Should I simply send new
patches with changelogs like I have sent these ones?

>> ---
>>  gnu/packages/tex.scm | 15 +++++----------
>>  1 file changed, 5 insertions(+), 10 deletions(-)
>> 
>> diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
>> index b8059b7b73..d86435e1bd 100644
>> --- a/gnu/packages/tex.scm
>> +++ b/gnu/packages/tex.scm
>> @@ -6927,20 +6927,16 @@ values (strings, macros, or numbers) pasted
>> together.") ;; checking the Biber/BibLaTeX compatibility matrix in the
>> BibLaTeX manual ;; at <https://ctan.org/pkg/biblatex>.
>>      (name "biber")
>> -    (version "2.12")
>> +    (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))
>> -              ;; TODO: Patch awaiting inclusion upstream (see:
>> -              ;; https://github.com/plk/biber/issues/239).
>> -              (patches (search-patches "biber-fix-encoding-write.patch"
>> -                                       "biber-sortinithash.patch"))
>
> Since these patches aren’t used anymore, you should also `git rm` them and
> remove them from `gnu/local.mk`.
>
>>                (sha256
>>                 (base32
>> -               
> "1g1hi6zvf2hmrjly1sidjaxy5440gfqm4p7p3n7kayshnjsmlskx"))))
>> +               
> "0586q8y1f2k23mvb02ccm3qsb35cwskafksixsjaih7a7xcf5gxx"))))
>>      (build-system perl-build-system)
>>      (arguments
>>       `(#:phases
>> @@ -6963,6 +6959,7 @@ values (strings, macros, or numbers) pasted 
> together.")
>>         ("perl-datetime-format-builder" ,perl-datetime-format-builder)
>>         ("perl-datetime-calendar-julian" ,perl-datetime-calendar-julian)
>>         ("perl-file-slurper" ,perl-file-slurper)
>> +       ("perl-io-string" ,perl-io-string)
>>         ("perl-ipc-cmd" ,perl-ipc-cmd)
>>         ("perl-ipc-run3" ,perl-ipc-run3)
>>         ("perl-list-allutils" ,perl-list-allutils)
>
> I removed perl-io-string from the inputs and I was still able to build the 
> package. If it is needed, can you add a comment somewhere (not sure if it’s 
> better to mention it in the commit message or put it as a comment in the 
> code) explaining why it’s necessary?

When some of the builds failed, biber listed packages they required, and
perl-io-string was one of them, so this is why I added it.
I believe that if you look into the build log you may find some
complaint about IO::String missing, or that you are using an older
version.

>> @@ -6970,10 +6967,8 @@ values (strings, macros, or numbers) pasted
>> together.") ("perl-mozilla-ca" ,perl-mozilla-ca)
>>         ("perl-regexp-common" ,perl-regexp-common)
>>         ("perl-log-log4perl" ,perl-log-log4perl)
>> -       ;; We cannot use perl-unicode-collate here, because otherwise the
>> -       ;; hardcoded hashes in the tests would differ.  See
>> -       ;; https://mail-archive.com/debian-bugs-dist@lists.debian.org/
> msg1469249.html
>> -       ;;("perl-unicode-collate" ,perl-unicode-collate)
>> +       ("perl-parse-recdescent" ,perl-parse-recdescent)
>> +       ("perl-unicode-collate" ,perl-unicode-collate)
>>         ("perl-unicode-normalize" ,perl-unicode-normalize)
>>         ("perl-unicode-linebreak" ,perl-unicode-linebreak)
>>         ("perl-encode-eucjpascii" ,perl-encode-eucjpascii)
>
> I applied the patch and verified that perl-text-bibtex builds. You 
> mentioned in my GitLab repo that you use biber for your dissertation.
> With these patches applied, is it working well for you?

Yes, I have been using biber and latex from this sequence of patches for
a couple of days now.

I believe I have identified another problem: texdoc is not working.
Perhaps this is by choice (maybe Guix separates it into another package)
or because we missed something, but I did not have time to look into it.

If texlive does not "ship" texdoc, we may want to play around with some
flags to be sure that we are not packaging documentation files we are
not using.
There are 3.1gb of files in the folder /share/texmf-dist/doc inside of
the store folder generated by this package.

> -- 
> Thanks,
> Thiago




^ permalink raw reply	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH 2/2] gnu: biber: Update to 2.16
  2021-07-13 13:19     ` Nathan Benedetto Proença
@ 2021-07-13 21:22       ` Thiago Jung Bauermann via Guix-patches via
  2021-07-19 14:55         ` [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3 Ludovic Courtès
  0 siblings, 1 reply; 19+ messages in thread
From: Thiago Jung Bauermann via Guix-patches via @ 2021-07-13 21:22 UTC (permalink / raw)
  To: Nathan Benedetto Proença; +Cc: 49408

Em terça-feira, 13 de julho de 2021, às 10:19:56 -03, Nathan Benedetto 
Proença escreveu:
> Thiago Jung Bauermann <bauermann@kolabnow.com> writes:
> > Hi Nathan,
> > 
> > Em sexta-feira, 9 de julho de 2021, às 10:45:16 -03,
> > Nathan Benedetto Proença escreveu:
> > Either way, this patch is also missing a changelog entry.
> 
> What would be the appropriate course of action? Should I simply send new
> patches with changelogs like I have sent these ones?

Yes, and also mark them as v2.

> >> @@ -6963,6 +6959,7 @@ values (strings, macros, or numbers) pasted
> > 
> > together.")
> > 
> >>         ("perl-datetime-format-builder" ,perl-datetime-format-builder)
> >>         ("perl-datetime-calendar-julian"
> >>         ,perl-datetime-calendar-julian)
> >>         ("perl-file-slurper" ,perl-file-slurper)
> >> 
> >> +       ("perl-io-string" ,perl-io-string)
> >> 
> >>         ("perl-ipc-cmd" ,perl-ipc-cmd)
> >>         ("perl-ipc-run3" ,perl-ipc-run3)
> >>         ("perl-list-allutils" ,perl-list-allutils)
> > 
> > I removed perl-io-string from the inputs and I was still able to build
> > the package. If it is needed, can you add a comment somewhere (not
> > sure if it’s better to mention it in the commit message or put it as a
> > comment in the code) explaining why it’s necessary?
> 
> When some of the builds failed, biber listed packages they required, and
> perl-io-string was one of them, so this is why I added it.
> I believe that if you look into the build log you may find some
> complaint about IO::String missing, or that you are using an older
> version.

You are right, it shows:

```
Checking prerequisites...
  requires:
    !  IO::String is not installed

ERRORS/WARNINGS FOUND IN PREREQUISITES.  You may wish to install the 
versions of the modules indicated above before proceeding with this 
installation

Run 'Build installdeps' to install missing prerequisites.
```

I should have checked the build log to see if everything was ok.

> >> @@ -6970,10 +6967,8 @@ values (strings, macros, or numbers) pasted
> >> together.") ("perl-mozilla-ca" ,perl-mozilla-ca)
> >> 
> >>         ("perl-regexp-common" ,perl-regexp-common)
> >>         ("perl-log-log4perl" ,perl-log-log4perl)
> >> 
> >> -       ;; We cannot use perl-unicode-collate here, because otherwise
> >> the -       ;; hardcoded hashes in the tests would differ.  See
> >> -       ;; https://mail-archive.com/debian-bugs-dist@lists.debian.org/
> > 
> > msg1469249.html
> > 
> >> -       ;;("perl-unicode-collate" ,perl-unicode-collate)
> >> +       ("perl-parse-recdescent" ,perl-parse-recdescent)
> >> +       ("perl-unicode-collate" ,perl-unicode-collate)
> >> 
> >>         ("perl-unicode-normalize" ,perl-unicode-normalize)
> >>         ("perl-unicode-linebreak" ,perl-unicode-linebreak)
> >>         ("perl-encode-eucjpascii" ,perl-encode-eucjpascii)
> > 
> > I applied the patch and verified that perl-text-bibtex builds. You
> > mentioned in my GitLab repo that you use biber for your dissertation.
> > With these patches applied, is it working well for you?
> 
> Yes, I have been using biber and latex from this sequence of patches for
> a couple of days now.

Nice! Thanks for doing these tests.

> I believe I have identified another problem: texdoc is not working.
> Perhaps this is by choice (maybe Guix separates it into another package)
> or because we missed something, but I did not have time to look into it.

That’s true. It doesn’t seem to work even with TeX Live 2019. I’m not 
familiar with texdoc, so I don’t know what could be wrong (or whether it’s 
deliberate).

> If texlive does not "ship" texdoc, we may want to play around with some
> flags to be sure that we are not packaging documentation files we are
> not using.
> There are 3.1gb of files in the folder /share/texmf-dist/doc inside of
> the store folder generated by this package.

I agree. If files in /share/texmf-dist/doc are only useful with texdoc, 
then either it should be fixed or these files shouldn’t be shipped.

Though since this is a pre-existing problem (as far as I can tell, at 
least) I think it’s better to track it in a separate issue and not 
condition the TeX Live update on it.

-- 
Thanks,
Thiago







^ permalink raw reply	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3
  2021-07-13 21:22       ` Thiago Jung Bauermann via Guix-patches via
@ 2021-07-19 14:55         ` Ludovic Courtès
  2021-07-19 15:23           ` Thiago Jung Bauermann via Guix-patches via
  2021-07-19 15:24           ` Nathan Proença
  0 siblings, 2 replies; 19+ messages in thread
From: Ludovic Courtès @ 2021-07-19 14:55 UTC (permalink / raw)
  To: Thiago Jung Bauermann; +Cc: Nathan Benedetto Proença, 49408

Hello Thiago,

I haven’t actually built it yet but the patch series LGTM.

Do you want to resend the whole series, incorporating the changes that
Nathan posted, or is it OK to apply the two Biber patches after yours?

Let me know and I’ll happily push to ‘core-updates’.

Thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3
  2021-07-19 14:55         ` [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3 Ludovic Courtès
@ 2021-07-19 15:23           ` Thiago Jung Bauermann via Guix-patches via
  2021-07-19 15:24           ` Nathan Proença
  1 sibling, 0 replies; 19+ messages in thread
From: Thiago Jung Bauermann via Guix-patches via @ 2021-07-19 15:23 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: Nathan Benedetto Proença, 49408

Hi Ludo’,

Em segunda-feira, 19 de julho de 2021, às 11:55:47 -03, Ludovic Courtès 
escreveu:
> Hello Thiago,
> 
> I haven’t actually built it yet but the patch series LGTM.
> 
> Do you want to resend the whole series, incorporating the changes that
> Nathan posted, or is it OK to apply the two Biber patches after yours?

Great! It’s fine to apply the two Biber patches after mine.

> Let me know and I’ll happily push to ‘core-updates’.

Thank you!

-- 
Thanks,
Thiago






^ permalink raw reply	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3
  2021-07-19 14:55         ` [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3 Ludovic Courtès
  2021-07-19 15:23           ` Thiago Jung Bauermann via Guix-patches via
@ 2021-07-19 15:24           ` Nathan Proença
  2021-07-21 14:06             ` Ludovic Courtès
  1 sibling, 1 reply; 19+ messages in thread
From: Nathan Proença @ 2021-07-19 15:24 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 49408, Thiago Jung Bauermann

[-- Attachment #1: Type: text/plain, Size: 826 bytes --]

I completely understand if you both decide to leave my patch out, and I may
submit it again.

It is my first submission, and I want to sit down and do it calmly (read
about change log and similar things) as it is one my first contributions.

Unfortunately I was unable to look into it so far, but I understand that
that's on me, and I would happily send a new patch later if you both find
it more appropriate.

Ludovic Courtès <ludo@gnu.org> schrieb am Mo., 19. Juli 2021, 11:55:

> Hello Thiago,
>
> I haven’t actually built it yet but the patch series LGTM.
>
> Do you want to resend the whole series, incorporating the changes that
> Nathan posted, or is it OK to apply the two Biber patches after yours?
>
> Let me know and I’ll happily push to ‘core-updates’.
>
> Thanks!
>
> Ludo’.
>

[-- Attachment #2: Type: text/html, Size: 1190 bytes --]

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3
  2021-07-19 15:24           ` Nathan Proença
@ 2021-07-21 14:06             ` Ludovic Courtès
  2021-07-21 19:43               ` Thiago Jung Bauermann via Guix-patches via
  0 siblings, 1 reply; 19+ messages in thread
From: Ludovic Courtès @ 2021-07-21 14:06 UTC (permalink / raw)
  To: Nathan Proença; +Cc: 49408, Thiago Jung Bauermann

Hi Nathan & Thiago,

Nathan Proença <nathan@vieiraproenca.com> skribis:

> I completely understand if you both decide to leave my patch out, and I may
> submit it again.

No no, it’s a much welcome contribution, don’t worry.  :-)

I pushed the whole series as c3e33474b965ac1b7d91b69b026630e7c707e289:

  c3e33474b9 gnu: biber: Update to 2.16.
  313c69a100 gnu: perl-text-bibtex: Update to 0.88.
  4b11d85655 gnu: TeX Live: Update texlive-latex-pdftexcmds
  35aed80bb6 gnu: TeX Live: Add new dependency to texlive-latex-xkeyval
  8f35bac4cc gnu: TeX Live: Add texlive-latex-l3backend
  ee25e3fcab gnu: TeX Live: Update to TeX Live 2021
  04e80290bf gnu: TeX Live: Use IniTeX to build a couple of packages

I adjusted the Biber patch to remove the patches that are no longer
used, and I also tweaked commit logs.

Currently <https://ci.guix.gnu.org/jobset/core-updates> is only building
core packages so we won’t immediately see if something broke, but
hopefully we’ll turn it on Real Soon Now!

Thank you!

Ludo’.




^ permalink raw reply	[flat|nested] 19+ messages in thread

* [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3
  2021-07-21 14:06             ` Ludovic Courtès
@ 2021-07-21 19:43               ` Thiago Jung Bauermann via Guix-patches via
  0 siblings, 0 replies; 19+ messages in thread
From: Thiago Jung Bauermann via Guix-patches via @ 2021-07-21 19:43 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: Nathan Proença, 49408

Hello Ludo’,

Em quarta-feira, 21 de julho de 2021, às 11:06:47 -03, Ludovic Courtès 
escreveu:
> Hi Nathan & Thiago,
> 
> Nathan Proença <nathan@vieiraproenca.com> skribis:
> > I completely understand if you both decide to leave my patch out, and I
> > may submit it again.
> 
> No no, it’s a much welcome contribution, don’t worry.  :-)
> 
> I pushed the whole series as c3e33474b965ac1b7d91b69b026630e7c707e289:
> 
>   c3e33474b9 gnu: biber: Update to 2.16.
>   313c69a100 gnu: perl-text-bibtex: Update to 0.88.
>   4b11d85655 gnu: TeX Live: Update texlive-latex-pdftexcmds
>   35aed80bb6 gnu: TeX Live: Add new dependency to texlive-latex-xkeyval
>   8f35bac4cc gnu: TeX Live: Add texlive-latex-l3backend
>   ee25e3fcab gnu: TeX Live: Update to TeX Live 2021
>   04e80290bf gnu: TeX Live: Use IniTeX to build a couple of packages
> 
> I adjusted the Biber patch to remove the patches that are no longer
> used, and I also tweaked commit logs.

Thank you!

> Currently <https://ci.guix.gnu.org/jobset/core-updates> is only building
> core packages so we won’t immediately see if something broke, but
> hopefully we’ll turn it on Real Soon Now!

Awesome, thanks!

I updated core-updates and built the ‘texlive*’ packages using my shell 
script and they all built successfuly to at least the most basic stuff 
should build.

I even got the texlive-bin package as a substitute. :-)

-- 
Thanks,
Thiago






^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2021-07-21 19:44 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-04 23:44 [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3 Thiago Jung Bauermann via Guix-patches via
2021-07-05  0:00 ` [bug#49408] [PATCH core-updates 1/5] gnu: TeX Live: Use IniTeX to build a couple of packages Thiago Jung Bauermann via Guix-patches via
2021-07-05  0:01   ` [bug#49408] [PATCH core-updates 2/5] gnu: TeX Live: Update to TeX Live 2021 Thiago Jung Bauermann via Guix-patches via
2021-07-05  0:01   ` [bug#49408] [PATCH core-updates 3/5] gnu: TeX Live: Add texlive-latex-l3backend Thiago Jung Bauermann via Guix-patches via
2021-07-05  0:01   ` [bug#49408] [PATCH core-updates 4/5] gnu: TeX Live: Add new dependency to texlive-latex-xkeyval Thiago Jung Bauermann via Guix-patches via
2021-07-05  0:01   ` [bug#49408] [PATCH core-updates 5/5] gnu: TeX Live: Update texlive-latex-pdftexcmds Thiago Jung Bauermann via Guix-patches via
2021-07-06  0:42 ` [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3 Thiago Jung Bauermann via Guix-patches via
2021-07-08 12:44 ` [bug#49408] [PATCH 1/2] gnu: perl-text-bibtex: update to 0.88 Nathan Benedetto Proença
2021-07-12  1:41   ` Thiago Jung Bauermann via Guix-patches via
2021-07-09 13:42 ` [bug#49408] Biber update Nathan Benedetto Proença
2021-07-09 13:45 ` [bug#49408] [PATCH 2/2] gnu: biber: Update to 2.16 Nathan Benedetto Proença
2021-07-12  1:42   ` Thiago Jung Bauermann via Guix-patches via
2021-07-13 13:19     ` Nathan Benedetto Proença
2021-07-13 21:22       ` Thiago Jung Bauermann via Guix-patches via
2021-07-19 14:55         ` [bug#49408] [PATCH core-updates 0/5] Update TeX Live to version 2021.3 Ludovic Courtès
2021-07-19 15:23           ` Thiago Jung Bauermann via Guix-patches via
2021-07-19 15:24           ` Nathan Proença
2021-07-21 14:06             ` Ludovic Courtès
2021-07-21 19:43               ` Thiago Jung Bauermann via Guix-patches via

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).