gnu: Replace texlive-fonts-knuth-lib with texlive-knuth-lib.

* gnu/packages/tex.scm (texlive-fonts-knuth-lib): Deprecate in favor of...
(texlive-knuth-lib): ...this new variable.
This commit is contained in:
Ricardo Wurmus 2020-10-27 20:11:25 +01:00
parent 2c578eb612
commit a2276f625a
No known key found for this signature in database
GPG key ID: 197A5888235FACAC

View file

@ -859,32 +859,28 @@ (define-public texlive-lm
(define-public texlive-fonts-lm
(deprecated-package "texlive-fonts-lm" texlive-lm))
(define-public texlive-fonts-knuth-lib
(package
(name "texlive-fonts-knuth-lib")
(version (number->string %texlive-revision))
(source (origin
(method svn-fetch)
(uri (svn-reference
(url (string-append "svn://www.tug.org/texlive/tags/"
%texlive-tag "/Master/texmf-dist/"
"/fonts/source/public/knuth-lib"))
(revision %texlive-revision)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(define-public texlive-knuth-lib
(let ((template (simple-texlive-package
"texlive-knuth-lib"
(list "/fonts/source/public/knuth-lib/"
"/tex/generic/knuth-lib/"
"/tex/plain/knuth-lib/")
(base32
"0in9aqyi8jkyf9d16z0li50z5fpwj1iwgwm83gmvwqcf7chfs04y"))))
(build-system gnu-build-system)
"0lizrhdr4pirhh4ry44znddksd7akkxli2i6sddm5rzqljiqdy3v")
#:trivial? #t)))
(package
(inherit template)
(arguments
`(#:modules ((guix build gnu-build-system)
(substitute-keyword-arguments (package-arguments template)
((#:modules _ '())
'((guix build gnu-build-system)
(guix build utils)
(srfi srfi-26))
#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(delete 'configure)
(srfi srfi-26)))
((#:phases phases '())
`(modify-phases ,phases
(replace 'build
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "fonts/source/public/knuth-lib"
(let ((mf (assoc-ref inputs "texlive-metafont")))
;; Tell mf where to find mf.base
(setenv "MFBASES"
@ -903,20 +899,17 @@ (define-public texlive-fonts-knuth-lib
"mag:=1; "
"batchmode; "
"input " font)))
(find-files "." "(manfnt|logo.+)\\.mf$"))
(find-files "." "(manfnt|logo.+)\\.mf$")))
#t))
(replace 'install
(add-after 'install 'install-fonts
(lambda* (#:key outputs #:allow-other-keys)
(with-directory-excursion "fonts/source/public/knuth-lib"
(let* ((out (assoc-ref outputs "out"))
(tfm (string-append
out "/share/texmf-dist/fonts/tfm/public/knuth-lib"))
(mf (string-append
out "/share/texmf-dist/fonts/source/public/knuth-lib")))
out "/share/texmf-dist/fonts/tfm/public/knuth-lib")))
(for-each (cut install-file <> tfm)
(find-files "build" "\\.*"))
(for-each (cut install-file <> mf)
(find-files "." "\\.mf"))
#t))))))
(find-files "build" "\\.tfm"))
#t))))))))
(native-inputs
`(("texlive-bin" ,texlive-bin)
("texlive-metafont" ,texlive-metafont)))
@ -925,7 +918,10 @@ (define-public texlive-fonts-knuth-lib
(description "This is a collection of core TeX and METAFONT macro files
from Donald Knuth, including the plain format, plain base, and the MF logo
fonts.")
(license license:knuth)))
(license license:knuth))))
(define-public texlive-fonts-knuth-lib
(deprecated-package "texlive-fonts-knuth-lib" texlive-knuth-lib))
(define-public texlive-fonts-latex
(package