gnu: Deprecate `texlive-tiny'.

At this point, there are three equivalent TeX Live sub-systems:
texlive-scheme-basic, texlive-tiny, and (texlive-updmap.cfg).  It is confusing
to keep so many around.

* doc/contributing.texi (Submitting Patches): Remove reference to
TEXLIVE-TINY.
* gnu/packages/algebra.scm (pari-gp)[native-inputs]:
(giac)[native-inputs]:
* gnu/packages/chez.scm (chez-sockets)[native-inputs]:
* gnu/packages/engineering.scm (fastcap)[native-inputs]:
* gnu/packages/gettext.scm (po4a)[native-inputs]:
* gnu/packages/maths.scm (cddlib)[native-inputs]:
(gnuplot)[native-inputs]:
(itpp)[native-inputs]:
* gnu/packages/ocaml.scm (unison)[native-inputs]:
* gnu/packages/pdf.scm (extractpdfmark)[native-inputs]:
* gnu/packages/photo.scm (enblend-enfuse): Replace TEXLIVE-TINY with a call to TEXLIVE-UPDMAP.CFG.
* gnu/packages/radio.scm (gnuradio)[native-inputs]: Remove unnecessary
TEXLIVE-TINY.
* gnu/packages/tex.scm (texlive-tiny): Deprecate it in favor of TEXLIVE-SCHEME-BASIC.
(texlive-makecmds)[native-inputs]:  Replace TEXLIVE-TINY with a call to TEXLIVE-UPDMAP.CFG.
* guix/lint.scm (check-inputs-should-be-native): Check only for
"texlive-updmap.cfg" input name.
This commit is contained in:
Nicolas Goaziou 2023-07-03 22:04:36 +02:00
parent 582ec648c9
commit 29cc6b1cd6
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
13 changed files with 41 additions and 50 deletions

View file

@ -1252,9 +1252,9 @@ Take a look at the profile reported by @command{guix size}
(@pxref{Invoking guix size}). This will allow you to notice references
to other packages unwillingly retained. It may also help determine
whether to split the package (@pxref{Packages with Multiple Outputs}),
and which optional dependencies should be used. In particular, avoid adding
@code{texlive} as a dependency: because of its extreme size, use
the @code{texlive-tiny} package or @code{texlive-union} procedure instead.
and which optional dependencies should be used. In particular, avoid
adding @code{texlive} as a dependency: because of its extreme size, use
@code{texlive-updmap.cfg} procedure instead.
@item
Check that dependent packages (if applicable) are not affected by the

View file

@ -236,7 +236,7 @@ (define-public pari-gp
(base32
"03swii601kxnphl6v7wv0rh2xn4rz6xbljzvfw5v9py6w3z5nm63"))))
(build-system gnu-build-system)
(native-inputs (list texlive-tiny))
(native-inputs (list (texlive-updmap.cfg)))
(inputs (list gmp libx11 perl readline))
(arguments
'(#:make-flags '("all")
@ -405,7 +405,7 @@ (define-public giac
hevea
python-wrapper
readline
texlive-tiny))
(texlive-updmap.cfg)))
(home-page "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html")
(synopsis "Computer algebra system")
(description

View file

@ -1075,7 +1075,7 @@ (define-public chez-sockets
(native-inputs
(list (chez-scheme-for-system)
chez-web
texlive-tiny))
(texlive-updmap.cfg)))
(arguments
(list
#:tests? #f ; no tests

View file

@ -575,10 +575,11 @@ (define-public fastcap
"fastcap-mulGlobal.patch"))))
(build-system gnu-build-system)
(native-inputs
;; FIXME: with texlive-tiny citation references are rendered as question
;; marks. During the build warnings like these are printed:
;; LaTeX Warning: Citation `nabors91' on page 2 undefined on input line 3.
`(("texlive" ,texlive-tiny)
;; FIXME: with (texlive-updmap.cfg) citation references are rendered as
;; question marks. During the build warnings like these are printed:
;; LaTeX Warning: Citation `nabors91' on page 2 undefined on input line
;; 3.
`(("texlive" ,(texlive-updmap.cfg))
("ghostscript" ,ghostscript)))
(arguments
`(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all")

View file

@ -292,7 +292,7 @@ (define-public po4a
;; For tests.
docbook-xml-4.1.2
perl-test-pod
texlive-tiny))
(texlive-updmap.cfg)))
(inputs
(list bash-minimal
perl-gettext

View file

@ -2472,7 +2472,7 @@ (define-public mmg
(list doxygen graphviz
;; TODO: Fix failing LaTeX invocation (which results in equations
;; being inserted literally into PNGs rather than being typeset).
;;texlive-tiny
;; (texlive-updmap.cfg)
perl)) ;used to generate Fortran headers
(inputs

View file

@ -840,14 +840,15 @@ (define-public cddlib
(build-system gnu-build-system)
(inputs
(list gmp))
(native-inputs (list autoconf
(native-inputs
(list autoconf
automake
libtool
texlive-amsfonts
texlive-l3backend
(texlive-updmap.cfg
(list texlive-amsfonts
texlive-graphics
texlive-l3backend
texlive-tiny))
texlive-l3backend))))
(arguments
(list #:configure-flags
#~(list (string-append "--docdir=" #$output
@ -1237,7 +1238,7 @@ (define-public gnuplot
(base32 "1kzmj4yyxvlxqzqbrw6sx6dnvhj1zzqnciyb8ryzy6mdrb3pj4lk"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config texlive-tiny))
(list pkg-config (texlive-updmap.cfg)))
(inputs
(list cairo gd lua pango readline))
(arguments
@ -1947,7 +1948,7 @@ (define-public itpp
;; FIXME: Even though the fonts are available dvips complains:
;; "Font cmmi10 not found; characters will be left blank."
(native-inputs
`(("texlive" ,texlive-tiny)
`(("texlive" ,(texlive-updmap.cfg))
("ghostscript" ,ghostscript)
("doxygen" ,doxygen)))
(home-page "https://itpp.sourceforge.net")

View file

@ -1377,7 +1377,7 @@ (define-public unison
`(("ocaml" ,ocaml-4.09)
;; For documentation
("ghostscript" ,ghostscript)
("texlive" ,texlive-tiny)
("texlive" ,(texlive-updmap.cfg))
("hevea" ,hevea)
("lynx" ,lynx)
("which" ,which)))

View file

@ -220,7 +220,7 @@ (define-public extractpdfmark
gettext-minimal
ghostscript
pkg-config
texlive-tiny))
(texlive-updmap.cfg)))
(inputs
(list poppler))
(home-page "https://github.com/trueroad/extractpdfmark")

View file

@ -381,7 +381,7 @@ (define-public enblend-enfuse
help2man
imagemagick
libxml2
texlive-tiny
(texlive-updmap.cfg)
tidy-html
transfig))
(inputs

View file

@ -709,7 +709,6 @@ (define-public gnuradio
python-pyzmq
python-scipy
python-sphinx
texlive-tiny
(texlive-updmap.cfg (list texlive-newunicodechar))
xorg-server-for-tests))
(inputs

View file

@ -135,9 +135,7 @@ (define-module (gnu packages tex)
;;; module also provides TEXLIVE-UPDMAP.CFG function, which creates a TeX Live
;;; tree with font map files updates. It should be used exclusively for
;;; package definitions, as a native input. It is possible to augment that
;;; tree, in particular with additional font packages. TEXLIVE-TINY package
;;; is a shortcut for TEXLIVE-UPDMAP.CFG called without any additional
;;; package.
;;; tree, in particular with additional font packages.
;;;
;;; Unlike font map files, TeX formats are not built from a profile hook, as
;;; the process would be too time-consuming, e.g., when invoking "guix shell".
@ -984,17 +982,10 @@ (define-public texlive-updmap.cfg
'()
(append default-packages packages))))))))
(define-deprecated-package texlive-tiny texlive-scheme-basic)
(define-deprecated/alias texlive-union texlive-updmap.cfg)
(export texlive-union)
;; For use in package definitions only
(define-public texlive-tiny
(package
(inherit (texlive-updmap.cfg))
(name "texlive-tiny")
(description "This is a very limited subset of the TeX Live distribution.
It includes little more than the required set of LaTeX packages.")))
(define-public texlive-tex
(package
(name "texlive-tex")
@ -8263,7 +8254,7 @@ (define-public texlive-makecmds
"05y5n265in7mrbpgjxqg339l8r8dmp6lvl4k528pr3rkb8z94qaf")))
(outputs '("out" "doc"))
(build-system texlive-build-system)
(native-inputs (list texlive-tiny))
(native-inputs (list (texlive-updmap.cfg)))
(home-page "https://www.ctan.org/pkg/makecmds")
(synopsis "TeX macro to define or redefine a command")
(description "The package provides a @code{\\makecommand} command, which

View file

@ -518,7 +518,6 @@ (define (check-inputs-should-be-native package)
"qmake"
"qttools-5"
"texinfo"
"texlive-tiny"
"texlive-updmap.cfg"
"xorg-server-for-tests"
"yelp-tools")))