01/07: gnu: TeX Live: Use IniTeX to build a couple of packages

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit 04e80290bf1023f83649f807ddcd4d980da1747b
Author: Thiago Jung Bauermann <bauermann@kolabnow.com>
AuthorDate: Sun Jul 4 21:00:59 2021 -0300

    gnu: TeX Live: Use IniTeX to build a couple of packages
    
    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’.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 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 1608626..eb433a2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -19,6 +19,7 @@
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
 ;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3387,7 +3388,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
@@ -3412,6 +3418,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")
@@ -3433,6 +3442,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 005aad8..f3838e5 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)
 
                         ;; FIXME: This would normally default to "luatex" but
                         ;; LuaTeX has a bug where sometimes it corrupts the
@@ -158,6 +162,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 4c25570..353fb93 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" <>)))))