me
/
guix
Archived
1
0
Fork 0
Code

gnu: texlive-fonts-ec -> texlive-ec. 

* gnu/packages/tex.scm (texlive-ec): New variable.
(texlive-fonts-ec): Deprecate variable.
(lyx):
(biber):
* gnu/packages/python-xyz.scm (python-pypandoc):
* gnu/packages/statistics.scm (r-with-tests):
* doc/build.scm (pdf-manual):
* gnu/packages/bioinformatics.scm (discrover):
(phyml):
(velvet):
* gnu/packages/chemistry.scm (yaehmop):
* gnu/packages/chez.scm (stex-bootstrap):
* gnu/packages/ocaml.scm (unison):
(ocaml-bibtex2html):
* gnu/packages/plotutils.scm (asymptote): Use new name.
Nicolas Goaziou 2023-05-13 15:59:14 +02:00
parent ab6566e6a1
commit 76819a9655
No known key found for this signature in database
GPG Key ID: DA00B4F048E92F2D
9 changed files with 80 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/build.scm
View File

@ -915,7 +915,7 @@ makeinfo OPTIONS."
texlive-base texlive-base
texlive-bin ;for GUIX_TEXMF texlive-bin ;for GUIX_TEXMF
texlive-epsf texlive-epsf
texlive-fonts-ec texlive-ec
texlive-tex-texinfo))))) texlive-tex-texinfo)))))
(define build (define build

6
gnu/packages/bioinformatics.scm
View File

@ -4768,7 +4768,7 @@ data and settings.")
(list texlive-cm (list texlive-cm
texlive-amsfonts texlive-amsfonts
texlive-doi texlive-doi
texlive-fonts-ec texlive-ec
texlive-latex-examplep texlive-latex-examplep
texlive-hyperref texlive-hyperref
texlive-ms texlive-ms
@ -12106,8 +12106,8 @@ programs for inferring phylogenies (evolutionary trees).")
(texlive-updmap.cfg (list texlive-amsfonts (texlive-updmap.cfg (list texlive-amsfonts
texlive-caption texlive-caption
texlive-cite texlive-cite
texlive-ec
texlive-fancyvrb texlive-fancyvrb
texlive-fonts-ec
texlive-graphics texlive-graphics
texlive-grfext texlive-grfext
texlive-hyperref texlive-hyperref
@ -17090,7 +17090,7 @@ to an artifact/contaminant file.")
(list openmpi zlib)) (list openmpi zlib))
(native-inputs (native-inputs
`(("texlive" ,(texlive-updmap.cfg (list texlive-graphics `(("texlive" ,(texlive-updmap.cfg (list texlive-graphics
texlive-fonts-ec texlive-ec
texlive-hyperref))))) texlive-hyperref)))))
(home-page "https://www.ebi.ac.uk/~zerbino/velvet/") (home-page "https://www.ebi.ac.uk/~zerbino/velvet/")
(synopsis "Nucleic acid sequence assembler for very short reads") (synopsis "Nucleic acid sequence assembler for very short reads")

2
gnu/packages/chemistry.scm
View File

@ -900,7 +900,7 @@ emphasis on quality rather than speed.")
(native-inputs (native-inputs
(list gfortran (list gfortran
(texlive-updmap.cfg (texlive-updmap.cfg
(list texlive-fonts-ec (list texlive-ec
texlive-geometry texlive-geometry
texlive-graphics)))) texlive-graphics))))
(home-page "https://github.com/greglandrum/yaehmop") (home-page "https://github.com/greglandrum/yaehmop")

8
gnu/packages/chez.scm
View File

@ -760,11 +760,11 @@ Chez Scheme.")))
(propagated-inputs (propagated-inputs
(list xorg-rgb (list xorg-rgb
(texlive-updmap.cfg (texlive-updmap.cfg
(list texlive-l3backend (list texlive-bibtex
texlive-hyperref texlive-ec
texlive-bibtex
texlive-epsf texlive-epsf
texlive-fonts-ec texlive-hyperref
texlive-l3backend
texlive-oberdiek)) texlive-oberdiek))
ghostscript ghostscript
netpbm)) netpbm))

4
gnu/packages/ocaml.scm
View File

@ -1378,7 +1378,7 @@ libpanel, librsvg and quartz.")
;; For documentation ;; For documentation
("ghostscript" ,ghostscript) ("ghostscript" ,ghostscript)
("texlive" ,(texlive-updmap.cfg ("texlive" ,(texlive-updmap.cfg
(list texlive-fonts-ec texlive-l3backend))) (list texlive-ec texlive-l3backend)))
("hevea" ,hevea) ("hevea" ,hevea)
("lynx" ,lynx) ("lynx" ,lynx)
("which" ,which))) ("which" ,which)))
@ -10255,7 +10255,7 @@ SHA384, SHA512, Blake2b, Blake2s and RIPEMD160.")
(native-inputs (native-inputs
`(("which" ,which) `(("which" ,which)
("texlive" ,(texlive-updmap.cfg ("texlive" ,(texlive-updmap.cfg
(list texlive-fonts-ec texlive-preprint (list texlive-ec texlive-preprint
texlive-hyperref texlive-bibtex))))) texlive-hyperref texlive-bibtex)))))
(propagated-inputs (propagated-inputs
(list hevea)) (list hevea))

