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

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

Browse source 
* 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
1 changed files with 61 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
gnu/packages/tex.scm
View file

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