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

gnu: Replace all uses of texlive-union by texlive-updmap.cfg.

Browse source 
* doc/build.scm (pdf-manual) Replace texlive-union by texlive-updmap.cfg.
* gnu/packages/algebra.scm (pari-gp): Likewise.
* gnu/packages/bioinformatics.scm (discrover, velvet): Likewise.
* gnu/packages/chez.scm (chez-scheme, chez-web, chez-sockets): Likewise.
* gnu/packages/docbook.scm (dblatex): Likewise.
* gnu/packages/emacs-xyz.scm (emacs-auctex): Likewise.
* gnu/packages/engineering.scm (fastcap): Likewise.
* gnu/packages/guile-xyz.scm (emacsy, guile-cv): Likewise.
* gnu/packages/lisp.scm (sbcl): Likewise.
* gnu/packages/maths.scm (octave, hypre): Likewise.
* gnu/packages/music.scm (lilypond): Likewise.
* gnu/packages/plotutils.scm (asymptote): Likewise.
* gnu/packages/python-xyz.scm (python-numpy-documentation)
(python-matplotlib-documentation, python-ipython-documentation)
(python-pypandoc): Likewise.
* gnu/packages/radio.scm (gnuradio, libosmo-dsp): Likewise.
* gnu/packages/scheme.scm (mit-scheme): Likewise.
* gnu/packages/statistics.scm (r-with-tests): Likewise.
* gnu/packages/tex.scm (simple-texlive-package)
(texlive-xmltex, texlive-tiny, texlive-jadetex, teximpatient, lyx): Likewise.
This commit is contained in:
Maxim Cournoyer 2021-01-14 00:23:38 -05:00
parent 57fad03c4f
commit 82f5f6b14c
No known key found for this signature in database
GPG key ID: 1260E46482E63562
17 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/build.scm
View file