2
gnu/packages/plotutils.scm
View File

@ -308,9 +308,9 @@ colors, styles, options and details.")
texinfo ;for generating documentation texinfo ;for generating documentation
(texlive-updmap.cfg (texlive-updmap.cfg
(list texlive-amsfonts (list texlive-amsfonts
texlive-ec
texlive-epsf texlive-epsf
texlive-etoolbox texlive-etoolbox
texlive-fonts-ec
texlive-geometry texlive-geometry
texlive-graphics texlive-graphics
texlive-grfext texlive-grfext

4
gnu/packages/python-xyz.scm
View File

@ -29191,11 +29191,11 @@ By default it uses the open Python vulnerability database Safety DB.")
`(("wheel" ,python-wheel))) `(("wheel" ,python-wheel)))
(native-inputs (native-inputs
`(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
texlive-fonts-ec texlive-ec
texlive-iftex texlive-iftex
texlive-hyperref texlive-hyperref
texlive-oberdiek
texlive-lm texlive-lm
texlive-oberdiek
texlive-xcolor))))) texlive-xcolor)))))
(arguments (arguments
`(#:phases `(#:phases

8
gnu/packages/statistics.scm
View File

@ -389,14 +389,14 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
pkg-config pkg-config
texinfo ; for building HTML manuals texinfo ; for building HTML manuals
(texlive-updmap.cfg (list texlive-ae (texlive-updmap.cfg (list texlive-ae
texlive-inconsolata
texlive-fonts-ec
texlive-grfext
texlive-amsfonts texlive-amsfonts
texlive-latex-base texlive-ec
texlive-fancyvrb texlive-fancyvrb
texlive-graphics texlive-graphics
texlive-grfext
texlive-hyperref texlive-hyperref
texlive-inconsolata
texlive-latex-base
texlive-oberdiek texlive-oberdiek
texlive-tools texlive-tools
texlive-upquote texlive-upquote

100
gnu/packages/tex.scm
View File

@ -6882,69 +6882,64 @@ package options.")
(define-deprecated-package texlive-latex-kvoptions texlive-kvoptions) (define-deprecated-package texlive-latex-kvoptions texlive-kvoptions)
(define-public texlive-fonts-ec (define-public texlive-ec
(package (package
(name "texlive-fonts-ec") (name "texlive-ec")
(version (number->string %texlive-revision)) (version (number->string %texlive-revision))
(source (origin (source (texlive-origin
(method svn-fetch) name version
(uri (svn-reference (list "doc/fonts/ec/"
(url (string-append "svn://www.tug.org/texlive/tags/" "fonts/source/jknappen/ec/"
%texlive-tag "/Master/texmf-dist/" "fonts/tfm/jknappen/ec/")
"/fonts/source/jknappen/ec/"))
(revision %texlive-revision)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32 (base32
"12av65fbz9xiashm09c9m1fj1mijxls5xspd7652ry1n5s0nixy4")))) "1cyi0vv9dnp45s0ilsrbkyznj9ji62s5bhkqgh49461mv2f8qj6p")))
(build-system gnu-build-system) (outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) (list
#:modules
'((guix build texlive-build-system)
(guix build utils) (guix build utils)
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-26)) (srfi srfi-26))
#:tests? #f ; no tests
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) (add-before 'install 're-generate-fonts-metrics
(replace 'build (lambda _
(lambda* (#:key inputs #:allow-other-keys) (let ((mf #$(this-package-native-input "texlive-metafont"))
(let ((mf (assoc-ref inputs "texlive-metafont"))) (cm #$(this-package-native-input "texlive-cm"))
;; Tell mf where to find mf.base (root (getcwd)))
(setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c")) (mkdir-p "build")
;; Tell mf where to look for source files (with-directory-excursion "fonts/source/jknappen/ec"
;; Tell mf where to find mf.base.
(setenv "MFBASES"
(string-append mf "/share/texmf-dist/web2c"))
;; Tell mf where to look for source files.
(setenv "MFINPUTS" (setenv "MFINPUTS"
(string-append (getcwd) ":" (string-append
(getcwd) ":"
mf "/share/texmf-dist/metafont/base:" mf "/share/texmf-dist/metafont/base:"
(assoc-ref inputs "texlive-cm") cm "/share/texmf-dist/fonts/source/public/cm"))
"/share/texmf-dist/fonts/source/public/cm"))) ;; Build font metrics (tfm).
(mkdir "build")
(for-each (lambda (font) (for-each (lambda (font)
(format #t "building font ~a\n" font) (format #t "building font ~a\n" font)
(invoke "mf" "-progname=mf" (invoke "mf" "-progname=mf"
"-output-directory=build" (string-append "-output-directory="
root "/build")
(string-append "\\" (string-append "\\"
"mode:=ljfour; " "mode:=ljfour; "
"mag:=1; " "mag:=1; "
"batchmode; " "batchmode; "
"input " (basename font ".mf")))) "input "
(find-files "." "[0-9]+\\.mf$")) (basename font ".mf"))))
#t)) (find-files "." "[0-9]+\\.mf$")))
(replace 'install ;; Install font metrics at the appropriate location.
(lambda* (#:key outputs #:allow-other-keys) (for-each
(let* ((out (assoc-ref outputs "out")) (cut install-file <> "fonts/tfm/jknappen/ec")
(tfm (string-append (find-files "build/" "\\.tfm$"))))))))
out "/share/texmf-dist/fonts/tfm/jknappen/ec"))
(mf (string-append
out "/share/texmf-dist/fonts/source/jknappen/ec")))
(for-each (cut install-file <> tfm)
(find-files "build" "\\.*"))
(for-each (cut install-file <> mf)
(find-files "." "\\.mf"))
#t))))))
(native-inputs (native-inputs
(list texlive-bin texlive-metafont texlive-cm)) (list texlive-bin texlive-cm texlive-metafont))
(home-page "https://www.ctan.org/pkg/ec") (home-page "https://ctan.org/pkg/ec")
(synopsis "Computer modern fonts in T1 and TS1 encodings") (synopsis "Computer modern fonts in T1 and TS1 encodings")
(description (description
"The EC fonts are European Computer Modern Fonts, supporting the complete "The EC fonts are European Computer Modern Fonts, supporting the complete
@ -6954,15 +6949,16 @@ files. The set also contains a Text Companion Symbol font, called @code{tc},
featuring many useful characters needed in text typesetting, for example featuring many useful characters needed in text typesetting, for example
oldstyle digits, currency symbols (including the newly created Euro symbol), oldstyle digits, currency symbols (including the newly created Euro symbol),
the permille sign, copyright, trade mark and servicemark as well as a copyleft the permille sign, copyright, trade mark and servicemark as well as a copyleft
sign, and many others. Recent releases of LaTeX2e support the EC fonts. The sign, and many others. The fonts are available in (traced) Adobe Type
EC fonts supersede the preliminary version released as the DC fonts. The 1 format, as part of the @code{cm-super} bundle. The other Computer
fonts are available in (traced) Adobe Type 1 format, as part of the Modern-style T1-encoded Type 1 set, Latin Modern, is not actually a direct
@code{cm-super} bundle. The other Computer Modern-style T1-encoded Type 1 development of the EC set, and differs from the EC in a number of
set, Latin Modern, is not actually a direct development of the EC set, and particulars.")
differs from the EC in a number of particulars.")
(license (license:fsf-free "https://www.tug.org/svn/texlive/tags/\ (license (license:fsf-free "https://www.tug.org/svn/texlive/tags/\
texlive-2019.3/Master/texmf-dist/doc/fonts/ec/copyrite.txt")))) texlive-2019.3/Master/texmf-dist/doc/fonts/ec/copyrite.txt"))))
(define-deprecated-package texlive-fonts-ec texlive-ec)
;; FIXME: the fonts should be built from source, but running "tex aefonts.tex" ;; FIXME: the fonts should be built from source, but running "tex aefonts.tex"
;; fails with obscure TeX-typical error messages. ;; fails with obscure TeX-typical error messages.
(define-public texlive-ae (define-public texlive-ae
@ -8944,7 +8940,7 @@ and Karl Berry.")
qtsvg-5 qtsvg-5
zlib)) zlib))
(propagated-inputs (propagated-inputs
(list (texlive-updmap.cfg (list texlive-fonts-ec)))) (list (texlive-updmap.cfg (list texlive-ec))))
(native-inputs (native-inputs
(list python pkg-config)) (list python pkg-config))
(home-page "https://www.lyx.org/") (home-page "https://www.lyx.org/")