me/guix
Archived
1
0
Fork 0
Code Activity

gnu: Deprecate texlive-latex-tools.

Browse source 
* gnu/packages/tex.scm (texlive-latex-tools): Deprecate variable.
(texlive-base):
(texlive-pstool):
(texlive-jadetex):
* gnu/packages/statistics.scm (r-with-tests): Use TEXLIVE-TOOLS instead.
This commit is contained in:
Nicolas Goaziou 2022-03-09 01:01:07 +01:00
parent 3a29ec6d32
commit 7e2e7a34d1
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
2 changed files with 61 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/statistics.scm
View file

@ -355,7 +355,7 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
texlive-graphics texlive-graphics
texlive-hyperref texlive-hyperref
texlive-oberdiek texlive-oberdiek
texlive-latex-tools texlive-tools
texlive-latex-upquote texlive-latex-upquote
texlive-url texlive-url
texlive-latex-xkeyval))) texlive-latex-xkeyval)))

151
gnu/packages/tex.scm
View file

@ -3667,43 +3667,62 @@ files have changed. It is based on MD5 checksum, provided by pdfTeX.")
(define-deprecated-package texlive-latex-rerunfilecheck texlive-rerunfilecheck) (define-deprecated-package texlive-latex-rerunfilecheck texlive-rerunfilecheck)
(define-public texlive-latex-tools (define-public texlive-tools
(package (let ((template (simple-texlive-package
(name "texlive-latex-tools") "texlive-tools"
(version (number->string %texlive-revision)) (list "doc/latex/tools/"
(source (origin "source/latex/tools/"
(method svn-fetch) "tex/latex/tools/")
(uri (texlive-ref "latex" "tools"))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32 (base32
"1vm5wfyd0vbmv31a29fc7k8y14xiw00msvdx9n7dzsn9zpfjflqs")))) "0c0ixkcvrlzx6sdj25ak3bx0j65qghf51w66yg5wlnpg08d3awrs"))))
(build-system texlive-build-system) (package
(inherit template)
(outputs '("out" "doc"))
(arguments (arguments
'(#:tex-directory "latex/tools" (substitute-keyword-arguments (package-arguments template)
#:build-targets '("tools.ins") ((#:tex-directory _ '())
#:phases (modify-phases %standard-phases "latex/tools")
(add-after 'install 'provide-array-2016-10-06.sty ((#:build-targets _ '())
(lambda* (#:key outputs #:allow-other-keys) #~(list "tools.ins"))
;; XXX: array.sty does: ((#:phases phases)
;; "DeclareRelease{}{2016-10-06}{array-2016-10-06.sty}" #~(modify-phases #$phases
;; ...which causes some users (hypre) to look for that (add-after 'unpack 'chdir
;; file specifically. Provide it. (lambda _
(with-directory-excursion (string-append (chdir "source/latex/tools")))
(assoc-ref outputs "out") (replace 'copy-files
"/share/texmf-dist/tex" (lambda _
"/latex/tools") (let ((origin #$(package-source this-package))
(symlink "array.sty" "array-2016-10-06.sty"))))))) (source (string-append #$output
(home-page "https://www.ctan.org/pkg/latex-tools") "/share/texmf-dist/source"))
(doc (string-append #$output:doc
"/share/texmf-dist/doc")))
(copy-recursively (string-append origin "/source") source)
(copy-recursively (string-append origin "/doc") doc)
;; These files are not generated.
(let ((directory "/tex/latex/tools"))
(with-directory-excursion (string-append origin directory)
(for-each
(lambda (f)
(install-file f (string-append #$output
"/share/texmf-dist"
directory)))
'("array-2016-10-06.sty"
"array-2020-02-10.sty"
"multicol-2017-04-11.sty"
"varioref-2016-02-16.sty")))))))))))
(home-page "https://www.ctan.org/tex-archive/macros/latex/required/tools/")
(synopsis "LaTeX standard tools bundle") (synopsis "LaTeX standard tools bundle")
(description (description "This package provides a collection of simple tools that
"This package is a collection of (variously) simple tools provided as are part of the LaTeX required tools distribution, comprising the packages:
part of the LaTeX required tools distribution, comprising the following @code{afterpage}, @code{array}, @code{bm}, @code{calc}, @code{dcolumn},
packages: afterpage, array, bm, calc, dcolumn, delarray, enumerate, fileerr, @code{delarray}, @code{enumerate}, @code{fileerr}, @code{fontsmpl},
fontsmpl, ftnright, hhline, indentfirst, layout, longtable, multicol, @code{ftnright}, @code{hhline}, @code{indentfirst}, @code{layout},
rawfonts, showkeys, somedefs, tabularx, theorem, trace, varioref, verbatim, @code{longtable}, @code{multicol}, @code{rawfonts}, @code{showkeys},
xr, and xspace.") @code{somedefs}, @code{tabularx}, @code{theorem}, @code{trace},
(license license:lppl1.3+))) @code{varioref}, @code{verbatim}, @code{xr}, and @code{xspace}.")
(license license:lppl1.3+))))
(define-deprecated-package texlive-latex-tools texlive-tools)
(define-public texlive-url (define-public texlive-url
(package (package
@ -4478,7 +4497,7 @@ part of the LaTeX required set of packages.")
texlive-generic-babel-english texlive-generic-babel-english
texlive-latex-cyrillic texlive-latex-cyrillic
texlive-psnfss texlive-psnfss
texlive-latex-tools texlive-tools
texlive-tetex))) texlive-tetex)))
(package (package
(name "texlive-base") (name "texlive-base")
@ -5085,7 +5104,7 @@ rotated.")
texlive-latex-l3kernel ; for expl3 texlive-latex-l3kernel ; for expl3
texlive-oberdiek texlive-oberdiek
texlive-latex-psfrag texlive-latex-psfrag
texlive-latex-tools ; for shellesc texlive-tools ; for shellesc
texlive-latex-trimspaces texlive-latex-trimspaces
texlive-latex-xkeyval)) texlive-latex-xkeyval))
(home-page "https://www.ctan.org/pkg/pstool") (home-page "https://www.ctan.org/pkg/pstool")
@ -6920,7 +6939,7 @@ Simple Young tableaux.
texlive-latex-colortbl texlive-latex-colortbl
texlive-fancyhdr texlive-fancyhdr
texlive-graphics ;for color.sty texlive-graphics ;for color.sty
texlive-latex-tools ;for array.sty texlive-tools ;for array.sty
texlive-marvosym texlive-marvosym
texlive-tex-ini-files)) ;for pdftexconfig texlive-tex-ini-files)) ;for pdftexconfig
(home-page "https://www.ctan.org/pkg/jadetex/") (home-page "https://www.ctan.org/pkg/jadetex/")
@ -9339,61 +9358,6 @@ LuaTeX (respectively) is not the engine in use.")
(define-deprecated-package texlive-generic-ifxetex texlive-iftex) (define-deprecated-package texlive-generic-ifxetex texlive-iftex)
(define-public texlive-tools
(let ((template (simple-texlive-package
"texlive-tools"
(list "doc/latex/tools/"
"source/latex/tools/"
"tex/latex/tools/")
(base32
"0c0ixkcvrlzx6sdj25ak3bx0j65qghf51w66yg5wlnpg08d3awrs"))))
(package
(inherit template)
(outputs '("out" "doc"))
(arguments
(substitute-keyword-arguments (package-arguments template)
((#:tex-directory _ '())
"latex/tools")
((#:build-targets _ '())
#~(list "tools.ins"))
((#:phases phases)
#~(modify-phases #$phases
(add-after 'unpack 'chdir
(lambda _
(chdir "source/latex/tools")))
(replace 'copy-files
(lambda _
(let ((origin #$(package-source this-package))
(source (string-append #$output
"/share/texmf-dist/source"))
(doc (string-append #$output:doc
"/share/texmf-dist/doc")))
(copy-recursively (string-append origin "/source") source)
(copy-recursively (string-append origin "/doc") doc)
;; These files are not generated.
(let ((directory "/tex/latex/tools"))
(with-directory-excursion (string-append origin directory)
(for-each
(lambda (f)
(install-file f (string-append #$output
"/share/texmf-dist"
directory)))
'("array-2016-10-06.sty"
"array-2020-02-10.sty"
"multicol-2017-04-11.sty"
"varioref-2016-02-16.sty")))))))))))
(home-page "https://www.ctan.org/tex-archive/macros/latex/required/tools/")
(synopsis "LaTeX standard tools bundle")
(description "This package provides a collection of simple tools that
are part of the LaTeX required tools distribution, comprising the packages:
@code{afterpage}, @code{array}, @code{bm}, @code{calc}, @code{dcolumn},
@code{delarray}, @code{enumerate}, @code{fileerr}, @code{fontsmpl},
@code{ftnright}, @code{hhline}, @code{indentfirst}, @code{layout},
@code{longtable}, @code{multicol}, @code{rawfonts}, @code{showkeys},
@code{somedefs}, @code{tabularx}, @code{theorem}, @code{trace},
@code{varioref}, @code{verbatim}, @code{xr}, and @code{xspace}.")
(license license:lppl1.3+))))
(define-public texlive-latex-xkeyval (define-public texlive-latex-xkeyval
(package (package
(name "texlive-latex-xkeyval") (name "texlive-latex-xkeyval")
@ -10459,8 +10423,7 @@ provided box macros are @code{\\lapbox}, @code{\\marginbox},
(package (package
(inherit template) (inherit template)
(propagated-inputs (propagated-inputs
(list texlive-etoolbox texlive-latex-environ texlive-pgf (list texlive-etoolbox texlive-latex-environ texlive-pgf texlive-tools))
texlive-latex-tools))
(home-page "https://www.ctan.org/pkg/tcolorbox") (home-page "https://www.ctan.org/pkg/tcolorbox")
(synopsis "Colored boxes, for LaTeX examples and theorems, etc") (synopsis "Colored boxes, for LaTeX examples and theorems, etc")
(description "This package provides an environment for colored and (description "This package provides an environment for colored and