mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
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:
parent
582ec648c9
commit
29cc6b1cd6
13 changed files with 41 additions and 50 deletions
|
@ -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
|
(@pxref{Invoking guix size}). This will allow you to notice references
|
||||||
to other packages unwillingly retained. It may also help determine
|
to other packages unwillingly retained. It may also help determine
|
||||||
whether to split the package (@pxref{Packages with Multiple Outputs}),
|
whether to split the package (@pxref{Packages with Multiple Outputs}),
|
||||||
and which optional dependencies should be used. In particular, avoid adding
|
and which optional dependencies should be used. In particular, avoid
|
||||||
@code{texlive} as a dependency: because of its extreme size, use
|
adding @code{texlive} as a dependency: because of its extreme size, use
|
||||||
the @code{texlive-tiny} package or @code{texlive-union} procedure instead.
|
@code{texlive-updmap.cfg} procedure instead.
|
||||||
|
|
||||||
@item
|
@item
|
||||||
Check that dependent packages (if applicable) are not affected by the
|
Check that dependent packages (if applicable) are not affected by the
|
||||||
|
|
|
@ -236,7 +236,7 @@ (define-public pari-gp
|
||||||
(base32
|
(base32
|
||||||
"03swii601kxnphl6v7wv0rh2xn4rz6xbljzvfw5v9py6w3z5nm63"))))
|
"03swii601kxnphl6v7wv0rh2xn4rz6xbljzvfw5v9py6w3z5nm63"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs (list texlive-tiny))
|
(native-inputs (list (texlive-updmap.cfg)))
|
||||||
(inputs (list gmp libx11 perl readline))
|
(inputs (list gmp libx11 perl readline))
|
||||||
(arguments
|
(arguments
|
||||||
'(#:make-flags '("all")
|
'(#:make-flags '("all")
|
||||||
|
@ -405,7 +405,7 @@ (define-public giac
|
||||||
hevea
|
hevea
|
||||||
python-wrapper
|
python-wrapper
|
||||||
readline
|
readline
|
||||||
texlive-tiny))
|
(texlive-updmap.cfg)))
|
||||||
(home-page "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html")
|
(home-page "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html")
|
||||||
(synopsis "Computer algebra system")
|
(synopsis "Computer algebra system")
|
||||||
(description
|
(description
|
||||||
|
|
|
@ -1075,10 +1075,10 @@ (define-public chez-sockets
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list (chez-scheme-for-system)
|
(list (chez-scheme-for-system)
|
||||||
chez-web
|
chez-web
|
||||||
texlive-tiny))
|
(texlive-updmap.cfg)))
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:tests? #f ; no tests
|
#:tests? #f ; no tests
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(replace 'configure
|
(replace 'configure
|
||||||
|
|
|
@ -575,10 +575,11 @@ (define-public fastcap
|
||||||
"fastcap-mulGlobal.patch"))))
|
"fastcap-mulGlobal.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
;; FIXME: with texlive-tiny citation references are rendered as question
|
;; FIXME: with (texlive-updmap.cfg) citation references are rendered as
|
||||||
;; marks. During the build warnings like these are printed:
|
;; question 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
|
||||||
`(("texlive" ,texlive-tiny)
|
;; 3.
|
||||||
|
`(("texlive" ,(texlive-updmap.cfg))
|
||||||
("ghostscript" ,ghostscript)))
|
("ghostscript" ,ghostscript)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all")
|
`(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all")
|
||||||
|
|
|
@ -292,7 +292,7 @@ (define-public po4a
|
||||||
;; For tests.
|
;; For tests.
|
||||||
docbook-xml-4.1.2
|
docbook-xml-4.1.2
|
||||||
perl-test-pod
|
perl-test-pod
|
||||||
texlive-tiny))
|
(texlive-updmap.cfg)))
|
||||||
(inputs
|
(inputs
|
||||||
(list bash-minimal
|
(list bash-minimal
|
||||||
perl-gettext
|
perl-gettext
|
||||||
|
|
|
@ -2472,7 +2472,7 @@ (define-public mmg
|
||||||
(list doxygen graphviz
|
(list doxygen graphviz
|
||||||
;; TODO: Fix failing LaTeX invocation (which results in equations
|
;; TODO: Fix failing LaTeX invocation (which results in equations
|
||||||
;; being inserted literally into PNGs rather than being typeset).
|
;; being inserted literally into PNGs rather than being typeset).
|
||||||
;;texlive-tiny
|
;; (texlive-updmap.cfg)
|
||||||
|
|
||||||
perl)) ;used to generate Fortran headers
|
perl)) ;used to generate Fortran headers
|
||||||
(inputs
|
(inputs
|
||||||
|
|
|
@ -829,29 +829,30 @@ (define-public cddlib
|
||||||
(version "0.94m")
|
(version "0.94m")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "https://github.com/cddlib/cddlib")
|
(url "https://github.com/cddlib/cddlib")
|
||||||
(commit version)))
|
(commit version)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"09s8323h5w9j6mpl1yc6lm770dkskfxd2ayyafkcjllmnncxzfa0"))))
|
"09s8323h5w9j6mpl1yc6lm770dkskfxd2ayyafkcjllmnncxzfa0"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
(list gmp))
|
(list gmp))
|
||||||
(native-inputs (list autoconf
|
(native-inputs
|
||||||
automake
|
(list autoconf
|
||||||
libtool
|
automake
|
||||||
texlive-amsfonts
|
libtool
|
||||||
texlive-l3backend
|
(texlive-updmap.cfg
|
||||||
texlive-graphics
|
(list texlive-amsfonts
|
||||||
texlive-l3backend
|
texlive-graphics
|
||||||
texlive-tiny))
|
texlive-l3backend
|
||||||
|
texlive-l3backend))))
|
||||||
(arguments
|
(arguments
|
||||||
(list #:configure-flags
|
(list #:configure-flags
|
||||||
#~(list (string-append "--docdir=" #$output
|
#~(list (string-append "--docdir=" #$output
|
||||||
"/share/doc/" #$name "-" #$version))))
|
"/share/doc/" #$name "-" #$version))))
|
||||||
(home-page "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html")
|
(home-page "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html")
|
||||||
(synopsis "Library for convex hulls and extreme rays of polyhedra")
|
(synopsis "Library for convex hulls and extreme rays of polyhedra")
|
||||||
(description
|
(description
|
||||||
|
@ -1237,7 +1238,7 @@ (define-public gnuplot
|
||||||
(base32 "1kzmj4yyxvlxqzqbrw6sx6dnvhj1zzqnciyb8ryzy6mdrb3pj4lk"))))
|
(base32 "1kzmj4yyxvlxqzqbrw6sx6dnvhj1zzqnciyb8ryzy6mdrb3pj4lk"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list pkg-config texlive-tiny))
|
(list pkg-config (texlive-updmap.cfg)))
|
||||||
(inputs
|
(inputs
|
||||||
(list cairo gd lua pango readline))
|
(list cairo gd lua pango readline))
|
||||||
(arguments
|
(arguments
|
||||||
|
@ -1947,7 +1948,7 @@ (define-public itpp
|
||||||
;; FIXME: Even though the fonts are available dvips complains:
|
;; FIXME: Even though the fonts are available dvips complains:
|
||||||
;; "Font cmmi10 not found; characters will be left blank."
|
;; "Font cmmi10 not found; characters will be left blank."
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("texlive" ,texlive-tiny)
|
`(("texlive" ,(texlive-updmap.cfg))
|
||||||
("ghostscript" ,ghostscript)
|
("ghostscript" ,ghostscript)
|
||||||
("doxygen" ,doxygen)))
|
("doxygen" ,doxygen)))
|
||||||
(home-page "https://itpp.sourceforge.net")
|
(home-page "https://itpp.sourceforge.net")
|
||||||
|
|
|
@ -1377,7 +1377,7 @@ (define-public unison
|
||||||
`(("ocaml" ,ocaml-4.09)
|
`(("ocaml" ,ocaml-4.09)
|
||||||
;; For documentation
|
;; For documentation
|
||||||
("ghostscript" ,ghostscript)
|
("ghostscript" ,ghostscript)
|
||||||
("texlive" ,texlive-tiny)
|
("texlive" ,(texlive-updmap.cfg))
|
||||||
("hevea" ,hevea)
|
("hevea" ,hevea)
|
||||||
("lynx" ,lynx)
|
("lynx" ,lynx)
|
||||||
("which" ,which)))
|
("which" ,which)))
|
||||||
|
|
|
@ -220,7 +220,7 @@ (define-public extractpdfmark
|
||||||
gettext-minimal
|
gettext-minimal
|
||||||
ghostscript
|
ghostscript
|
||||||
pkg-config
|
pkg-config
|
||||||
texlive-tiny))
|
(texlive-updmap.cfg)))
|
||||||
(inputs
|
(inputs
|
||||||
(list poppler))
|
(list poppler))
|
||||||
(home-page "https://github.com/trueroad/extractpdfmark")
|
(home-page "https://github.com/trueroad/extractpdfmark")
|
||||||
|
|
|
@ -381,7 +381,7 @@ (define-public enblend-enfuse
|
||||||
help2man
|
help2man
|
||||||
imagemagick
|
imagemagick
|
||||||
libxml2
|
libxml2
|
||||||
texlive-tiny
|
(texlive-updmap.cfg)
|
||||||
tidy-html
|
tidy-html
|
||||||
transfig))
|
transfig))
|
||||||
(inputs
|
(inputs
|
||||||
|
|
|
@ -709,7 +709,6 @@ (define-public gnuradio
|
||||||
python-pyzmq
|
python-pyzmq
|
||||||
python-scipy
|
python-scipy
|
||||||
python-sphinx
|
python-sphinx
|
||||||
texlive-tiny
|
|
||||||
(texlive-updmap.cfg (list texlive-newunicodechar))
|
(texlive-updmap.cfg (list texlive-newunicodechar))
|
||||||
xorg-server-for-tests))
|
xorg-server-for-tests))
|
||||||
(inputs
|
(inputs
|
||||||
|
|
|
@ -135,9 +135,7 @@ (define-module (gnu packages tex)
|
||||||
;;; module also provides TEXLIVE-UPDMAP.CFG function, which creates a TeX Live
|
;;; module also provides TEXLIVE-UPDMAP.CFG function, which creates a TeX Live
|
||||||
;;; tree with font map files updates. It should be used exclusively for
|
;;; tree with font map files updates. It should be used exclusively for
|
||||||
;;; package definitions, as a native input. It is possible to augment that
|
;;; package definitions, as a native input. It is possible to augment that
|
||||||
;;; tree, in particular with additional font packages. TEXLIVE-TINY package
|
;;; tree, in particular with additional font packages.
|
||||||
;;; is a shortcut for TEXLIVE-UPDMAP.CFG called without any additional
|
|
||||||
;;; package.
|
|
||||||
;;;
|
;;;
|
||||||
;;; Unlike font map files, TeX formats are not built from a profile hook, as
|
;;; 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".
|
;;; 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))))))))
|
(append default-packages packages))))))))
|
||||||
|
|
||||||
|
(define-deprecated-package texlive-tiny texlive-scheme-basic)
|
||||||
(define-deprecated/alias texlive-union texlive-updmap.cfg)
|
(define-deprecated/alias texlive-union texlive-updmap.cfg)
|
||||||
(export texlive-union)
|
(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
|
(define-public texlive-tex
|
||||||
(package
|
(package
|
||||||
(name "texlive-tex")
|
(name "texlive-tex")
|
||||||
|
@ -8263,7 +8254,7 @@ (define-public texlive-makecmds
|
||||||
"05y5n265in7mrbpgjxqg339l8r8dmp6lvl4k528pr3rkb8z94qaf")))
|
"05y5n265in7mrbpgjxqg339l8r8dmp6lvl4k528pr3rkb8z94qaf")))
|
||||||
(outputs '("out" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(build-system texlive-build-system)
|
(build-system texlive-build-system)
|
||||||
(native-inputs (list texlive-tiny))
|
(native-inputs (list (texlive-updmap.cfg)))
|
||||||
(home-page "https://www.ctan.org/pkg/makecmds")
|
(home-page "https://www.ctan.org/pkg/makecmds")
|
||||||
(synopsis "TeX macro to define or redefine a command")
|
(synopsis "TeX macro to define or redefine a command")
|
||||||
(description "The package provides a @code{\\makecommand} command, which
|
(description "The package provides a @code{\\makecommand} command, which
|
||||||
|
|
|
@ -518,7 +518,6 @@ (define (check-inputs-should-be-native package)
|
||||||
"qmake"
|
"qmake"
|
||||||
"qttools-5"
|
"qttools-5"
|
||||||
"texinfo"
|
"texinfo"
|
||||||
"texlive-tiny"
|
|
||||||
"texlive-updmap.cfg"
|
"texlive-updmap.cfg"
|
||||||
"xorg-server-for-tests"
|
"xorg-server-for-tests"
|
||||||
"yelp-tools")))
|
"yelp-tools")))
|
||||||
|
|
Loading…
Reference in a new issue