ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-03 18:09:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: texlive-hyph-utf8: Remove SIMPLE-TEXLIVE-PACKAGE call.

Browse source 
* gnu/packages/tex.scm (texlive-hyph-utf8): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[arguments]: Use G-expressions. Remove trailing #T from phases.
[native-inputs]: Add TEXLIVE-DOCSTRIP.
This commit is contained in:
Nicolas Goaziou 2023-05-18 11:33:01 +02:00
parent 12a22bfdb5
commit 2e4f91bcce
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
1 changed files with 91 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
gnu/packages/tex.scm
View file

@ -2891,43 +2891,45 @@ (define-public texlive-hyphen-welsh
(define-public texlive-hyph-utf8 (define-public texlive-hyph-utf8
(package (package
(inherit (simple-texlive-package (name "texlive-hyph-utf8")
"texlive-hyph-utf8" (version (number->string %texlive-revision))
(list "/source/generic/hyph-utf8/" (source (texlive-origin
"/source/luatex/hyph-utf8/" name version
"/doc/luatex/hyph-utf8/" (list "doc/luatex/hyph-utf8/"
"/tex/luatex/hyph-utf8/etex.src" "source/generic/hyph-utf8/"
;; Used to extract luatex-hyphen.lua "source/generic/hyph-utf8/contributed/"
"/tex/latex/base/docstrip.tex" "source/generic/hyph-utf8/data/"
"source/luatex/hyph-utf8/"
"tex/luatex/hyph-utf8/"
;; Documentation; we can't use the whole directory because ;; Documentation; we can't use the whole directory because
;; it includes files from other packages. ;; it includes files from other packages.
"/doc/generic/hyph-utf8/CHANGES" "doc/generic/hyph-utf8/CHANGES"
"/doc/generic/hyph-utf8/HISTORY" "doc/generic/hyph-utf8/HISTORY"
"/doc/generic/hyph-utf8/hyph-utf8.pdf" "doc/generic/hyph-utf8/hyph-utf8.pdf"
"/doc/generic/hyph-utf8/hyph-utf8.tex" "doc/generic/hyph-utf8/hyph-utf8.tex"
"/doc/generic/hyph-utf8/hyphenation-distribution.pdf" "doc/generic/hyph-utf8/hyphenation-distribution.pdf"
"/doc/generic/hyph-utf8/hyphenation-distribution.tex" "doc/generic/hyph-utf8/hyphenation-distribution.tex"
"/doc/generic/hyph-utf8/img/miktex-languages.png" "doc/generic/hyph-utf8/img/miktex-languages.png"
"/doc/generic/hyph-utf8/img/texlive-collection.png") "doc/generic/hyph-utf8/img/texlive-collection.png")
(base32 (base32
"0rgp0zn36gwzqwpmjb9h01ns3m19v3r7lpw1h0pc9bx115w6c9jx"))) "1dm023k05c0pnnyqgbsy1cbpq8layabdp8acln0v59kpsx7flmj9")))
(outputs '("out" "doc")) (outputs '("out" "doc"))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; there are none (list
#:modules ((guix build gnu-build-system) #:tests? #f ; there are none
#:modules '((guix build gnu-build-system)
(guix build utils) (guix build utils)
(ice-9 match)) (ice-9 match))
#:make-flags #:make-flags
(list "-C" "source/luatex/hyph-utf8/" #~(list "-C" "source/luatex/hyph-utf8/"
(string-append "DO_TEX = tex --interaction=nonstopmode '&tex' $<") (string-append "DO_TEX = tex --interaction=nonstopmode '&tex' $<")
(string-append "RUNDIR =" (assoc-ref %outputs "out") "/share/texmf-dist/tex/luatex/hyph-utf8/") (string-append "RUNDIR =" (assoc-ref %outputs "out") "/share/texmf-dist/tex/luatex/hyph-utf8/")
(string-append "DOCDIR =" (assoc-ref %outputs "doc") "/share/texmf-dist/doc/luatex/hyph-utf8/") (string-append "DOCDIR =" (assoc-ref %outputs "doc") "/share/texmf-dist/doc/luatex/hyph-utf8/")
;; hyphen.cfg is neither included nor generated, so let's only build the lua file. ;; hyphen.cfg is neither included nor generated, so let's only build the lua file.
(string-append "UNPACKED = $(NAME).lua")) (string-append "UNPACKED = $(NAME).lua"))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
;; TeX isn't usable at this point, so we first need to generate the ;; TeX isn't usable at this point, so we first need to generate the
;; tex.fmt. ;; tex.fmt.
(replace 'configure (replace 'configure
@ -2965,12 +2967,10 @@ (define-public texlive-hyph-utf8
(string-append (assoc-ref inputs "texlive-plain") (string-append (assoc-ref inputs "texlive-plain")
"/share/texmf-dist/tex/plain/config/tex.ini")))))) "/share/texmf-dist/tex/plain/config/tex.ini"))))))
(add-before 'build 'build-loaders-and-converters (add-before 'build 'build-loaders-and-converters
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let* ((root (string-append (assoc-ref outputs "out") (let* ((root (string-append #$output "/share/texmf-dist"))
"/share/texmf-dist"))
(conv (conv
(string-append root (string-append root "/tex/generic/hyph-utf8/conversions")))
"/tex/generic/hyph-utf8/conversions")))
;; Build converters ;; Build converters
(mkdir-p conv) (mkdir-p conv)
@ -2980,26 +2980,23 @@ (define-public texlive-hyph-utf8
(string-append "$path_root=\"" root "\"\n")) (string-append "$path_root=\"" root "\"\n"))
;; Avoid error with newer Ruby. ;; Avoid error with newer Ruby.
(("#1\\{%") "#1{%%")) (("#1\\{%") "#1{%%"))
(invoke "ruby" "generate-converters.rb")) (invoke "ruby" "generate-converters.rb")))))
#t)))
(replace 'install (replace 'install
(lambda* (#:key source outputs #:allow-other-keys) (lambda* (#:key source #:allow-other-keys)
(let ((doc (assoc-ref outputs "doc")) (mkdir-p #$output:doc)
(out (assoc-ref outputs "out")))
(mkdir-p doc)
(copy-recursively (copy-recursively
(string-append source "/doc") (string-append source "/doc")
(string-append doc "/doc")) (string-append #$output:doc "/doc"))
(install-file (install-file
(string-append source "/tex/luatex/hyph-utf8/etex.src") (string-append source "/tex/luatex/hyph-utf8/etex.src")
(string-append out "/share/texmf-dist/tex/luatex/hyph-utf8/"))) (string-append #$output "/share/texmf-dist/tex/luatex/hyph-utf8/")))))))
#t)))))
(native-inputs (native-inputs
(list ruby-2.7 (list ruby-2.7
texlive-bin texlive-bin
;; The following packages are needed for build "tex.fmt", which we ;; The following packages are needed for build "tex.fmt", which we
;; need for a working "tex". ;; need for a working "tex".
texlive-cm texlive-cm
texlive-docstrip
texlive-knuth-lib texlive-knuth-lib
texlive-hyphen-base texlive-hyphen-base
texlive-plain)) texlive-plain))