@ -736,7 +736,7 @@ (define manual-source
;; accented letters. ;; accented letters.
;; ;;
;; (define texlive ;; (define texlive
;; (texlive-union (list texlive-tex-texinfo ;; (texlive-updmap.cfg (list texlive-tex-texinfo
;; texlive-generic-epsf ;; texlive-generic-epsf
;; texlive-fonts-ec))) ;; texlive-fonts-ec)))

2
gnu/packages/algebra.scm
View file

@ -245,7 +245,7 @@ (define-public pari-gp
"14xs90wrw8mbdx08hxlbhiahp6kgjq6yh27zjw7fvhfjx5nr84f8")))) "14xs90wrw8mbdx08hxlbhiahp6kgjq6yh27zjw7fvhfjx5nr84f8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("texlive" ,(texlive-union `(("texlive" ,(texlive-updmap.cfg
(list texlive-amsfonts))))) (list texlive-amsfonts)))))
(inputs `(("gmp" ,gmp) (inputs `(("gmp" ,gmp)
("libx11" ,libx11) ("libx11" ,libx11)

4
gnu/packages/bioinformatics.scm
View file

@ -2904,7 +2904,7 @@ (define-public discrover
("cairo" ,cairo) ("cairo" ,cairo)
("rmath-standalone" ,rmath-standalone))) ("rmath-standalone" ,rmath-standalone)))
(native-inputs (native-inputs
`(("texlive" ,(texlive-union (list texlive-cm `(("texlive" ,(texlive-updmap.cfg (list texlive-cm
texlive-amsfonts texlive-amsfonts
texlive-latex-doi texlive-latex-doi
@ -14186,7 +14186,7 @@ (define-public velvet
`(("openmpi" ,openmpi) `(("openmpi" ,openmpi)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("texlive" ,(texlive-union (list texlive-latex-graphics `(("texlive" ,(texlive-updmap.cfg (list texlive-latex-graphics
texlive-latex-hyperref))))) texlive-latex-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")

6
gnu/packages/chez.scm
View file

@ -88,7 +88,7 @@ (define-public chez-scheme
("zlib:static" ,zlib "static") ("zlib:static" ,zlib "static")
("stex" ,stex))) ("stex" ,stex)))
(native-inputs (native-inputs
`(("texlive" ,(texlive-union (list texlive-latex-oberdiek `(("texlive" ,(texlive-updmap.cfg (list texlive-latex-oberdiek
texlive-generic-epsf))) texlive-generic-epsf)))
("ghostscript" ,ghostscript) ("ghostscript" ,ghostscript)
("netpbm" ,netpbm))) ("netpbm" ,netpbm)))
@ -273,7 +273,7 @@ (define-public chez-web
(native-inputs (native-inputs
`(("chez-scheme" ,chez-scheme) `(("chez-scheme" ,chez-scheme)
("ghostscript" ,ghostscript) ("ghostscript" ,ghostscript)
("texlive" ,(texlive-union (list texlive-latex-oberdiek ("texlive" ,(texlive-updmap.cfg (list texlive-latex-oberdiek
texlive-generic-epsf texlive-generic-epsf
texlive-metapost texlive-metapost
texlive-fonts-charter texlive-fonts-charter
@ -332,7 +332,7 @@ (define-public chez-sockets
(native-inputs (native-inputs
`(("chez-scheme" ,chez-scheme) `(("chez-scheme" ,chez-scheme)
("chez-web" ,chez-web) ("chez-web" ,chez-web)
("texlive" ,(texlive-union (list texlive-pdftex))))) ("texlive" ,(texlive-updmap.cfg (list texlive-pdftex)))))
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:phases #:phases

2
gnu/packages/docbook.scm
View file

@ -397,7 +397,7 @@ (define-public dblatex
(build-system python-build-system) (build-system python-build-system)
;; TODO: Add xfig/transfig for fig2dev utility ;; TODO: Add xfig/transfig for fig2dev utility
(inputs (inputs
`(("texlive" ,(texlive-union (list texlive-amsfonts `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
texlive-latex-anysize texlive-latex-anysize
texlive-latex-appendix texlive-latex-appendix
texlive-latex-changebar texlive-latex-changebar

2
gnu/packages/emacs-xyz.scm
View file

@ -2118,7 +2118,7 @@ (define-public emacs-auctex
`(("perl" ,perl))) `(("perl" ,perl)))
(inputs (inputs
`(("ghostscript" ,ghostscript) `(("ghostscript" ,ghostscript)
("texlive" ,(texlive-union (list texlive-amsfonts))))) ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts)))))
(home-page "https://www.gnu.org/software/auctex/") (home-page "https://www.gnu.org/software/auctex/")
(synopsis "Integrated environment for TeX") (synopsis "Integrated environment for TeX")
(description (description

2
gnu/packages/engineering.scm
View file

@ -514,7 +514,7 @@ (define-public fastcap
;; FIXME: with texlive-tiny citation references are rendered as question ;; FIXME: with texlive-tiny citation references are rendered as question
;; marks. During the build warnings like these are printed: ;; marks. During the build warnings like these are printed:
;; LaTeX Warning: Citation `nabors91' on page 2 undefined on input line 3. ;; LaTeX Warning: Citation `nabors91' on page 2 undefined on input line 3.
`(("texlive" ,(texlive-union (list texlive-fonts-amsfonts))) `(("texlive" ,(texlive-updmap.cfg (list texlive-fonts-amsfonts)))
("ghostscript" ,ghostscript))) ("ghostscript" ,ghostscript)))
(arguments (arguments
`(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all") `(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all")

4
gnu/packages/guile-xyz.scm
View file

@ -3144,7 +3144,7 @@ (define-public emacsy
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("texlive" ,(texlive-union (list texlive-generic-epsf))))) ("texlive" ,(texlive-updmap.cfg (list texlive-generic-epsf)))))
(inputs (inputs
`(("dbus-glib" ,dbus-glib) `(("dbus-glib" ,dbus-glib)
("guile" ,guile-3.0) ("guile" ,guile-3.0)
@ -3421,7 +3421,7 @@ (define-public guile-cv
("vigra-c" ,vigra-c) ("vigra-c" ,vigra-c)
("guile" ,guile-2.2))) ("guile" ,guile-2.2)))
(native-inputs (native-inputs
`(("texlive" ,(texlive-union (list texlive-booktabs `(("texlive" ,(texlive-updmap.cfg (list texlive-booktabs
texlive-lm texlive-lm
texlive-siunitx texlive-siunitx
texlive-standalone texlive-standalone

2
gnu/packages/lisp.scm
View file

@ -434,7 +434,7 @@ (define-public sbcl
("ed" ,ed) ("ed" ,ed)
("inetutils" ,inetutils) ;for hostname(1) ("inetutils" ,inetutils) ;for hostname(1)
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("texlive" ,(texlive-union (list texlive-tex-texinfo))) ("texlive" ,(texlive-updmap.cfg (list texlive-tex-texinfo)))
("which" ,which) ("which" ,which)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments

4
gnu/packages/maths.scm
View file

@ -2010,7 +2010,7 @@ (define-public octave
,@(package-inputs octave-cli))) ,@(package-inputs octave-cli)))
(native-inputs (native-inputs
`(("qttools" , qttools) ;for lrelease `(("qttools" , qttools) ;for lrelease
("texlive" ,(texlive-union (list texlive-epsf))) ; for texi2dvi ("texlive" ,(texlive-updmap.cfg (list texlive-epsf))) ; for texi2dvi
,@(package-native-inputs octave-cli))) ,@(package-native-inputs octave-cli)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments octave-cli) (substitute-keyword-arguments (package-arguments octave-cli)
@ -4464,7 +4464,7 @@ (define-public hypre
`(("doc++" ,doc++) `(("doc++" ,doc++)
("netpbm" ,netpbm) ("netpbm" ,netpbm)
("perl" ,perl) ; needed to run 'ppmquant' during tests ("perl" ,perl) ; needed to run 'ppmquant' during tests
("texlive" ,(texlive-union (list texlive-xypic ("texlive" ,(texlive-updmap.cfg (list texlive-xypic
texlive-cm texlive-cm
texlive-latex-hyperref texlive-latex-hyperref
texlive-bibtex))) texlive-bibtex)))

2
gnu/packages/music.scm
View file

@ -1342,7 +1342,7 @@ (define-public lilypond
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("imagemagick" ,imagemagick) ("imagemagick" ,imagemagick)
("netpbm" ,netpbm) ;for pngtopnm ("netpbm" ,netpbm) ;for pngtopnm
("texlive" ,(texlive-union (list texlive-metapost ("texlive" ,(texlive-updmap.cfg (list texlive-metapost
texlive-generic-epsf texlive-generic-epsf
texlive-lh texlive-lh
texlive-latex-cyrillic))) texlive-latex-cyrillic)))

2
gnu/packages/plotutils.scm
View file

@ -226,7 +226,7 @@ (define-public asymptote
("perl" ,perl) ("perl" ,perl)
("texinfo" ,texinfo) ;For generating documentation ("texinfo" ,texinfo) ;For generating documentation
;; For the manual and the tests. ;; For the manual and the tests.
("texlive" ,(texlive-union (list texlive-amsfonts ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
texlive-epsf texlive-epsf
texlive-etoolbox texlive-etoolbox
texlive-latex-base texlive-latex-base

10
gnu/packages/python-xyz.scm
View file

@ -4678,7 +4678,7 @@ (define-public python-numpy-documentation
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python-sphinx" ,python-sphinx) ("python-sphinx" ,python-sphinx)
("python-numpydoc" ,python-numpydoc) ("python-numpydoc" ,python-numpydoc)
("texlive" ,(texlive-union (list texlive-fonts-cm-super ("texlive" ,(texlive-updmap.cfg (list texlive-fonts-cm-super
texlive-fonts-ec texlive-fonts-ec
texlive-generic-ifxetex texlive-generic-ifxetex
texlive-generic-pdftex texlive-generic-pdftex
@ -4744,7 +4744,7 @@ (define-public python-numpy-documentation
(sphinx-theme-checkout (assoc-ref inputs scipy-sphinx-theme)) (sphinx-theme-checkout (assoc-ref inputs scipy-sphinx-theme))
(pyver ,(string-append "PYVER="))) (pyver ,(string-append "PYVER=")))
;; FIXME: this is needed to for texlive-union to generate ;; FIXME: this is needed to for texlive-updmap.cfg to generate
;; fonts, which are not found. ;; fonts, which are not found.
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")
@ -5210,7 +5210,7 @@ (define-public python-matplotlib-documentation
("python-ipykernel" ,python-ipykernel) ("python-ipykernel" ,python-ipykernel)
("python-mock" ,python-mock) ("python-mock" ,python-mock)
("graphviz" ,graphviz) ("graphviz" ,graphviz)
("texlive" ,(texlive-union (list texlive-amsfonts ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
texlive-latex-amsmath texlive-latex-amsmath
texlive-latex-enumitem texlive-latex-enumitem
texlive-latex-expdlist texlive-latex-expdlist
@ -7323,7 +7323,7 @@ (define-public python-ipython-documentation
`(("python-sphinx" ,python-sphinx) `(("python-sphinx" ,python-sphinx)
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
;; FIXME: It's possible that a smaller union would work just as well. ;; FIXME: It's possible that a smaller union would work just as well.
("texlive" ,(texlive-union (list texlive-amsfonts ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
texlive-fonts-ec texlive-fonts-ec
texlive-generic-ifxetex texlive-generic-ifxetex
texlive-pdftex texlive-pdftex
@ -22865,7 +22865,7 @@ (define-public python-pypandoc
(propagated-inputs (propagated-inputs
`(("wheel" ,python-wheel))) `(("wheel" ,python-wheel)))
(native-inputs (native-inputs
`(("texlive" ,(texlive-union (list texlive-amsfonts `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
texlive-fonts-ec texlive-fonts-ec
texlive-latex-hyperref texlive-latex-hyperref
texlive-latex-oberdiek texlive-latex-oberdiek

4
gnu/packages/radio.scm
View file

@ -303,7 +303,7 @@ (define-public gnuradio
("python-scipy" ,python-scipy) ("python-scipy" ,python-scipy)
("python-sphinx" ,python-sphinx) ("python-sphinx" ,python-sphinx)
("swig" ,swig) ("swig" ,swig)
("texlive" ,(texlive-union (list texlive-amsfonts ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
texlive-latex-amsmath texlive-latex-amsmath
;; TODO: Add newunicodechar. ;; TODO: Add newunicodechar.
texlive-latex-graphics))) texlive-latex-graphics)))
@ -471,7 +471,7 @@ (define-public libosmo-dsp
("doxygen" ,doxygen) ("doxygen" ,doxygen)
("libtool" ,libtool) ("libtool" ,libtool)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("texlive" ,(texlive-union (list texlive-amsfonts ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
texlive-latex-amsmath texlive-latex-amsmath
;; TODO: Add newunicodechar. ;; TODO: Add newunicodechar.
texlive-latex-graphics))))) texlive-latex-graphics)))))

2
gnu/packages/scheme.scm
View file

@ -170,7 +170,7 @@ (define-public mit-scheme
("autoconf" ,autoconf) ("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool) ("libtool" ,libtool)
("texlive" ,(texlive-union (list texlive-tex-texinfo))) ("texlive" ,(texlive-updmap.cfg (list texlive-tex-texinfo)))
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("m4" ,m4))) ("m4" ,m4)))
(inputs (inputs

2
gnu/packages/statistics.scm
View file

@ -337,7 +337,7 @@ (define r-with-tests
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("texinfo" ,texinfo) ; for building HTML manuals ("texinfo" ,texinfo) ; for building HTML manuals
("texlive" ,(texlive-union (list texlive-ae ("texlive" ,(texlive-updmap.cfg (list texlive-ae
texlive-inconsolata texlive-inconsolata
texlive-fonts-ec texlive-fonts-ec
texlive-amsfonts texlive-amsfonts

10
gnu/packages/tex.scm
View file

@ -3009,7 +3009,7 @@ (define-public texlive-xmltex
(symlink pdftex (string-append out "/bin/pdfxmltex")) (symlink pdftex (string-append out "/bin/pdfxmltex"))
#t))))))) #t)))))))
(propagated-inputs (propagated-inputs
;; The following fonts are propagated as a texlive-union as the font ;; The following fonts are propagated as a texlive-updmap.cfg as the font
;; maps need to be recreated for the fonts to be usable. They are ;; maps need to be recreated for the fonts to be usable. They are
;; required by xmltex through mlnames.sty and unicode.sty. ;; required by xmltex through mlnames.sty and unicode.sty.
`(("texlive" ,(texlive-updmap.cfg `(("texlive" ,(texlive-updmap.cfg
@ -3843,7 +3843,7 @@ (define texlive-union texlive-updmap.cfg)
;; For use in package definitions only ;; For use in package definitions only
(define-public texlive-tiny (define-public texlive-tiny
(package (package
(inherit (texlive-union)) (inherit (texlive-updmap.cfg))
(name "texlive-tiny") (name "texlive-tiny")
(description "This is a very limited subset of the TeX Live distribution. (description "This is a very limited subset of the TeX Live distribution.
It includes little more than the required set of LaTeX packages."))) It includes little more than the required set of LaTeX packages.")))
@ -5803,7 +5803,7 @@ (define-public texlive-jadetex
(symlink pdftex (string-append out "/bin/pdfjadetex")) (symlink pdftex (string-append out "/bin/pdfjadetex"))
#t))))))) #t)))))))
(propagated-inputs (propagated-inputs
;; Propagate the texlive-union input used by xmltex, which provides the ;; Propagate the texlive-updmap.cfg input used by xmltex, which provides the
;; required fonts for its use. ;; required fonts for its use.
`(("texlive-xmltex" ,texlive-xmltex) `(("texlive-xmltex" ,texlive-xmltex)
("texlive-kpathsea" ,texlive-kpathsea))) ;for fmtutil.cnf template ("texlive-kpathsea" ,texlive-kpathsea))) ;for fmtutil.cnf template
@ -6685,7 +6685,7 @@ (define-public teximpatient
(delete-file "book.pdf") (delete-file "book.pdf")
#t))))) #t)))))
(native-inputs (native-inputs
`(("texlive" ,(texlive-union (list texlive-amsfonts `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
texlive-fonts-adobe-palatino texlive-fonts-adobe-palatino
texlive-fonts-adobe-zapfding texlive-fonts-adobe-zapfding
texlive-knuth-lib texlive-knuth-lib
@ -6755,7 +6755,7 @@ (define-public lyx
("qtsvg" ,qtsvg) ("qtsvg" ,qtsvg)
("zlib" ,zlib))) ("zlib" ,zlib)))
(propagated-inputs (propagated-inputs
`(("texlive" ,(texlive-union (list texlive-fonts-ec))))) `(("texlive" ,(texlive-updmap.cfg (list texlive-fonts-ec)))))
(native-inputs (native-inputs
`(("python" ,python) `(("python" ,python)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))