308/435: gnu: texlive-fira: Refresh package definition.

[guix-commits]

ngz pushed a commit to branch tex-team-next
in repository guix.

commit d63fb4ff514ef2038f33b1339f2511464cad3504
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Tue May 16 17:43:08 2023 +0200

    gnu: texlive-fira: Refresh package definition.
    
    * gnu/packages/tex.scm (texlive-fira): Remove SIMPLE-TEXLIVE-PACKAGE
    call.
    [propagated-inputs]: Add TEXLIVE-FONTAXES, TEXLIVE-FONTSPEC, TEXLIVE-IFTEX,
    TEXLIVE-MWEIGHTS, TEXLIVE-XKEYVAL.
---
 gnu/packages/tex.scm | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f5938c300b..4c7a1a5aa6 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5565,20 +5565,29 @@ by making punctuation characters active.")
 
 (define-public texlive-fira
   (package
-    (inherit (simple-texlive-package
-              "texlive-fira"
-              (list "doc/fonts/fira/"
-                    "tex/latex/fira/"
-                    "fonts/vf/public/fira/"
-                    "fonts/type1/public/fira/"
-                    "fonts/tfm/public/fira/"
-                    "fonts/opentype/public/fira/"
-                    "fonts/map/dvips/fira/"
-                    "fonts/enc/dvips/fira/")
-              (base32 "1v3688hziqz4jywfysiv19vsdzfkknrf83zfbi7lhiqpgkpsfsm2")
-              #:trivial? #t))
+    (name "texlive-fira")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fira/"
+                   "fonts/enc/dvips/fira/"
+                   "fonts/map/dvips/fira/"
+                   "fonts/opentype/public/fira/"
+                   "fonts/tfm/public/fira/"
+                   "fonts/type1/public/fira/"
+                   "fonts/vf/public/fira/"
+                   "tex/latex/fira/")
+             (base32
+              "1v3688hziqz4jywfysiv19vsdzfkknrf83zfbi7lhiqpgkpsfsm2")))
+    (outputs '("out" "doc"))
     (build-system texlive-build-system)
-    (home-page "https://ctan.org/fonts/fira";)
+    (propagated-inputs
+     (list texlive-fontaxes
+           texlive-fontspec
+           texlive-iftex
+           texlive-mweights
+           texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/fira";)
     (synopsis "Fira fonts with LaTeX support")
     (description
      "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for